Merge branch '7.1'

ezpublishlegacy · Apr 13, 2018 · 7c44bba · 7c44bba
2 parents 1fb5baf + a783499
commit 7c44bba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog-7.1.md b/ChangeLog-7.1.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [7.1.3] - 2018-04-13
+
+### Fixed
+
+* Fixed [#3094](https://github.com/sebastianbergmann/phpunit/issues/3094): Faulty dependency constraint affecting `getObjectForTrait()` (failure using `--prefer-lowest`)
+
 ## [7.1.2] - 2018-04-10
 
 ### Fixed
@@ -28,6 +34,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil
 * `PHPUnit\Framework\Assert` is no longer searched for test methods
 * `ReflectionMethod::invokeArgs()` is no longer used to invoke test methods
 
+[7.1.3]: https://github.com/sebastianbergmann/phpunit/compare/7.1.2...7.1.3
 [7.1.2]: https://github.com/sebastianbergmann/phpunit/compare/7.1.1...7.1.2
 [7.1.1]: https://github.com/sebastianbergmann/phpunit/compare/7.1.0...7.1.1
 [7.1.0]: https://github.com/sebastianbergmann/phpunit/compare/7.0...7.1.0

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "phpunit/php-file-iterator": "^1.4.3",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^2.0",
-        "phpunit/phpunit-mock-objects": "^6.1",
+        "phpunit/phpunit-mock-objects": "^6.1.1",
         "sebastian/comparator": "^2.1",
         "sebastian/diff": "^3.0",
         "sebastian/environment": "^3.1",