[PhpUnitBridge] Replace "weak-verbose" by "deprecations upper bound" mode

nicolas-grekas · nicolas-grekas · commit 806ccb6cb367 · 2015-12-10T11:40:16.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -19,7 +19,6 @@
 class DeprecationErrorHandler
 {
     const MODE_WEAK = 'weak';
-    const MODE_WEAK_VERBOSE = 'weak-verbose';
 
     private static $isRegistered = false;
 
@@ -28,6 +27,9 @@ public static function register($mode = false)
         if (self::$isRegistered) {
             return;
         }
+        if (self::MODE_WEAK !== $mode && (!isset($mode[0]) || '/' !== $mode[0])) {
+            $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
+        }
         $deprecations = array(
             'unsilencedCount' => 0,
             'remainingCount' => 0,
@@ -147,7 +149,7 @@ public static function register($mode = false)
                 if (!empty($notices)) {
                     echo "\n";
                 }
-                if (DeprecationErrorHandler::MODE_WEAK !== $mode && DeprecationErrorHandler::MODE_WEAK_VERBOSE !== $mode && ($deprecations['unsilenced'] || $deprecations['remaining'] || $deprecations['other'])) {
+                if (DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
                     exit(1);
                 }
             });
diff --git a/src/Symfony/Bridge/PhpUnit/README.md b/src/Symfony/Bridge/PhpUnit/README.md
@@ -12,11 +12,11 @@ It comes with the following features:
  * display the stack trace of a deprecation on-demand.
 
 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` or `weak-verbose`. This will make the bridge ignore
-deprecation notices and is useful to projects that must use deprecated interfaces
-for backward compatibility reasons.
+make tests fail. This can be changed by setting the `SYMFONY_DEPRECATIONS_HELPER`
+environment variable to the maximum number of deprecations that are allowed to be
+triggered before making the test suite fail. Alternatively, setting it to `weak`
+will make the bridge ignore any 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:
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`class DeprecationErrorHandler`
`20`	`20`	`{`
`21`	`21`	`const MODE_WEAK = 'weak';`
`22`		`- const MODE_WEAK_VERBOSE = 'weak-verbose';`
`23`	`22`
`24`	`23`	`private static $isRegistered = false;`
`25`	`24`
`@@ -28,6 +27,9 @@ public static function register($mode = false)`
`28`	`27`	`if (self::$isRegistered) {`
`29`	`28`	`return;`
`30`	`29`	`}`
	`30`	`+ if (self::MODE_WEAK !== $mode && (!isset($mode[0]) \|\| '/' !== $mode[0])) {`
	`31`	`+ $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;`
	`32`	`+ }`
`31`	`33`	`$deprecations = array(`
`32`	`34`	`'unsilencedCount' => 0,`
`33`	`35`	`'remainingCount' => 0,`
`@@ -147,7 +149,7 @@ public static function register($mode = false)`
`147`	`149`	`if (!empty($notices)) {`
`148`	`150`	`echo "\n";`
`149`	`151`	`}`
`150`		`- if (DeprecationErrorHandler::MODE_WEAK !== $mode && DeprecationErrorHandler::MODE_WEAK_VERBOSE !== $mode && ($deprecations['unsilenced'] \|\| $deprecations['remaining'] \|\| $deprecations['other'])) {`
	`152`	`+ if (DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {`
`151`	`153`	`exit(1);`
`152`	`154`	`}`
`153`	`155`	`});`