symfony
diff --git a/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+16-10Lines changed: 16 additions & 10 deletions b/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+16-10Lines changed: 16 additions & 10 deletions
@@ -110,7 +110,7 @@ public static function register($mode = 0)
 
             $trace = debug_backtrace(true);
             $group = 'other';
-            $isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && $inVendors($file);
+            $isVendor = $inVendors($file);
 
             $i = count($trace);
             while (1 < $i && (!isset($trace[--$i]['class']) || ('ReflectionMethod' === $trace[$i]['class'] || 0 === strpos($trace[$i]['class'], 'PHPUnit_') || 0 === strpos($trace[$i]['class'], 'PHPUnit\\')))) {
@@ -127,7 +127,7 @@ public static function register($mode = 0)
                     // \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
                     // then we need to use the serialized information to determine
                     // if the error has been triggered from vendor code.
-                    $isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && isset($parsedMsg['triggering_file']) && $inVendors($parsedMsg['triggering_file']);
+                    $isVendor = isset($parsedMsg['triggering_file']) && $inVendors($parsedMsg['triggering_file']);
                 } else {
                     $class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
                     $method = $trace[$i]['function'];
@@ -214,11 +214,7 @@ public static function register($mode = 0)
                     return $b['count'] - $a['count'];
                 };
 
-                $groups = array('unsilenced', 'remaining');
-                if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
-                    $groups[] = 'remaining vendor';
-                }
-                array_push($groups, 'legacy', 'other');
+                $groups = array('unsilenced', 'remaining', 'remaining vendor', 'legacy', 'other');
 
                 $displayDeprecations = function ($deprecations) use ($colorize, $cmp, $groups) {
                     foreach ($groups as $group) {
@@ -249,24 +245,34 @@ public static function register($mode = 0)
                 };
 
                 $displayDeprecations($deprecations);
+                $isPassing = function ($mode, $deprecations) {
+                    if (DeprecationErrorHandler::MODE_WEAK === $mode) {
+                        return true;
+                    }
+                    if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
+                        return 0 === $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount'];
+                    }
+
+                    return 0 === $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['remaining vendorCount'] + $deprecations['otherCount'];
+                };
 
                 // store failing status
-                $isFailing = DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount'];
+                $passesBeforeShutdown = !$isPassing($mode, $deprecations);
 
                 // reset deprecations array
                 foreach ($deprecations as $group => $arrayOrInt) {
                     $deprecations[$group] = is_int($arrayOrInt) ? 0 : array();
                 }
 
-                register_shutdown_function(function () use (&$deprecations, $isFailing, $displayDeprecations, $mode) {
+                register_shutdown_function(function () use (&$deprecations, $passesBeforeShutdown, $displayDeprecations, $isPassing, $mode) {
                     foreach ($deprecations as $group => $arrayOrInt) {
                         if (0 < (is_int($arrayOrInt) ? $arrayOrInt : count($arrayOrInt))) {
                             echo "Shutdown-time deprecations:\n";
                             break;
                         }
                     }
                     $displayDeprecations($deprecations);
-                    if ($isFailing || DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
+                    if (!$passesBeforeShutdown || !$isPassing($mode, $deprecations)) {
                         exit(1);
                     }
                 });