Merge branch '8.5' into 9.6

sebastianbergmann · sebastianbergmann · commit 8d7e17e8a4ab · 2025-04-30T10:28:12.000+02:00
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "ext-xml": "*",
         "ext-xmlwriter": "*",
         "doctrine/instantiator": "^1.5.0 || ^2",
-        "myclabs/deep-copy": "^1.13.0",
+        "myclabs/deep-copy": "^1.13.1",
         "phar-io/manifest": "^2.0.4",
         "phar-io/version": "^3.2.1",
         "phpunit/php-code-coverage": "^9.2.32",
diff --git a/composer.lock b/composer.lock
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`