Merge branch '4.0'

* 4.0:
  fix merge

Author: nicolas-grekas

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

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