Merge pull request #3325 from morozov/phpunit74

Updated PHPUnit to 7.4
doctrine · Oct 16, 2018 · 6f627e6 · 6f627e6
2 parents 50d3c46 + 465c929
commit 6f627e6
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 134 deletions.
diff --git a/composer.json b/composer.json
@@ -30,8 +30,7 @@
         "doctrine/coding-standard": "^5.0",
         "jetbrains/phpstorm-stubs": "^2018.1.2",
         "phpstan/phpstan": "^0.10.1",
-        "phpunit/phpunit": "^7.1.2",
-        "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
+        "phpunit/phpunit": "^7.4",
         "symfony/console": "^2.0.5|^3.0|^4.0",
         "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
     },