minor #17549 [Validator] Minor fixes for the PSR-6 adapter (dunglas)

fabpot · fabpot · commit 712eeed5bbb7 · 2016-01-27T05:36:25.000+01:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Validator] Minor fixes for the PSR-6 adapter | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | todo Follows #17440. Take into account comments of @Tobion. Commits ------- aa60d5b [Validator] Minor fixes for the PSR-6 adapter
diff --git a/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php b/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
@@ -36,9 +36,7 @@ public function __construct(CacheItemPoolInterface $cacheItemPool)
      */
     public function has($class)
     {
-        $item = $this->cacheItemPool->getItem($this->escapeClassName($class));
-
-        return $item->isHit();
+        return $this->cacheItemPool->hasItem($this->escapeClassName($class));
     }
 
     /**
@@ -75,6 +73,6 @@ public function write(ClassMetadata $metadata)
      */
     private function escapeClassName($class)
     {
-        return strtr($class, '\\', '.');
+        return str_replace('\\', '.', $class);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Cache;
 
 use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
 {
@@ -22,7 +23,7 @@ abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
 
     public function testWrite()
     {
-        $meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
+        $meta = $this->getMockBuilder(ClassMetadata::class)
             ->disableOriginalConstructor()
             ->setMethods(array('getClassName'))
             ->getMock();
@@ -34,15 +35,15 @@ public function testWrite()
         $this->cache->write($meta);
 
         $this->assertInstanceOf(
-            'Symfony\\Component\\Validator\\Mapping\\ClassMetadata',
+            ClassMetadata::class,
             $this->cache->read('Foo\\Bar'),
             'write() stores metadata'
         );
     }
 
     public function testHas()
     {
-        $meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
+        $meta = $this->getMockBuilder(ClassMetadata::class)
             ->disableOriginalConstructor()
             ->setMethods(array('getClassName'))
             ->getMock();
@@ -59,7 +60,7 @@ public function testHas()
 
     public function testRead()
     {
-        $meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
+        $meta = $this->getMockBuilder(ClassMetadata::class)
             ->disableOriginalConstructor()
             ->setMethods(array('getClassName'))
             ->getMock();
@@ -72,10 +73,6 @@ public function testRead()
 
         $this->cache->write($meta);
 
-        $this->assertInstanceOf(
-            'Symfony\\Component\\Validator\\Mapping\\ClassMetadata',
-            $this->cache->read('Foo\\Bar'),
-            'read() returns metadata'
-        );
+        $this->assertInstanceOf(ClassMetadata::class, $this->cache->read('Foo\\Bar'), 'read() returns metadata');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@ public function __construct(CacheItemPoolInterface $cacheItemPool)`
`36`	`36`	`*/`
`37`	`37`	`public function has($class)`
`38`	`38`	`{`
`39`		`- $item = $this->cacheItemPool->getItem($this->escapeClassName($class));`
`40`		`-`
`41`		`- return $item->isHit();`
	`39`	`+ return $this->cacheItemPool->hasItem($this->escapeClassName($class));`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`/**`
`@@ -75,6 +73,6 @@ public function write(ClassMetadata $metadata)`
`75`	`73`	`*/`
`76`	`74`	`private function escapeClassName($class)`
`77`	`75`	`{`
`78`		`- return strtr($class, '\\', '.');`
	`76`	`+ return str_replace('\\', '.', $class);`
`79`	`77`	`}`
`80`	`78`	`}`