Merge 82384de into e0e28e7

.travis.yml

@@ -1,40 +1,46 @@
 language: php
-php:
-  - 7.1
-  - 7.2
-  - nightly
+php: [ 7.1, 7.2, nightly ]
 sudo: false
 
 env:
+
 matrix:
   fast_finish: true
   allow_failures:
     - php: nightly
 
 install:
-  - composer install --no-interaction --prefer-dist --optimize-autoloader
+  - travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
+  - travis_retry composer global require phpunit/phpunit ^6 # cannot use phpunit.phar or require-dev, because this package is a phpunit dep
+script:
+  - /home/travis/.composer/vendor/bin/phpunit --no-coverage
+  - bin/behat -p default
 
 jobs:
   include:
     - stage: test
+      php: 7.1
       script:
-      - bin/phpunit --no-coverage
-      - bin/behat -p default
+        - travis_retry sudo apt install graphviz
+        - ./bin/phpdoc run
 
     - stage: test
       php: 7.1
       script:
         - php ./bin/console --env=prod cache:warm
         - php -d phar.readonly=false tools/box.phar compile
         - bin/behat -p phar
+        - travis_retry sudo apt install graphviz
+        - php build/phpDocumentor.phar run
 
     - stage: coverage
       php: 7.1
       script:
-        - bin/phpunit
+        - /home/travis/.composer/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 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 --no-verbose https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
 
     - stage: lint
       php: 7.1
@@ -68,6 +74,7 @@ jobs:
 cache:
   directories:
   - $HOME/.composer/cache/files
+  - $HOME/.phive
 
 notifications:
   irc: "irc.freenode.org#phpdocumentor"

appveyor.yml

@@ -8,7 +8,6 @@ version: '{build}.{branch}'
 skip_tags: true
 branches:
   only:
-    - master
     - develop
 
 environment:
@@ -50,8 +49,10 @@ install:
   - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
   - cd c:\phpdocumentor
   - composer install --no-interaction --prefer-dist --no-progress
+  - composer global require phpunit/phpunit ^6
+  - composer global config bin-dir --absolute
 
 test_script:
   - cd c:\phpdocumentor
-  - bin/phpunit --no-coverage
+  - c:\Users\appveyor\AppData\Roaming\Composer\vendor\bin\phpunit --no-coverage
   - bin/behat %BEHAT_FLAGS%

composer.json

@@ -30,9 +30,9 @@
         "league/pipeline": "^0.3.0",
         "monolog/monolog": "~1.6",
         "padraic/phar-updater": "^1.0",
-        "phpdocumentor/flyfinder": "@beta",
-        "phpdocumentor/graphviz": "~1.0",
-        "phpdocumentor/reflection": "dev-develop@dev",
+        "phpdocumentor/flyfinder": "1.0.0-beta2",
+        "phpdocumentor/graphviz": "2.0.0-alpha1",
+        "phpdocumentor/reflection": "4.0.0-alpha2",
         "sensio/framework-extra-bundle": "^5.1",
         "symfony/console": "^4.0",
         "symfony/event-dispatcher": "^4.0",
@@ -49,7 +49,6 @@
         "symfony/yaml": "^4.0",
         "tedivm/stash": "^0.14.2",
         "twig/twig": "~1.3",
-        "webmozart/assert": "^1.2",
         "zendframework/zend-cache": "~2.1",
         "zendframework/zend-config": "~2.1",
         "zendframework/zend-filter": "~2.1",
@@ -59,14 +58,14 @@
         "zendframework/zend-stdlib": "~2.1",
         "zetacomponents/document": ">=1.3.1"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "alpha",
     "require-dev": {
         "behat/behat": "^3.0",
         "mikey179/vfsStream": "^1.2",
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^6.4",
         "squizlabs/php_codesniffer": "^1.4",
-        "symfony/dotenv": "^4.0"
+        "symfony/dotenv": "^4.0",
+        "webmozart/assert": "^1.3"
     },
     "suggest": {
         "ext-twig": "Enabling the twig extension improves the generation of twig based templates.",