Merge 3f6cf85 into 2596137

.gitignore

@@ -7,10 +7,11 @@
 .settings
 
 # Build folder and vendor folder are generated code; no need to version this
-build/*
-vendor/*
-temp/*
-composer.phar
+build/
+vendor/
+temp/
+tools/
+*.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 ]
 
 env:
 
@@ -12,34 +9,35 @@ matrix:
     - php: nightly
 
 install:
-  - sudo apt install graphviz
-  - composer install --no-interaction --prefer-dist --optimize-autoloader
+  - travis_retry sudo apt install graphviz
+  - 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

@@ -47,10 +47,12 @@ install:
   - IF NOT EXIST php-installed.txt echo assert.exception=On >> php.ini
   - IF NOT EXIST php-installed.txt appveyor DownloadFile https://getcomposer.org/composer.phar
   - IF NOT EXIST php-installed.txt echo @php %%~dp0composer.phar %%* > composer.bat
+  - IF NOT EXIST php-installed.txt appveyor DownloadFile https://phar.phpunit.de/phpunit.phar
+  - IF NOT EXIST php-installed.txt echo @php %%~dp0phpunit.phar %%* > phpunit.bat
   - IF NOT EXIST php-installed.txt type nul >> php-installed.txt
   - cd c:\graphviz
   - composer install --no-interaction --prefer-dist --no-progress
 
 test_script:
   - cd c:\graphviz
-  - vendor/bin/phpunit --no-coverage
+  - phpunit --no-coverage

composer.json

@@ -8,11 +8,11 @@
     "require": {
         "php": ">=7.1"
     },
-    "require-dev": {
-        "phpunit/phpunit": "~6.5",
-        "phpstan/phpstan": "^0.9.0"
-    },
     "autoload": {
         "psr-0": {"phpDocumentor": ["src/", "tests/unit"]}
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^6.5",
+        "mockery/mockery": "^1.0"
     }
 }