Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit cc4c0a8fb3fb · 2025-09-11T17:31:41.000+02:00
* 7.3:
  [PhpUnitBridge] Fix tests
diff --git a/Legacy/SymfonyTestsListenerTrait.php b/Legacy/SymfonyTestsListenerTrait.php
@@ -306,7 +306,7 @@ public function endTest($test, $time): void
         }
 
         if (self::$expectedDeprecations) {
-            if (!\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));
             }
 
diff --git a/Tests/DeprecationErrorHandler/baseline.phpt b/Tests/DeprecationErrorHandler/baseline.phpt
@@ -26,6 +26,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'baselineFile=' . urlencode($filename))
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/baseline2.phpt b/Tests/DeprecationErrorHandler/baseline2.phpt
@@ -16,6 +16,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'baselineFile=' . urlencode($filename))
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/baseline3.phpt b/Tests/DeprecationErrorHandler/baseline3.phpt
@@ -16,6 +16,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'baselineFile=' . urlencode($filename))
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt b/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[total]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/debug_class_loader_deprecation.phpt b/Tests/DeprecationErrorHandler/debug_class_loader_deprecation.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[total]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/default.phpt b/Tests/DeprecationErrorHandler/default.phpt
@@ -9,6 +9,7 @@ putenv($k);
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/deprecated_regexp.phpt b/Tests/DeprecationErrorHandler/deprecated_regexp.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = '/foo/');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/disabled.phpt b/Tests/DeprecationErrorHandler/disabled.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'disabled');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/disabled_1.phpt b/Tests/DeprecationErrorHandler/disabled_1.phpt
@@ -9,6 +9,7 @@ putenv($k);
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/eval_not_self.phpt b/Tests/DeprecationErrorHandler/eval_not_self.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/generate_baseline.phpt b/Tests/DeprecationErrorHandler/generate_baseline.phpt
@@ -10,6 +10,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'generateBaseline=true&baselineFile=' .
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/ignore.phpt b/Tests/DeprecationErrorHandler/ignore.phpt
@@ -17,6 +17,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'ignoreFile=' . urlencode($filename));
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/lagging_vendor.phpt b/Tests/DeprecationErrorHandler/lagging_vendor.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0&max[direct]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/log_file.phpt b/Tests/DeprecationErrorHandler/log_file.phpt
@@ -10,6 +10,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'logFile='.$filename);
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/multiple_autoloads.phpt b/Tests/DeprecationErrorHandler/multiple_autoloads.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/partially_quiet.phpt b/Tests/DeprecationErrorHandler/partially_quiet.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0&quiet[]=unsilenced&quiet[]
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/partially_quiet2.phpt b/Tests/DeprecationErrorHandler/partially_quiet2.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0&max[direct]=0&quiet[]=unsi
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/php_deprecation_from_vendor_class.phpt b/Tests/DeprecationErrorHandler/php_deprecation_from_vendor_class.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[total]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/quiet.phpt b/Tests/DeprecationErrorHandler/quiet.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[total]=3&verbose=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/quiet_but_failing.phpt b/Tests/DeprecationErrorHandler/quiet_but_failing.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[total]=0&verbose=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/self_on_non_vendor.phpt b/Tests/DeprecationErrorHandler/self_on_non_vendor.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt b/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
@@ -9,6 +9,7 @@ putenv($k);
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt b/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/trigger_error_types.phpt b/Tests/DeprecationErrorHandler/trigger_error_types.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/weak.phpt b/Tests/DeprecationErrorHandler/weak.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'weak');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt b/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt b/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt b/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt
@@ -9,6 +9,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
diff --git a/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt b/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
@@ -8,6 +8,7 @@ putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
+putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {

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 (!\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`