Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit a8dcc9221ca6 · 2021-02-04T19:06:09.000+01:00
* 5.2:
  fix merge
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt
@@ -24,7 +24,7 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php';
 --EXPECTF--
 Unsilenced deprecation notices (3)
 
-Remaining direct deprecation notices (1)
+Remaining direct deprecation notices (2)
 
 Remaining indirect deprecation notices (1)
 
@@ -33,5 +33,3 @@ Remaining indirect deprecation notices (1)
 
 Legacy deprecation notices (2)
 
-Other deprecation notices (1)
-
