From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Tue, 8 Jul 2025 12:46:08 +0200
Subject: [phpunit] Update expected deprecations

---
 .../Tests/DeprecationErrorHandler/baseline.phpt    |  1 -
 .../Tests/DeprecationErrorHandler/baseline2.phpt   |  8 --------
 .../Tests/DeprecationErrorHandler/baseline3.phpt   |  8 --------
 .../debug_class_loader_autoload.phpt               |  4 ----
 .../debug_class_loader_deprecation.phpt            |  4 ----
 .../Tests/DeprecationErrorHandler/default.phpt     | 18 +++--------------
 .../DeprecationErrorHandler/deprecated_regexp.phpt |  7 +------
 .../DeprecationErrorHandler/eval_not_self.phpt     |  3 ---
 .../DeprecationErrorHandler/generate_baseline.phpt |  1 -
 .../Tests/DeprecationErrorHandler/ignore.phpt      |  8 --------
 .../DeprecationErrorHandler/lagging_vendor.phpt    |  4 ----
 .../multiple_autoloads.phpt                        |  7 -------
 .../DeprecationErrorHandler/partially_quiet.phpt   | 12 +++--------
 .../DeprecationErrorHandler/partially_quiet2.phpt  | 13 +++---------
 .../php_deprecation_from_vendor_class.phpt         |  5 +----
 .../Tests/DeprecationErrorHandler/quiet.phpt       |  6 +-----
 .../DeprecationErrorHandler/quiet_but_failing.phpt |  4 ----
 .../self_on_non_vendor.phpt                        | 18 +++--------------
 .../shutdown_deprecations.phpt                     | 23 +++-------------------
 .../trigger_deprecation_types.phpt                 | 18 -----------------
 .../trigger_error_types.phpt                       | 18 -----------------
 .../Tests/DeprecationErrorHandler/weak.phpt        |  6 +-----
 .../weak_vendors_on_eval_d_deprecation.phpt        |  3 ---
 .../weak_vendors_on_phar_deprecation.phpt          |  3 ---
 .../weak_vendors_on_vendor.phpt                    | 17 +++-------------
 25 files changed, 22 insertions(+), 197 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt
index 83d448e..533912c 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt
@@ -78,4 +78,3 @@ print "Cannot test baselineFile contents because it is generated in a shutdown f
 ?>
 --EXPECT--
 Cannot test baselineFile contents because it is generated in a shutdown function registered by another shutdown function.
-Legacy deprecation notices (1)
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt
index 925d5c2..5548f65 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt
@@ -66,11 +66,3 @@ $foo->testLegacyFoo();
 $foo->testNonLegacyBar();
 ?>
 --EXPECTF--
-Legacy deprecation notices (1)
-
-Other deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt
index d814c02..c113243 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt
@@ -69,11 +69,3 @@ $foo->testLegacyFoo();
 $foo->testNonLegacyBar();
 ?>
 --EXPECTF--
-Legacy deprecation notices (2)
-
-Other deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
index 04e64d3..769001d 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
@@ -35,7 +35,3 @@ new \App\Services\BarService();
 
 ?>
 --EXPECTF--
-Remaining indirect deprecation notices (1)
-
-  1x: The "acme\lib\ExtendsDeprecatedClassFromOtherVendor" class extends "fcy\lib\DeprecatedClass" that is deprecated.
-    1x in BarService::__construct from App\Services
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_deprecation.phpt
index a6b0133..72689f5 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_deprecation.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_deprecation.phpt
@@ -35,7 +35,3 @@ new \App\Services\ExtendsDeprecatedFromVendor();
 
 ?>
 --EXPECTF--
