Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 72d301a212a7 · 2025-09-11T17:39:18.000+02:00
* 7.4:
  Fix
  Fix issue with merging union type with a nullable union type
diff --git a/Legacy/SymfonyTestsListenerTrait.php b/Legacy/SymfonyTestsListenerTrait.php
@@ -297,7 +297,7 @@ public function endTest($test, $time): void
         }
 
         if (self::$expectedDeprecations) {
-            if (!$test instanceof TestCase || !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {
+            if ($test instanceof TestCase && !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {
                 $test->addToAssertionCount(\count(self::$expectedDeprecations));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public function endTest($test, $time): void`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`if (self::$expectedDeprecations) {`
`300`		`- if (!$test instanceof TestCase \|\| !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {`
	`300`	`+ if ($test instanceof TestCase && !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {`
`301`	`301`	`$test->addToAssertionCount(\count(self::$expectedDeprecations));`
`302`	`302`	`}`
`303`	`303`