Merge branch '2.7' into 2.8
* 2.7: minor #25752 Don't right trim the deprecation message (alexpott)
This commit is contained in:
commit
844d81cbf5
@ -168,7 +168,7 @@ class DeprecationErrorHandler
|
||||
uasort($deprecations[$group], $cmp);
|
||||
|
||||
foreach ($deprecations[$group] as $msg => $notices) {
|
||||
echo "\n", rtrim($msg, '.'), ': ', $notices['count'], "x\n";
|
||||
echo "\n ", $notices['count'], 'x: ', $msg, "\n";
|
||||
|
||||
arsort($notices);
|
||||
|
||||
|
@ -63,20 +63,20 @@ $foo->testNonLegacyBar();
|
||||
--EXPECTF--
|
||||
Unsilenced deprecation notices (3)
|
||||
|
||||
unsilenced foo deprecation: 2x
|
||||
2x: unsilenced foo deprecation
|
||||
2x in FooTestCase::testLegacyFoo
|
||||
|
||||
unsilenced bar deprecation: 1x
|
||||
1x: unsilenced bar deprecation
|
||||
1x in FooTestCase::testNonLegacyBar
|
||||
|
||||
Remaining deprecation notices (1)
|
||||
|
||||
silenced bar deprecation: 1x
|
||||
1x: silenced bar deprecation
|
||||
1x in FooTestCase::testNonLegacyBar
|
||||
|
||||
Legacy deprecation notices (1)
|
||||
|
||||
Other deprecation notices (1)
|
||||
|
||||
root deprecation: 1x
|
||||
1x: root deprecation
|
||||
|
||||
|
Reference in New Issue
Block a user