bug #21186 [Bridge/PhpUnit] Relax expectedDeprecation for forward compat (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 886a28c56ea5 · 2017-01-06T18:57:29.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- [Bridge/PhpUnit] Relax expectedDeprecation for forward compat | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Instead of a strict match, this makes the annotation check ignore not expected messages, while still requiring all the expected ones in order. This is needed for forward compat with future deprecations, and should make travis green again. Commits ------- a3ba726 [Bridge/PhpUnit] Relax expectedDeprecation for forward compat
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -179,8 +179,8 @@ public function endTest(\PHPUnit_Framework_Test $test, $time)
 
             if (!in_array($test->getStatus(), array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR), true)) {
                 try {
-                    $prefix = "@expectedDeprecation:\n  ";
-                    $test->assertStringMatchesFormat($prefix.implode("\n  ", $this->expectedDeprecations), $prefix.implode("\n  ", $this->gatheredDeprecations));
+                    $prefix = "@expectedDeprecation:\n";
+                    $test->assertStringMatchesFormat($prefix.'%A  '.implode("\n%A  ", $this->expectedDeprecations)."\n%A", $prefix.'  '.implode("\n  ", $this->gatheredDeprecations)."\n");
                 } catch (\PHPUnit_Framework_AssertionFailedError $e) {
                     $test->getTestResultObject()->addFailure($test, $e, $time);
                 }
