[Bridge/PhpUnit] Handle native E_DEPRECATED

nicolas-grekas · nicolas-grekas · commit d5ab07f582cb · 2016-09-24T10:11:35.000+02:00
diff --git a/DeprecationErrorHandler.php b/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`