[PhpUnitBridge] Add weak-verbose mode and match against message instead of test name

nicolas-grekas · nicolas-grekas · commit 026b8b791271 · 2015-12-01T20:49:56.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -64,7 +64,7 @@ public static function register($mode = false)
                     $group = 'remaining';
                 }
 
-                if (isset($mode[0]) && '/' === $mode[0] && preg_match($mode, $class.'::'.$method)) {
+                if (isset($mode[0]) && '/' === $mode[0] && preg_match($mode, $msg)) {
                     $e = new \Exception($msg);
                     $r = new \ReflectionProperty($e, 'trace');
                     $r->setAccessible(true);
@@ -144,7 +144,7 @@ public static function register($mode = false)
                 if (!empty($notices)) {
                     echo "\n";
                 }
-                if ('weak' !== $mode && ($deprecations['unsilenced'] || $deprecations['remaining'] || $deprecations['other'])) {
+                if ('weak' !== $mode && 'weak-verbose' !== $mode && ($deprecations['unsilenced'] || $deprecations['remaining'] || $deprecations['other'])) {
                     exit(1);
                 }
             });
diff --git a/src/Symfony/Bridge/PhpUnit/README.md b/src/Symfony/Bridge/PhpUnit/README.md
@@ -14,9 +14,9 @@ It comes with the following features:
 By default any non-legacy-tagged or any non-@-silenced deprecation notices will
 make tests fail.
 This can be changed by setting the `SYMFONY_DEPRECATIONS_HELPER` environment
-variable to `weak`. This will make the bridge ignore deprecation notices and
-is useful to projects that must use deprecated interfaces for backward
-compatibility reasons.
+variable to `weak` or `weak-versose`. This will make the bridge ignore
+deprecation notices and is useful to projects that must use deprecated interfaces
+for backward compatibility reasons.
 
 A summary of deprecation notices is displayed at the end of the test suite:
 
@@ -53,8 +53,8 @@ You have to decide either to:
    forward compatibility;
  * or move them to the **Legacy** section (by using one of the above way).
 
-In case you need to inspect the stack trace of a particular deprecation triggered by
-one of your unit tests, you can set the `SYMFONY_DEPRECATIONS_HELPER` env var to
-a regexp that matches this test case's `class::method` name. For example,
-`SYMFONY_DEPRECATIONS_HELPER=/^MyTest::testMethod$/ phpunit` will stop your test
-suite once a deprecation is triggered by the `MyTest::testMethod` test.
+In case you need to inspect the stack trace of a particular deprecation triggered
+by your unit tests, you can set the `SYMFONY_DEPRECATIONS_HELPER` env var to a
+regexp that matches this depreaction's message. For example,
+`SYMFONY_DEPRECATIONS_HELPER=/foobar/ phpunit` will stop your test suite once a
+deprecation message is triggered and contains the "foobar" string.

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static function register($mode = false)`
`64`	`64`	`$group = 'remaining';`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (isset($mode[0]) && '/' === $mode[0] && preg_match($mode, $class.'::'.$method)) {`
	`67`	`+ if (isset($mode[0]) && '/' === $mode[0] && preg_match($mode, $msg)) {`
`68`	`68`	`$e = new \Exception($msg);`
`69`	`69`	`$r = new \ReflectionProperty($e, 'trace');`
`70`	`70`	`$r->setAccessible(true);`
`@@ -144,7 +144,7 @@ public static function register($mode = false)`
`144`	`144`	`if (!empty($notices)) {`
`145`	`145`	`echo "\n";`
`146`	`146`	`}`
`147`		`- if ('weak' !== $mode && ($deprecations['unsilenced'] \|\| $deprecations['remaining'] \|\| $deprecations['other'])) {`
	`147`	`+ if ('weak' !== $mode && 'weak-verbose' !== $mode && ($deprecations['unsilenced'] \|\| $deprecations['remaining'] \|\| $deprecations['other'])) {`
`148`	`148`	`exit(1);`
`149`	`149`	`}`
`150`	`150`	`});`