bug #30487 Fix Cache error while using anonymous class (Emmanuel BORGES)

nicolas-grekas · nicolas-grekas · commit 613bc421cde2 · 2019-03-15T14:35:18.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix Cache error while using anonymous class | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30395 | License | MIT Fix Cache error while using anonymous class Commits ------- 036e722 Fix Cache error while using anonymous class
diff --git a/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php b/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
@@ -70,6 +70,11 @@ public function write(ClassMetadata $metadata)
      */
     private function escapeClassName($class)
     {
+        if (false !== strpos($class, '@')) {
+            // anonymous class: replace all PSR6-reserved characters
+            return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class);
+        }
+
         return str_replace('\\', '.', $class);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/Psr6CacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/Psr6CacheTest.php
@@ -23,4 +23,12 @@ public function testNameCollision()
         $this->cache->write($metadata);
         $this->assertFalse($this->cache->has('Foo_Bar'));
     }
+
+    public function testNameWithInvalidChars()
+    {
+        $metadata = new ClassMetadata('class@anonymous/path/file');
+
+        $this->cache->write($metadata);
+        $this->assertTrue($this->cache->has('class@anonymous/path/file'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,11 @@ public function write(ClassMetadata $metadata)`
`70`	`70`	`*/`
`71`	`71`	`private function escapeClassName($class)`
`72`	`72`	`{`
	`73`	`+ if (false !== strpos($class, '@')) {`
	`74`	`+ // anonymous class: replace all PSR6-reserved characters`
	`75`	`+ return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class);`
	`76`	`+ }`
	`77`	`+`
`73`	`78`	`return str_replace('\\', '.', $class);`
`74`	`79`	`}`
`75`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,12 @@ public function testNameCollision()`
`23`	`23`	`$this->cache->write($metadata);`
`24`	`24`	`$this->assertFalse($this->cache->has('Foo_Bar'));`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public function testNameWithInvalidChars()`
	`28`	`+ {`
	`29`	`+ $metadata = new ClassMetadata('class@anonymous/path/file');`
	`30`	`+`
	`31`	`+ $this->cache->write($metadata);`
	`32`	`+ $this->assertTrue($this->cache->has('class@anonymous/path/file'));`
	`33`	`+ }`
`26`	`34`	`}`