Check against literal 2048 value instead of against E_STRICT for #5956

sebastianbergmann · sebastianbergmann · commit dd5e89699184 · 2025-04-30T10:27:33.000+02:00
diff --git a/src/Util/ErrorHandler.php b/src/Util/ErrorHandler.php
@@ -11,7 +11,6 @@
 
 use const E_DEPRECATED;
 use const E_NOTICE;
-use const E_STRICT;
 use const E_USER_DEPRECATED;
 use const E_USER_NOTICE;
 use const E_USER_WARNING;
@@ -99,7 +98,7 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil
          *
          * @see https://github.com/sebastianbergmann/phpunit/issues/5956
          */
-        if (defined('E_STRICT') && $errorNumber === @E_STRICT) {
+        if (defined('E_STRICT') && $errorNumber === 2048) {
             $errorNumber = E_NOTICE;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`use const E_DEPRECATED;`
`13`	`13`	`use const E_NOTICE;`
`14`		`-use const E_STRICT;`
`15`	`14`	`use const E_USER_DEPRECATED;`
`16`	`15`	`use const E_USER_NOTICE;`
`17`	`16`	`use const E_USER_WARNING;`
`@@ -99,7 +98,7 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil`
`99`	`98`	`*`
`100`	`99`	`* @see https://github.com/sebastianbergmann/phpunit/issues/5956`
`101`	`100`	`*/`
`102`		`- if (defined('E_STRICT') && $errorNumber === @E_STRICT) {`
	`101`	`+ if (defined('E_STRICT') && $errorNumber === 2048) {`
`103`	`102`	`$errorNumber = E_NOTICE;`
`104`	`103`	`}`
`105`	`104`