bump phpunit to the latest supported release, travis setup, ignore co…

…mposer.lock (#419)
box · May 22, 2017 · f9d8ad8 · f9d8ad8
1 parent 80553c6
commit f9d8ad8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 986 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /vendor
 /.idea
 *.iml
+composer.lock
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -4,7 +4,7 @@ filter:
 tools:
     external_code_coverage:
         timeout: 600 # Wait 10 minutes for results
-        runs: 3 # Merge results for 5.4, 5.5 and 5.6 jobs
+        runs: 1 # Merge results for the 7.1 job
     php_mess_detector: true
     php_code_sniffer:
         config:

diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 cache:
@@ -19,5 +18,8 @@ script:
   - php vendor/bin/phpunit --coverage-clover=build/logs/coverage.clover
 
 after_script:
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover; fi
+  - |
+    if [[ "$TRAVIS_PHP_VERSION" = '7.1' ]]; then
+      wget https://scrutinizer-ci.com/ocular.phar
+      php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover
+    fi
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "ext-xmlreader" : "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.0"
+        "phpunit/phpunit": "^5.7.0"
     },
     "suggest": {
         "ext-iconv": "To handle non UTF-8 CSV files (if \"php-intl\" is not already installed or is too limited)",