bug #21986 Stop relying on the $mode argument (greg0ire)

nicolas-grekas · nicolas-grekas · commit f2ae2ed75d2d · 2017-03-14T08:29:25.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- Stop relying on the $mode argument When registering the error handler, simple-phpunit might be used, and in that case, the bootstrap process will not have environment variables defined inside phpunit.xml.dist . This means `$mode` might differ when registering the error handler, and when an error is triggered. This raises a question: should the $mode argument be removed to avoid similar errors in the future? | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | yes/no | Deprecations? | yes/no  | Tests pass? | yes/no | Fixed tickets | #21980 | License | MIT | Doc PR | n/a  Commits ------- 0d180d5 Stop relying on the $mode argument
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -90,17 +90,13 @@ public static function register($mode = 0)
             'remainingCount' => 0,
             'legacyCount' => 0,
             'otherCount' => 0,
+            'remaining vendorCount' => 0,
             'unsilenced' => array(),
             'remaining' => array(),
             'legacy' => array(),
             'other' => array(),
+            'remaining vendor' => array(),
         );
-        if (self::MODE_WEAK_VENDORS === $mode) {
-            $deprecations += array(
-                'remaining vendorCount' => 0,
-                'remaining vendor' => array(),
-            );
-        }
         $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
             $mode = $getMode();
             if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
