Merge branch '3.4' into 4.0

* 3.4:
  fix merge
This commit is contained in:
Nicolas Grekas 2018-02-11 18:30:36 +01:00
commit c422bac6b6

View File

@ -215,13 +215,13 @@ class DeprecationErrorHandler
return $b['count'] - $a['count']; return $b['count'] - $a['count'];
}; };
$displayDeprecations = function ($deprecations) use ($colorize, $cmp) { $groups = array('unsilenced', 'remaining');
$groups = array('unsilenced', 'remaining'); if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
$groups[] = 'remaining vendor'; $groups[] = 'remaining vendor';
} }
array_push($groups, 'legacy', 'other'); array_push($groups, 'legacy', 'other');
$displayDeprecations = function ($deprecations) use ($colorize, $cmp, $groups) {
foreach ($groups as $group) { foreach ($groups as $group) {
if ($deprecations[$group.'Count']) { if ($deprecations[$group.'Count']) {
echo "\n", $colorize( echo "\n", $colorize(