feature #20040 [Bridge/PhpUnit] Handle native E_DEPRECATED (nicolas-grekas)

fabpot · fabpot · commit e215e4f431b9 · 2016-09-24T08:59:15.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [Bridge/PhpUnit] Handle native E_DEPRECATED | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - PHP native deprecations should also be caught. Commits ------- 90e8224 [Bridge/PhpUnit] Handle native E_DEPRECATED
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -68,7 +68,7 @@ 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()) {
+            if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {
                 return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ 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`	`+ if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) \|\| DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {`
`72`	`72`	`return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);`
`73`	`73`	`}`
`74`	`74`