Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit 7822436b9665 · 2018-02-11T22:41:21.000+01:00
* 4.0: [Bridge/PhpUnit] Fix tests by backporting #25997 to 3.4
diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -1,12 +1,6 @@
 CHANGELOG
 =========
 
-4.1.0
------
-
- * all deprecations but those from tests marked with `@group legacy` are always
-   displayed when not in `weak` mode.
-
 4.0.0
 -----
 
@@ -22,6 +16,8 @@ CHANGELOG
 -----
 
  * added a `CoverageListener` to enhance the code coverage report
+ * all deprecations but those from tests marked with `@group legacy` are always
+   displayed when not in `weak` mode
 
 3.3.0
 -----
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php
@@ -21,6 +21,8 @@ public function testLegacyFoo()
     {
         @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
         trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+        @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
+        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
     }
 
     public function testNonLegacyBar()
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
@@ -20,10 +20,10 @@ require __DIR__.'/fake_vendor/acme/lib/deprecation_riddled.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (2)
+Unsilenced deprecation notices (3)
 
-  1x: unsilenced foo deprecation
-    1x in FooTestCase::testLegacyFoo
+  2x: unsilenced foo deprecation
+    2x in FooTestCase::testLegacyFoo
 
   1x: unsilenced bar deprecation
     1x in FooTestCase::testNonLegacyBar
@@ -33,7 +33,7 @@ Remaining vendor deprecation notices (1)
   1x: silenced bar deprecation
     1x in FooTestCase::testNonLegacyBar
 
-Legacy deprecation notices (1)
+Legacy deprecation notices (2)
 
 Other deprecation notices (1)
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ public function testLegacyFoo()`
`21`	`21`	`{`
`22`	`22`	`@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);`
`23`	`23`	`trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
	`24`	`+ @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);`
	`25`	`+ trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`public function testNonLegacyBar()`