Skip to content

Commit

Permalink
[PhpUnitBridge] fix PHP 5.3 compat
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Feb 6, 2019
1 parent 205b0ba commit b45cbf6
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
View file
Expand Up @@ -54,9 +54,9 @@ public static function register($mode = 0)
if (false === $mode) {
$mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
}
if (self::MODE_DISABLED !== $mode
&& self::MODE_WEAK !== $mode
&& self::MODE_WEAK_VENDORS !== $mode
if (DeprecationErrorHandler::MODE_DISABLED !== $mode
&& DeprecationErrorHandler::MODE_WEAK !== $mode
&& DeprecationErrorHandler::MODE_WEAK_VENDORS !== $mode
&& (!isset($mode[0]) || '/' !== $mode[0])
) {
$mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
Expand Down Expand Up @@ -106,15 +106,15 @@ public static function register($mode = 0)
);
$deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
$mode = $getMode();
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || self::MODE_DISABLED === $mode) {
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
$ErrorHandler = $UtilPrefix.'ErrorHandler';

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

$trace = debug_backtrace();
$group = 'other';
$isVendor = self::MODE_WEAK_VENDORS === $mode && $inVendors($file);
$isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && $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\\')))) {
Expand All @@ -131,7 +131,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 = self::MODE_WEAK_VENDORS === $mode && isset($parsedMsg['triggering_file']) && $inVendors($parsedMsg['triggering_file']);
$isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && 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'];
Expand Down Expand Up @@ -168,13 +168,13 @@ public static function register($mode = 0)

exit(1);
}
if ('legacy' !== $group && self::MODE_WEAK !== $mode) {
if ('legacy' !== $group && DeprecationErrorHandler::MODE_WEAK !== $mode) {
$ref = &$deprecations[$group][$msg]['count'];
++$ref;
$ref = &$deprecations[$group][$msg][$class.'::'.$method];
++$ref;
}
} elseif (self::MODE_WEAK !== $mode) {
} elseif (DeprecationErrorHandler::MODE_WEAK !== $mode) {
$ref = &$deprecations[$group][$msg]['count'];
++$ref;
}
Expand Down Expand Up @@ -207,7 +207,7 @@ public static function register($mode = 0)
$currErrorHandler = set_error_handler('var_dump');
restore_error_handler();

if (self::MODE_WEAK === $mode) {
if (DeprecationErrorHandler::MODE_WEAK === $mode) {
$colorize = function ($str) { return $str; };
}
if ($currErrorHandler !== $deprecationHandler) {
Expand All @@ -219,7 +219,7 @@ public static function register($mode = 0)
};

$groups = array('unsilenced', 'remaining');
if (self::MODE_WEAK_VENDORS === $mode) {
if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
$groups[] = 'remaining vendor';
}
array_push($groups, 'legacy', 'other');
Expand Down Expand Up @@ -255,7 +255,7 @@ public static function register($mode = 0)
$displayDeprecations($deprecations);

// store failing status
$isFailing = self::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount'];
$isFailing = DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount'];

// reset deprecations array
foreach ($deprecations as $group => $arrayOrInt) {
Expand All @@ -270,7 +270,7 @@ public static function register($mode = 0)
}
}
$displayDeprecations($deprecations);
if ($isFailing || self::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
if ($isFailing || DeprecationErrorHandler::MODE_WEAK !== $mode && $mode < $deprecations['unsilencedCount'] + $deprecations['remainingCount'] + $deprecations['otherCount']) {
exit(1);
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
View file
Expand Up @@ -25,7 +25,7 @@ class Test
{
public static function getGroups()
{
return [];
return array();
}
}
EOPHP
Expand Down
2 changes: 1 addition & 1 deletion ...Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php
View file
Expand Up @@ -7,7 +7,7 @@ class Test
{
public static function getGroups()
{
return [];
return array();
}
}
EOPHP
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
View file
Expand Up @@ -25,7 +25,7 @@ class Test
{
public static function getGroups()
{
return [];
return array();
}
}
EOPHP
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt
View file
Expand Up @@ -25,7 +25,7 @@ class Test
{
public static function getGroups()
{
return [];
return array();
}
}
EOPHP
Expand Down

0 comments on commit b45cbf6

Please sign in to comment.