Skip to content

Commit 2cc651a

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [TwigBridge] Fix test Remove unnecessary ProgressBar stdout writes (fixes flickering) [Validator] improve translations for albanian ("sq") locale [VarDumper] fix serializing Stub instances Don't resolve the Deprecation error handler mode until a deprecation is triggered bug #30245 fix lost namespace in eval (fizzka) [Twig] removed usage of non-namespaced classes added missing dot Update validators.lt.xlf #30172 Add the missing validation translations for the Luxembourgish … [Debug][ErrorHandler] Preserve next error handler
2 parents 5fba7a2 + b539f37 commit 2cc651a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

DeprecationErrorHandler.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ public static function register($mode = 0)
9898
'legacyCount' => 0,
9999
'otherCount' => 0,
100100
'remaining vendorCount' => 0,
101-
'unsilenced' => [],
102-
'remaining' => [],
103-
'legacy' => [],
104-
'other' => [],
105-
'remaining vendor' => [],
101+
'unsilenced' => array(),
102+
'remaining' => array(),
103+
'legacy' => array(),
104+
'other' => array(),
105+
'remaining vendor' => array(),
106106
];
107-
$deprecationHandler = function ($type, $msg, $file, $line, $context = []) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
107+
$deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
108108
$mode = $getMode();
109-
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || self::MODE_DISABLED === $mode) {
109+
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
110110
$ErrorHandler = $UtilPrefix.'ErrorHandler';
111111

112112
return $ErrorHandler::handleError($type, $msg, $file, $line, $context);

0 commit comments

Comments
 (0)