Merge pull request #866 from CZechBoY/phpstan

Update phpstan to 0.11 && update phpunit to 7.0
doctrine · Mar 13, 2019 · 9f57494 · 9f57494
2 parents bcb317d + 173046e
commit 9f57494
Show file tree

Hide file tree

Showing 16 changed files with 3,505 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,8 +5,8 @@ dist/
 tests/Doctrine/Tests/Common/Proxy/generated/
 vendor/
 .idea
-composer.lock
 doctrine-common-*.tar
 doctrine-common-*.tar.gz
 /phpcs.xml
 /.phpcs-cache
+/phpstan.neon
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,4 @@ jobs:
         - ./vendor/bin/phpcs
 
     - stage: Lint
-      before_script:
-        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8
-      script: vendor/bin/phpstan analyse -l 3 -c phpstan.neon lib tests
-
+      script: vendor/bin/phpstan analyse
diff --git a/composer.json b/composer.json
@@ -29,7 +29,9 @@
         "doctrine/persistence": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.3",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-phpunit": "^0.11",
+        "phpunit/phpunit": "^7.0",
         "doctrine/coding-standard": "^1.0",
         "squizlabs/php_codesniffer": "^3.0",
         "symfony/phpunit-bridge": "^4.0.5"