Always show all deprecations except legacy ones

greg0ire · greg0ire · commit abc2e371040b · 2018-01-31T20:27:10.000+01:00
When using weak or weak vendors, you want your build to fail on some or
all deprecations, but it is still nice to be able to see what you could
fix without having to change modes.
diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * all deprecations but those from tests marked with `@group legacy` are always
+   displayed, regardless of the mode.
+
 4.0.0
 -----
 
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -165,13 +165,13 @@ public static function register($mode = 0)
 
                     exit(1);
                 }
-                if ('legacy' !== $group && !$isWeak) {
+                if ('legacy' !== $group) {
                     $ref = &$deprecations[$group][$msg]['count'];
                     ++$ref;
                     $ref = &$deprecations[$group][$msg][$class.'::'.$method];
                     ++$ref;
                 }
-            } elseif (!$isWeak) {
+            } else {
                 $ref = &$deprecations[$group][$msg]['count'];
                 ++$ref;
             }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
@@ -34,7 +34,11 @@ $foo->testLegacyFoo();
 --EXPECTF--
 Unsilenced deprecation notices (1)
 
+  1x: unsilenced foo deprecation
+    1x in FooTestCase::testLegacyFoo
+
 Legacy deprecation notices (1)
 
 Other deprecation notices (1)
 
+  1x: root deprecation
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
@@ -21,3 +21,5 @@ 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
@@ -23,3 +23,5 @@ 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
@@ -22,8 +22,19 @@ require __DIR__.'/fake_vendor/acme/lib/deprecation_riddled.php';
 --EXPECTF--
 Unsilenced deprecation notices (2)
 
+  1x: unsilenced foo deprecation
+    1x in FooTestCase::testLegacyFoo
+
+  1x: unsilenced bar deprecation
+    1x in FooTestCase::testNonLegacyBar
+
 Remaining vendor deprecation notices (1)
 
+  1x: silenced bar deprecation
+    1x in FooTestCase::testNonLegacyBar
+
 Legacy deprecation notices (1)
 
 Other deprecation notices (1)
+
+  1x: root deprecation

Original file line number	Diff line number	Diff line change
`@@ -165,13 +165,13 @@ public static function register($mode = 0)`
`165`	`165`
`166`	`166`	`exit(1);`
`167`	`167`	`}`
`168`		`- if ('legacy' !== $group && !$isWeak) {`
	`168`	`+ if ('legacy' !== $group) {`
`169`	`169`	`$ref = &$deprecations[$group][$msg]['count'];`
`170`	`170`	`++$ref;`
`171`	`171`	`$ref = &$deprecations[$group][$msg][$class.'::'.$method];`
`172`	`172`	`++$ref;`
`173`	`173`	`}`
`174`		`- } elseif (!$isWeak) {`
	`174`	`+ } else {`
`175`	`175`	`$ref = &$deprecations[$group][$msg]['count'];`
`176`	`176`	`++$ref;`
`177`	`177`	`}`