Merge 52a25ea into 5a6f575

.travis.yml

@@ -11,32 +11,37 @@ matrix:
 
 install:
   - travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
-  - travis_retry wget https://phar.io/releases/phive.phar
 
 script:
   - ./vendor/bin/phpunit --no-coverage
 
 jobs:
   include:
-    - stage: coverage
+    - stage: analysis
       php: 7.1
       script:
         - ./vendor/bin/phpunit
       after_script:
+        - travis_retry wget --no-verbose https://phar.io/releases/phive.phar
         - travis_retry php phive.phar --no-progress install --trust-gpg-keys E82B2FB314E9906E php-coveralls/php-coveralls && ./tools/php-coveralls --verbose
-        - travis_retry wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+        - travis_retry wget --no-verbose https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
 
-    - stage: lint
+    - stage: analysis
       php: 7.1
       before_script:
+        - travis_retry wget --no-verbose https://phar.io/releases/phive.phar
         - travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan
       script:
         - ./tools/phpstan analyse src --level max --configuration phpstan.neon
+
+    - stage: analysis
+      php: 7.1
+      script:
         - composer create-project symplify/easy-coding-standard temp/ecs ^3 && temp/ecs/bin/ecs check src tests
 
 cache:
   directories:
-  - $HOME/.composer/cache/files
+  - $HOME/.composer
   - $HOME/.phive
 
 notifications:

composer.json

@@ -16,13 +16,13 @@
   },
   "require": {
     "php":              ">=7.1",
-    "league/flysystem": "~1.0.41"
+    "league/flysystem": ">=1.0.41"
   },
   "minimum-stability":  "stable",
   "require-dev": {
-    "mockery/mockery":  "~1.0",
-    "league/flysystem-memory": "~1.0",
-    "phpunit/phpunit": "^6.5"
+    "mockery/mockery":  "~1",
+    "league/flysystem-memory": "~1",
+    "phpunit/phpunit": "~6"
   },
   "extra": {
     "branch-alias": {