bug #37937 [Serializer] fixed fix encoding of cache keys with anonymous classes (michaelzangerle)

nicolas-grekas · nicolas-grekas · commit 93459a93bd19 · 2020-08-31T18:04:23.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Serializer] fixed fix encoding of cache keys with anonymous classes | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #36589 | License | MIT | Doc PR | - Commits ------- 3a46753 [Serializer] fixed fix encoding of cache keys with anonymous classes
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php
@@ -44,8 +44,7 @@ public function __construct(ClassMetadataFactoryInterface $decorated, CacheItemP
     public function getMetadataFor($value)
     {
         $class = $this->getClass($value);
-        // Key cannot contain backslashes according to PSR-6
-        $key = strtr($class, '\\', '_');
+        $key = rawurlencode(strtr($class, '\\', '_'));
 
         $item = $this->cacheItemPool->getItem($key);
         if ($item->isHit()) {
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
@@ -63,4 +63,20 @@ public function testInvalidClassThrowsException()
 
         $factory->getMetadataFor('Not\Exist');
     }
+
+    public function testAnonymousClass()
+    {
+        $anonymousObject = new class() {
+        };
+
+        $metadata = new ClassMetadata(\get_class($anonymousObject));
+        $decorated = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
+        $decorated
+            ->expects($this->once())
+            ->method('getMetadataFor')
+            ->willReturn($metadata);
+
+        $factory = new CacheClassMetadataFactory($decorated, new ArrayAdapter());
+        $this->assertEquals($metadata, $factory->getMetadataFor($anonymousObject));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public function __construct(ClassMetadataFactoryInterface $decorated, CacheItemP`
`44`	`44`	`public function getMetadataFor($value)`
`45`	`45`	`{`
`46`	`46`	`$class = $this->getClass($value);`
`47`		`- // Key cannot contain backslashes according to PSR-6`
`48`		`- $key = strtr($class, '\\', '_');`
	`47`	`+ $key = rawurlencode(strtr($class, '\\', '_'));`
`49`	`48`
`50`	`49`	`$item = $this->cacheItemPool->getItem($key);`
`51`	`50`	`if ($item->isHit()) {`