Merge pull request #53 from ashnazg/ci

CI updates

Author: jaapio

.gitignore

@@ -12,11 +12,13 @@ bin/phpcs*
 bin/phpunit*
 bin/jsonlint*
 bin/validate-json*
+temp/ecs/*
 
 # Build folder and vendor folder are generated code; no need to version this
-build/*
-vendor/*
-composer.phar
+build/
+tools/
+vendor/
+*.phar
 
 # By default the phpunit.xml.dist is provided; you can override this using a local config file
 phpunit.xml

.travis.yml

@@ -1,8 +1,5 @@
 language: php
-php:
-  - 7.1
-  - 7.2
-  - nightly
+php: [ 7.1, 7.2, nightly ]
 sudo: false
 
 env:
@@ -13,33 +10,34 @@ matrix:
     - php: nightly
 
 install:
-  - composer install --no-interaction --prefer-dist --optimize-autoloader
+  - 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: test
-      script:
-      - vendor/bin/phpunit --no-coverage
-
     - stage: coverage
       php: 7.1
       script:
-        - vendor/bin/phpunit
+        - ./vendor/bin/phpunit
       after_script:
-        - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
-        - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar && php coveralls.phar --verbose
+        - 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
 
     - stage: lint
       php: 7.1
       before_script:
-        - composer create-project symplify/easy-coding-standard temp/ecs
+        - travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan
       script:
-        - temp/ecs/bin/ecs check src tests
-        - vendor/bin/phpstan analyse src --level max --configuration phpstan.neon
+        - ./tools/phpstan analyse src --level max --configuration phpstan.neon
+        - composer create-project symplify/easy-coding-standard temp/ecs && temp/ecs/bin/ecs check src tests
 
 cache:
   directories:
   - $HOME/.composer/cache/files
+  - $HOME/.phive
 
 notifications:
   irc: "irc.freenode.org#phpdocumentor"

appveyor.yml

@@ -51,4 +51,4 @@ install:
 
 test_script:
   - cd c:\typeresolver
-  - vendor/bin/phpunit --no-coverage
+  - vendor\bin\phpunit --no-coverage

composer.json

@@ -13,9 +13,8 @@
         "phpdocumentor/reflection-common": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
         "mockery/mockery": "^1.0",
-        "phpstan/phpstan": "^0.9.0"
+        "phpunit/phpunit": "^6.5"
     },
     "autoload": {
         "psr-4": {