Merge remote-tracking branch 'origin/feature/move-to-codesniffer'

* origin/feature/move-to-codesniffer: Do not test on hhvm Minor changes
maxbanton · Aug 29, 2016 · 5eb0534 · 5eb0534
2 parents 9f239cd + 854471f
commit 5eb0534
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 271 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /.idea/
 /vendor/
+/composer.phar
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
   - '5.6'
   - '7.0'
-  - hhvm
   - nightly
 
 cache:
@@ -15,9 +14,10 @@ before_script:
   - composer install --no-interaction --dev -o
 
 script:
+  - php -l src/
+  - vendor/bin/phpcs --standard=psr2 --ignore=Tests src/
   - mkdir -p build/logs
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-  - vendor/bin/phpcs --standard=PSR2 src/
 
 after_script:
    - php vendor/bin/coveralls -v
diff --git a/composer.json b/composer.json
@@ -22,8 +22,12 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^5.4",
-        "friendsofphp/php-cs-fixer": "^1.11",
         "squizlabs/php_codesniffer": "^2.6",
         "satooshi/php-coveralls": "^1.0"
+    },
+    "config": {
+        "platform": {
+            "php": "5.6"
+        }
     }
 }