[BUILD] Cleanup phpstan errors

nucleos · Mar 21, 2019 · 8d0ceab · 8d0ceab
1 parent 290d640
commit 8d0ceab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,12 +1,11 @@
+includes:
+    - vendor-bin/phpstan/vendor/jangregor/phpstan-prophecy/src/extension.neon
+    - vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/rules.neon
+
 parameters:
     autoload_files:
         - vendor-bin/test/vendor/autoload.php
 
-    includes:
-        - vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
-        - vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
-        - vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/rules.neon
-        - vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
-
     ignoreErrors:
         - '#PHPDoc tag \@throws with type Http\\Client\\Exception is not subtype of Throwable#'
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,10 +1,10 @@
 {
     "require": {
+        "jangregor/phpstan-prophecy": "^0.3",
         "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpstan/phpstan-strict-rules": "^0.11"
+        "phpstan/phpstan-phpunit": "^0.11"
     },
     "conflict": {
-        "phpunit/phpunit": ">=7.0"
+        "phpunit/phpunit": ">=8.0"
     }
 }