From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Mon, 3 Nov 2025 17:19:47 +0100
Subject: [PhpUnit] Update expected output

TODO: investigate.

Forwarded: not-needed
---
 .../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 598e785..de01724 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt
@@ -79,4 +79,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 48818aa..efaa9f3 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt
@@ -67,11 +67,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 dc9af7e..53281bf 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt
@@ -70,11 +70,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 0270672..1fa1365 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
@@ -36,7 +36,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 019aa9c..ea27898 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
@@ -36,7 +36,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 22268f1..7c1e027 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -68,21 +68,9 @@ register_shutdown_function(function () {
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in Standard input code on line 47
 
-  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 48
 
+Deprecated: unsilenced bar deprecation in Standard input code on line 54
 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 f2d5a6f..2ed5336 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecated_regexp.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecated_regexp.phpt
@@ -34,9 +34,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 25
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 7c0af44..36ed2ce 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/eval_not_self.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/eval_not_self.phpt
@@ -21,6 +21,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 cc6c9ae..2117038 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt
@@ -63,4 +63,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 bab9612..8b23360 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ignore.phpt
@@ -71,11 +71,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 2dfa51a..3c74f6d 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/lagging_vendor.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/lagging_vendor.phpt
@@ -34,7 +34,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 bba85fd..fc86d6e 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/multiple_autoloads.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/multiple_autoloads.phpt
@@ -37,10 +37,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 e3f8be4..5326b1d 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt
@@ -23,14 +23,8 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 32
 
-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 /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 34
 
+Deprecated: unsilenced bar deprecation in /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 40
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt
index 65edfb2..5d6afce 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet2.phpt
@@ -23,15 +23,8 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 32
 
-Remaining direct deprecation notices (2)
+Deprecated: unsilenced foo deprecation in /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 34
 
-  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 /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 40
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 bfa3858..03e77db 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
@@ -36,7 +36,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 /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/PhpDeprecation.php on line 14
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt
index 78bbafb..d9cc201 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet.phpt
@@ -34,8 +34,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 25
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 2ada89f..8edd394 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet_but_failing.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/quiet_but_failing.phpt
@@ -34,7 +34,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 5b3b089..b25c1b2 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
@@ -55,20 +55,8 @@ $foo->testNonLegacyBar();
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in Standard input code on line 38
 
-  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 39
 
+Deprecated: unsilenced bar deprecation in Standard input code on line 45
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
index fb6963e..77184db 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
@@ -68,25 +68,8 @@ register_shutdown_function(function () {
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in Standard input code on line 47
 
-  2x: unsilenced foo deprecation
-    2x in FooTestCase::testLegacyFoo
+Deprecated: unsilenced foo deprecation in Standard input code on line 48
 
-  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 54
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 c509fc2..6f7e7a5 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_deprecation_types.phpt
@@ -39,21 +39,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 1870f30..bf2db5a 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_error_types.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/trigger_error_types.phpt
@@ -39,21 +39,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 e3120c4..9e9423c 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
@@ -34,8 +34,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 25
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 8b8cdbd..842f9ad 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
@@ -21,6 +21,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 0094fea..426a7e2 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
@@ -23,6 +23,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 93f2c40..26431d9 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
@@ -22,19 +22,8 @@ require __DIR__.'/fake_vendor/acme/lib/deprecation_riddled.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (3)
+Deprecated: unsilenced foo deprecation in /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 32
 
-  2x: unsilenced foo deprecation
-    2x in FooTestCase::testLegacyFoo
+Deprecated: unsilenced foo deprecation in /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 34
 
-  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 /%s/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php on line 40