Merge branch '6.2'

ezpublishlegacy · Jun 2, 2017 · 2b32f2b · 2b32f2b
2 parents 838372e + 16999a1
commit 2b32f2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ChangeLog-6.2.md b/ChangeLog-6.2.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 6.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [6.2.1] - 2017-06-02
+
+### Changed
+
+* Rolled back the change that when `beStrictAboutCoversAnnotation="true"` is configured or `--strict-coverage` is used then a test is now also marked as risky when it specifies units of code using `@covers` or `@uses` that are not executed by the test
+
 ## [6.2.0] - 2017-06-02
 
 ### Added
@@ -17,5 +23,6 @@ All notable changes of the PHPUnit 6.2 release series are documented in this fil
 * Implemented [#2689](https://github.com/sebastianbergmann/phpunit/pull/2689): Unpack nested `IteratorAggregate` objects for `Count` constraint 
 * When `beStrictAboutCoversAnnotation="true"` is configured or `--strict-coverage` is used then a test is now also marked as risky when it specifies units of code using `@covers` or `@uses` that are not executed by the test
 
+[6.2.1]: https://github.com/sebastianbergmann/phpunit/compare/6.2.0...6.2.1
 [6.2.0]: https://github.com/sebastianbergmann/phpunit/compare/6.1...6.2.0
 
diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -438,10 +438,6 @@ public function doRun(Test $suite, array $arguments = [], $exit = true)
                 $arguments['strictCoverage']
             );
 
-            $codeCoverage->setCheckForUnexecutedCoveredCode(
-                $arguments['strictCoverage']
-            );
-
             if (isset($arguments['forceCoversAnnotation'])) {
                 $codeCoverage->setForceCoversAnnotation(
                     $arguments['forceCoversAnnotation']