bug #39091 [Config] Recheck glob brace support after GlobResource was serialized (wouterj)

derrabus · derrabus · commit cf70d3a18093 · 2020-11-16T15:38:21.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Config] Recheck glob brace support after GlobResource was serialized | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - cc @bastnic This bug was reported on Symfony Slack: `$this->globBrace` is set to `null` after unserialization from the `.meta` file. Instead of serializing this property, I decided to reinitialize the property after unserialization. I think that's a safer option (e.g. it works when the cache is build on a different server with different globBrace support than the one running the application). Commits ------- d953477 Reinitialize globBrace after unserialization
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -94,6 +94,14 @@ public function __sleep(): array
         return ['prefix', 'pattern', 'recursive', 'hash', 'forExclusion', 'excludedPrefixes'];
     }
 
+    /**
+     * @internal
+     */
+    public function __wakeup(): void
+    {
+        $this->globBrace = \defined('GLOB_BRACE') ? \GLOB_BRACE : 0;
+    }
+
     /**
      * @return \Traversable
      */
diff --git a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
@@ -194,4 +194,17 @@ public function testUnbalancedBraceFallback()
 
         $this->assertSame([], array_keys(iterator_to_array($resource)));
     }
+
+    public function testSerializeUnserialize()
+    {
+        $dir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures';
+        $resource = new GlobResource($dir, '/Resource', true);
+
+        $newResource = unserialize(serialize($resource));
+
+        $p = new \ReflectionProperty($resource, 'globBrace');
+        $p->setAccessible(true);
+
+        $this->assertEquals($p->getValue($resource), $p->getValue($newResource));
+    }
 }
