minor #22589 Extract method refactoring for ResourceCheckerConfigCache (mpdude)

nicolas-grekas · nicolas-grekas · commit 07f79737bc02 · 2017-09-26T16:36:06.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes #22589). Discussion ---------- Extract method refactoring for ResourceCheckerConfigCache | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Improves code readability. Commits ------- 685c353 Extract method refactoring for ResourceCheckerConfigCache
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -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) {
@@ -161,4 +143,32 @@ 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;
+        }
+
+        return $meta;
+    }
 }
