minor #20334 [PhpUnitBridge] Fix undefined variable (romainneutron)

nicolas-grekas · nicolas-grekas · commit a70e0331b120 · 2016-10-28T10:03:48.000+02:00
This PR was merged into the 3.1 branch. Discussion ---------- [PhpUnitBridge] Fix undefined variable | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT Otherwise `$mode` is not defined on line 115 Commits ------- c4cc392 [PhpUnitBridge] Fix undefined variable
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -68,7 +68,8 @@ public static function register($mode = 0)
             'other' => array(),
         );
         $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode) {
-            if (E_USER_DEPRECATED !== $type || DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {
+            $mode = $getMode();
+            if (E_USER_DEPRECATED !== $type || DeprecationErrorHandler::MODE_DISABLED === $mode) {
                 return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public static function register($mode = 0)`
`68`	`68`	`'other' => array(),`
`69`	`69`	`);`
`70`	`70`	`$deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode) {`
`71`		`- if (E_USER_DEPRECATED !== $type \|\| DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {`
	`71`	`+ $mode = $getMode();`
	`72`	`+ if (E_USER_DEPRECATED !== $type \|\| DeprecationErrorHandler::MODE_DISABLED === $mode) {`
`72`	`73`	`return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);`
`73`	`74`	`}`
`74`	`75`