-Remaining direct deprecation notices (1)
-
-  1x: The "App\Services\ExtendsDeprecatedFromVendor" class extends "fcy\lib\DeprecatedClass" that is deprecated.
-    1x in DebugClassLoader::loadClass from Symfony\Component\ErrorHandler
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
index 7b46259..e1b9d6e 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -67,21 +67,9 @@ register_shutdown_function(function () {
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in Standard input code on line 46
 
-  2x: unsilenced foo deprecation
-    2x in FooTestCase::testLegacyFoo
-
-  1x: unsilenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Legacy deprecation notices (1)
-
-Other deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
+Deprecated: unsilenced foo deprecation in Standard input code on line 47
 
+Deprecated: unsilenced bar deprecation in Standard input code on line 53
 I get precedence over any exit statements inside the deprecation error handler.
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecated_regexp.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecated_regexp.phpt
index 58f2acb..adeaea8 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecated_regexp.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecated_regexp.phpt
@@ -33,9 +33,4 @@ $foo->testLegacyFoo();
 
 ?>
 --EXPECTF--
-Legacy deprecation triggered by FooTestCase::testLegacyFoo:
-silenced foo deprecation
-Stack trace:
-#%A(%d): FooTestCase->testLegacyFoo()
-#%d {main}
-
+Deprecated: unsilenced foo deprecation in Standard input code on line 24
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/eval_not_self.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/eval_not_self.phpt
index 5701f75..798dfc6 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/eval_not_self.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/eval_not_self.phpt
@@ -20,6 +20,3 @@ eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);");
 
 ?>
 --EXPECTF--
-Other deprecation notices (1)
-
-  1x: who knows where I come from?
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt
index 5b80791..112a02b 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt
@@ -62,4 +62,3 @@ print "Cannot test baselineFile contents because it is generated in a shutdown f
 ?>
 --EXPECT--
 Cannot test baselineFile contents because it is generated in a shutdown function registered by another shutdown function.
-Legacy deprecation notices (1)
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt
index 44d8620..41f7d3b 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt
@@ -70,11 +70,3 @@ $foo->testLegacyFoo();
 $foo->testNonLegacyBar();
 ?>
 --EXPECTF--
-Legacy deprecation notices (1)
-
-Other deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: not ignored bar deprecation
-    1x in FooTestCase::testNonLegacyBar
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/lagging_vendor.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/lagging_vendor.phpt
index b5253df..6ea1385 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/lagging_vendor.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/lagging_vendor.phpt
@@ -33,7 +33,3 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 
 ?>
 --EXPECTF--
-Remaining indirect deprecation notices (1)
-
-  1x: Since acme/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in SomeService::deprecatedApi from acme\lib
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/multiple_autoloads.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/multiple_autoloads.phpt
index edf9f4f..cb8ff81 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/multiple_autoloads.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/multiple_autoloads.phpt
@@ -36,10 +36,3 @@ require __DIR__.'/fake_vendor_bis/autoload.php';
 (new \App\Services\AppService())->directDeprecations();
 ?>
 --EXPECTF--
-Remaining direct deprecation notices (2)
-
-  1x: Since acme/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in AppService::directDeprecations from App\Services
-
-  1x: deprecatedApi from foo is deprecated! You should stop relying on it!
-    1x in AppService::directDeprecations from App\Services
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt
index 83b135b..b7be2d6 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt
@@ -22,14 +22,8 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 23
 
-Remaining direct deprecation notices (2)
-
-Remaining indirect deprecation notices (1)
-
-  1x: Since acme/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in SomeService::deprecatedApi from acme\lib
-
-Legacy deprecation notices (2)
+Deprecated: unsilenced foo deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 25
 
+Deprecated: unsilenced bar deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 31
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt
index 4d0d6c3..f450bdf 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt
@@ -22,15 +22,8 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 23
 
-Remaining direct deprecation notices (2)
+Deprecated: unsilenced foo deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 25
 
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Remaining indirect deprecation notices (1)
-
-Legacy deprecation notices (2)
+Deprecated: unsilenced bar deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 31
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/php_deprecation_from_vendor_class.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/php_deprecation_from_vendor_class.phpt
index 1ead2ef..a1bf51b 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/php_deprecation_from_vendor_class.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/php_deprecation_from_vendor_class.phpt
@@ -37,7 +37,4 @@ new \acme\lib\PhpDeprecation();
 
 ?>
 --EXPECTF--
-Remaining indirect deprecation notices (1)
-
-  1x: acme\lib\PhpDeprecation implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)
-    1x in DebugClassLoader::loadClass from Symfony\Component\ErrorHandler
+Deprecated: acme\lib\PhpDeprecation implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/PhpDeprecation.php on line 5
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt
index 5b6e325..126b251 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt
@@ -33,8 +33,4 @@ $foo->testLegacyFoo();
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (1)
-
-Legacy deprecation notices (1)
-
-Other deprecation notices (1)
+Deprecated: unsilenced foo deprecation in Standard input code on line 24
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet_but_failing.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet_but_failing.phpt
index 8d8f8b4..ae77b51 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet_but_failing.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet_but_failing.phpt
@@ -33,7 +33,3 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 
 ?>
 --EXPECTF--
