Merge remote-tracking branch 'origin/master'

WyriHaximus · Aug 1, 2019 · d476fac · d476fac
2 parents 6c7ee17 + a0ac1da
commit d476fac
Show file tree

Hide file tree

Showing 2 changed files with 465 additions and 264 deletions.
diff --git a/composer.json b/composer.json
@@ -9,9 +9,9 @@
         }
     ],
     "require": {
-        "jangregor/phpstan-prophecy": "^0.3.0",
-        "localheinz/phpstan-rules": "^0.7.1",
-        "pepakriz/phpstan-exception-rules": "^0.7.0",
+        "jangregor/phpstan-prophecy": "^0.3.0 || ^0.4",
+        "localheinz/phpstan-rules": "^0.7.1 || ^0.8.0 || ^0.9.0 || ^0.10.0",
+        "pepakriz/phpstan-exception-rules": "^0.7.0 || ^0.8.0",
         "phpstan/phpstan-deprecation-rules": "^0.11.0",
         "phpstan/phpstan-php-parser": "^0.11.0",
         "phpstan/phpstan-phpunit": "^0.11.0",