bug #30034 [Config] ensure moving away from Serializable wont break cache:clear (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c7937c9749ea · 2019-01-30T12:20:19.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Config] ensure moving away from Serializable wont break cache:clear | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When a resource implementation moves away from `Serializable`, the `cache:clear` command currently fails with `Warning: Class Symfony\Component\Config\Resource\ClassExistenceResource has no unserializer`. This change makes it ignore the failure, which is fine. Commits ------- 9d3180a [Config] ensure moving away from Serializable wont break cache:clear
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -156,18 +156,19 @@ private function safelyUnserialize($file)
     {
         $e = null;
         $meta = false;
+        $content = file_get_contents($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) {
+            if (__FILE__ === $file) {
                 throw $signalingException;
             }
 
             return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
         });
 
         try {
-            $meta = unserialize(file_get_contents($file));
+            $meta = unserialize($content);
         } catch (\Error $e) {
         } catch (\Exception $e) {
         }