-Remaining indirect deprecation notices (1)
-
-  1x: Since acme/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in SomeService::deprecatedApi from acme\lib
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/self_on_non_vendor.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/self_on_non_vendor.phpt
index 42a6c0d..a491014 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/self_on_non_vendor.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/self_on_non_vendor.phpt
@@ -54,20 +54,8 @@ $foo->testNonLegacyBar();
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in Standard input code on line 37
 
-  2x: unsilenced foo deprecation
-    2x in FooTestCase::testLegacyFoo
-
-  1x: unsilenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Legacy deprecation notices (1)
-
-Other deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
+Deprecated: unsilenced foo deprecation in Standard input code on line 38
 
+Deprecated: unsilenced bar deprecation in Standard input code on line 44
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
index 48049c0..da8a81a 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
@@ -67,25 +67,8 @@ register_shutdown_function(function () {
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in Standard input code on line 46
 
-  2x: unsilenced foo deprecation
-    2x in FooTestCase::testLegacyFoo
+Deprecated: unsilenced foo deprecation in Standard input code on line 47
 
-  1x: unsilenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Legacy deprecation notices (1)
-
-Other deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Shutdown-time deprecations:
-
-Other deprecation notices (1)
-
-  1x: root deprecation during shutdown
+Deprecated: unsilenced bar deprecation in Standard input code on line 53
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt
index 261b6ec..9d36153 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt
@@ -38,21 +38,3 @@ require __DIR__.'/fake_vendor/autoload.php';
 trigger_deprecation('foo/bar', '2.0', 'func is deprecated, use new instead.');
 ?>
 --EXPECTF--
-Remaining self deprecation notices (1)
-
-  1x: Since App 3.0: selfDeprecation is deprecated, use selfDeprecation_new instead.
-    1x in AppService::selfDeprecation from App\Services
-
-Remaining direct deprecation notices (1)
-
-  1x: Since acme/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in AppService::directDeprecation from App\Services
-
-Remaining indirect deprecation notices (1)
-
-  1x: Since bar/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in AppService::indirectDeprecation from App\Services
-
-Other deprecation notices (1)
-
-  1x: Since foo/bar 2.0: func is deprecated, use new instead.
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_error_types.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_error_types.phpt
index 4dd6bda..2fd7afa 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_error_types.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_error_types.phpt
@@ -38,21 +38,3 @@ require __DIR__.'/fake_vendor/autoload.php';
 @trigger_error('Since foo/bar 2.0: func is deprecated, use new instead.', E_USER_DEPRECATED);
 ?>
 --EXPECTF--
-Remaining self deprecation notices (1)
-
-  1x: Since App 3.0: selfDeprecation is deprecated, use selfDeprecation_new instead.
-    1x in AppService::selfDeprecation from App\Services
-
-Remaining direct deprecation notices (1)
-
-  1x: Since acme/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in AppService::directDeprecation from App\Services
-
-Remaining indirect deprecation notices (1)
-
-  1x: Since bar/lib 3.0: deprecatedApi is deprecated, use deprecatedApi_new instead.
-    1x in AppService::indirectDeprecation from App\Services
-
-Other deprecation notices (1)
-
-  1x: Since foo/bar 2.0: func is deprecated, use new instead.
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
index 1922e47..c427a17 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
@@ -33,8 +33,4 @@ $foo->testLegacyFoo();
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (1)
-
-Legacy deprecation notices (1)
-
-Other deprecation notices (1)
+Deprecated: unsilenced foo deprecation in Standard input code on line 24
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
index d1be3e9c..9925cdf 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
@@ -20,6 +20,3 @@ eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);");
 
 ?>
 --EXPECTF--
-Other deprecation notices (1)
-
-  1x: who knows where I come from?
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt
index 7bf5428..b6b840e 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt
@@ -22,6 +22,3 @@ include 'phar://deprecation.phar/deprecation.php';
 
 ?>
 --EXPECTF--
-Other deprecation notices (1)
-
-  1x: I come from… afar! :D
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
index c9b323f..21c1244 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
@@ -21,19 +21,8 @@ require __DIR__.'/fake_vendor/acme/lib/deprecation_riddled.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 23
 
-  2x: unsilenced foo deprecation
-    2x in FooTestCase::testLegacyFoo
+Deprecated: unsilenced foo deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 25
 
-  1x: unsilenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Remaining direct deprecation notices (2)
-
-  1x: root deprecation
-
-  1x: silenced bar deprecation
-    1x in FooTestCase::testNonLegacyBar
-
-Legacy deprecation notices (2)
+Deprecated: unsilenced bar deprecation in /build/reproducible-path/symfony-%s/build/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 31