Update Travis for PHP7, update tooling

.gitignore

@@ -1,3 +1,4 @@
+.idea
 vendor
 examples/resume/_*.md
 examples/output/*.html

.travis.yml

@@ -1,9 +1,14 @@
 language: php
 
-before_script:
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev
-
 php:
-  - 5.3
+  - '5.6'
-  - 5.4
+  - '7.0'
+  - '7.1'
+  - '7.2'
+
+install:
+  - travis_retry composer self-update
+  - travis_retry composer install --prefer-source --no-interaction --dev
+
+script:
+  - ./vendor/bin/pake test

composer.json

@@ -41,15 +41,12 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "fabpot/php-cs-fixer": "0.4.0",
         "indeyets/pake": "~1.99",
         "kriswallsmith/assetic": "1.1.2",
         "leafo/lessphp": "v0.4.0",
         "michelf/php-markdown": "1.4.0",
         "michelf/php-smartypants": "^1.8",
         "mustache/mustache": "2.5.1",
-        "phpunit/phpunit": "3.7.*",
-        "squizlabs/php_codesniffer": "1.*",
         "sunra/php-simple-html-dom-parser": "v1.5.0",
         "symfony/config": "v2.3.4",
         "symfony/console": "v2.3.4",
@@ -60,5 +57,9 @@
     },
     "bin": [
         "bin/md2resume"
-    ]
+    ],
-}
+    "require-dev": {
+        "phpunit/phpunit": "^6.2",
+        "squizlabs/php_codesniffer": "^3.0@dev"
+    }
+}

md2resume_dev.php

@@ -7,7 +7,7 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 }
 
 // Bootstrap our application with the Composer autoloader
-$app = require __DIR__ . '/vendor/autoload.php';
+$app = include __DIR__ . '/vendor/autoload.php';
 
 // Setup the namespace for our own namespace
 $app->add('Resume', __DIR__ . '/src');

pakefile

@@ -6,7 +6,7 @@ pake_task('test');
 pake_desc('Check the code for psr2 standards');
 pake_task('sniff');
 
-pake_desc('Run php-cs-fixer on the src directory');
+pake_desc('Run phpcbf on the src directory');
 pake_task('fixer');
 
 pake_desc('Update the README with the latest command output');
@@ -88,11 +88,11 @@ function run_sniff()
 
 function run_fixer()
 {
-    pake_echo_comment('Running php-cs-fixer');
+    pake_echo_comment('Running phpcbf');
     pake_sh(
-        './vendor/bin/php-cs-fixer fix ./md2resume_dev.php'
+        './vendor/bin/phpcbf --standard=PSR2 ./md2resume_dev.php'
-        . ' && ./vendor/bin/php-cs-fixer fix ./src/Resume/Cli/'
+        . ' && ./vendor/bin/phpcbf --standard=PSR2 ./src/Resume/Cli/'
-        . ' && ./vendor/bin/php-cs-fixer fix ./src/Resume/Command/',
+        . ' && ./vendor/bin/phpcbf --standard=PSR2 ./src/Resume/Command/',
         true
     );
 }

src/Resume/Command/SelfUpdateCommand.php

@@ -13,7 +13,7 @@ class SelfUpdateCommand extends Command
             ->setName('selfupdate')
             ->setDescription('Updates md2resume.phar to the latest version.')
             ->setHelp(
-<<<EOT
+                <<<EOT
 The <info>self-update</info> command checks github for newer
 versions of the command line client and if found, installs the latest.
 

src/Resume/Command/StatsCommand.php

@@ -67,7 +67,7 @@ class StatsCommand extends Command
                     $phrase .= strtolower($input[$key+$i]);
                 }
             }
-            if (!isset( $results[$phrase])) {
+            if (!isset($results[$phrase])) {
                 $results[$phrase] = 1;
             } else {
                 $results[$phrase]++;

tests/bootstrap.php

@@ -3,9 +3,10 @@
 $app = require __DIR__ . '/../vendor/autoload.php';
 $app->add('Resume', __DIR__ . '/../src');
 
+use PHPUnit\Framework\TestCase;
 use Resume\Cli\Resume;
 
-class ResumeTest extends \PHPUnit_Framework_TestCase
+class ResumeTest extends TestCase
 {
     public $console;