bug #28524 [PhpUnitBridge] fix disabling DeprecationErrorHandler using phpunit.xml file (soerenbernstein)

nicolas-grekas · nicolas-grekas · commit da1999856f5e · 2018-09-20T09:47:32.000+02:00
This PR was submitted for the master branch but it was squashed and merged into the 3.4 branch instead (closes #28524). Discussion ---------- [PhpUnitBridge] fix disabling DeprecationErrorHandler using phpunit.xml file Fixing #28519 | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | don't know | Fixed tickets | #28519 | License | MIT Commits ------- 3cd929b [PhpUnitBridge] fix disabling DeprecationErrorHandler using phpunit.xml file
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -54,7 +54,11 @@ public static function register($mode = 0)
             if (false === $mode) {
                 $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
             }
-            if (DeprecationErrorHandler::MODE_WEAK !== $mode && DeprecationErrorHandler::MODE_WEAK_VENDORS !== $mode && (!isset($mode[0]) || '/' !== $mode[0])) {
+            if (DeprecationErrorHandler::MODE_DISABLED !== $mode
+                && DeprecationErrorHandler::MODE_WEAK !== $mode
+                && DeprecationErrorHandler::MODE_WEAK_VENDORS !== $mode
+                && (!isset($mode[0]) || '/' !== $mode[0])
+            ) {
                 $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,11 @@ public static function register($mode = 0)`
`54`	`54`	`if (false === $mode) {`
`55`	`55`	`$mode = getenv('SYMFONY_DEPRECATIONS_HELPER');`
`56`	`56`	`}`
`57`		`- if (DeprecationErrorHandler::MODE_WEAK !== $mode && DeprecationErrorHandler::MODE_WEAK_VENDORS !== $mode && (!isset($mode[0]) \|\| '/' !== $mode[0])) {`
	`57`	`+ if (DeprecationErrorHandler::MODE_DISABLED !== $mode`
	`58`	`+ && DeprecationErrorHandler::MODE_WEAK !== $mode`
	`59`	`+ && DeprecationErrorHandler::MODE_WEAK_VENDORS !== $mode`
	`60`	`+ && (!isset($mode[0]) \|\| '/' !== $mode[0])`
	`61`	`+ ) {`
`58`	`62`	`$mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;`
`59`	`63`	`}`
`60`	`64`