Merge branch '7.3'

sebastianbergmann · Sep 28, 2018 · 1ff9e1b · 1ff9e1b
2 parents a9a7da4 + d854f61
commit 1ff9e1b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 67 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,15 +51,6 @@ notifications:
 
 jobs:
   include:
-    - stage: Static Code Analysis
-      php: 7.2
-      env: PHPStan
-      before_install:
-        - travis_retry ./build/tools/composer require --no-update phpunit/php-invoker:^2.0
-      install: travis_retry ./build/tools/composer update --prefer-dist --prefer-stable
-      script:
-        - ./build/tools/phpstan analyse --level=0 -c phpstan.neon src
-        - ./build/tools/phpstan analyse --level=2 -c phpstan-tests.neon tests
     - stage: Static Code Analysis
       php: 7.2
       env: php-cs-fixer

diff --git a/build/tools/phpstan b/build/tools/phpstan
diff --git a/phive.xml b/phive.xml
@@ -4,5 +4,4 @@
   <phar name="php-cs-fixer" version="^2.12.0" installed="2.13.0" location="./build/tools/php-cs-fixer" copy="true"/>
   <phar name="phpdox" version="^0.11.2" installed="0.11.2" location="./build/tools/phpdox" copy="true"/>
   <phar name="phploc" version="^4.0.1" installed="4.0.1" location="./build/tools/phploc" copy="true"/>
-  <phar name="phpstan" version="^0.10.1" installed="0.10.1" location="./build/tools/phpstan" copy="true"/>
 </phive>
diff --git a/phpstan-tests.neon b/phpstan-tests.neon
diff --git a/phpstan.neon b/phpstan.neon