8000 Extract method refactoring for ResourceCheckerConfigCache by mpdude · Pull Request #22589 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Extract method refactoring for ResourceCheckerConfigCache #22589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Extract method refactoring for ResourceCheckerConfigCache #22589

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d67c8f6
Extract method refactoring for ResourceCheckerConfigCache
mpdude Apr 30, 2017
3ee1b2c
Remove useless statement
mpdude May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Extract method refactoring for ResourceCheckerConfigCache
  • Loading branch information
@mpdude
mpdude committed Apr 30, 2017
commit d67c8f644fece9bb3cfabf991b1f41b739f7d300
57 changes: 35 additions & 22 deletions src/Symfony/Component/Config/ResourceCheckerConfigCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,37 +73,19 @@ public function isFresh()
}

$metadata = $this->getMetaFile();

if (!is_file($metadata)) {
return false;
}

$e = null;
$meta = false;
$time = filemtime($this->file);
$signalingException = new \UnexpectedValueException();
$prevUnserializeHandler = ini_set('unserialize_callback_func', '');
$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) use (&$prevErrorHandler, $signalingException) {
if (E_WARNING === $type && 'Class __PHP_Incomplete_Class has no unserializer' === $msg) {
throw $signalingException;
}

return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
});
$meta = $this->safelyUnserialize($metadata);

try {
$meta = unserialize(file_get_contents($metadata));
} catch (\Error $e) {
} catch (\Exception $e) {
}
restore_error_handler();
ini_set('unserialize_callback_func', $prevUnserializeHandler);
if (null !== $e && $e !== $signalingException) {
throw $e;
}
if (false === $meta) {
return false;
}

$time = filemtime($this->file);

foreach ($meta as $resource) {
/* @var ResourceInterface $resource */
foreach ($this->resourceCheckers as $checker) {
Expand Down Expand Up @@ -161,4 +143,35 @@ private function getMetaFile()
{
return $this->file.'.meta';
}

private function safelyUnserialize($file)
{
$e = null;
$meta = false;
$signalingException = new \UnexpectedValueException();
$prevUnserializeHandler = ini_set('unserialize_callback_func', '');
$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) use (&$prevErrorHandler, $signalingException) {
if (E_WARNING === $type && 'Class __PHP_Incomplete_Class has no unserializer' === $msg) {
throw $signalingException;
}

return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
});

try {
$meta = unserialize(file_get_contents($file));
} catch (\Error $e) {
} catch (\Exception $e) {
}
restore_error_handler();
ini_set('unserialize_callback_func', $prevUnserializeHandler);
if (null !== $e && $e !== $signalingException) {
throw $e;
}
if (false === $meta) {
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should become null instead of false, the way the method is used, it looks like a nullable return type.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the return type is mixed, so nullable or not doesn't matter really.
Still, this "if" should be just removed, the return $meta; below is enough here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I just extracted the method without additional scrutinity and indeed these lines are no longer needed.

}

return $meta;
}
}
0