[Validator] PSR-6 cache: Avoid name collision

dunglas · dunglas · commit 12852c2aea09 · 2016-01-26T20:26:38.000+01:00
diff --git a/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php b/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
@@ -67,14 +67,14 @@ public function write(ClassMetadata $metadata)
     }
 
     /**
-     * Replaces backslashes by underscores in a class name.
+     * Replaces backslashes by dots in a class name.
      *
      * @param string $class
      *
      * @return string
      */
     private function escapeClassName($class)
     {
-        return strtr($class, '\\', '_');
+        return strtr($class, '\\', '.');
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/Psr6CacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/Psr6CacheTest.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Validator\Mapping\Cache\Psr6Cache;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
@@ -14,4 +15,12 @@ protected function setUp()
     {
         $this->cache = new Psr6Cache(new ArrayAdapter());
     }
+
+    public function testNameCollision()
+    {
+        $metadata = new ClassMetadata('Foo\\Bar');
+
+        $this->cache->write($metadata);
+        $this->assertFalse($this->cache->has('Foo_Bar'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,14 @@ public function write(ClassMetadata $metadata)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
`70`		`- * Replaces backslashes by underscores in a class name.`
	`70`	`+ * Replaces backslashes by dots in a class name.`
`71`	`71`	`*`
`72`	`72`	`* @param string $class`
`73`	`73`	`*`
`74`	`74`	`* @return string`
`75`	`75`	`*/`
`76`	`76`	`private function escapeClassName($class)`
`77`	`77`	`{`
`78`		`- return strtr($class, '\\', '_');`
	`78`	`+ return strtr($class, '\\', '.');`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use Symfony\Component\Cache\Adapter\ArrayAdapter;`
`6`	`6`	`use Symfony\Component\Validator\Mapping\Cache\Psr6Cache;`
	`7`	`+use Symfony\Component\Validator\Mapping\ClassMetadata;`
`7`	`8`
`8`	`9`	`/**`
`9`	`10`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`@@ -14,4 +15,12 @@ protected function setUp()`
`14`	`15`	`{`
`15`	`16`	`$this->cache = new Psr6Cache(new ArrayAdapter());`
`16`	`17`	`}`
	`18`	`+`
	`19`	`+ public function testNameCollision()`
	`20`	`+ {`
	`21`	`+ $metadata = new ClassMetadata('Foo\\Bar');`
	`22`	`+`
	`23`	`+ $this->cache->write($metadata);`
	`24`	`+ $this->assertFalse($this->cache->has('Foo_Bar'));`
	`25`	`+ }`
`17`	`26`	`}`