Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit 73a4466b3a42 · 2025-09-11T17:39:12.000+02:00
* 7.3:
  Fix
  Fix issue with merging union type with a nullable union type
diff --git a/Legacy/SymfonyTestsListenerTrait.php b/Legacy/SymfonyTestsListenerTrait.php
@@ -306,7 +306,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
`@@ -306,7 +306,7 @@ public function endTest($test, $time): void`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`if (self::$expectedDeprecations) {`
`309`		`- if (!$test instanceof TestCase \|\| !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {`
	`309`	`+ if ($test instanceof TestCase && !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {`
`310`	`310`	`$test->addToAssertionCount(\count(self::$expectedDeprecations));`
`311`	`311`	`}`
`312`	`312`