From aa60d5be2018f41e193f7bb3e82dcf3f99375b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 26 Jan 2016 19:13:14 +0100
Subject: [PATCH] [Validator] Minor fixes for the PSR-6 adapter

---
 .../Validator/Mapping/Cache/Psr6Cache.php         |  6 ++----
 .../Tests/Mapping/Cache/AbstractCacheTest.php     | 15 ++++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php b/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
index 5c671220d2c11..f05a4ae9811fb 100644
--- 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
index 0b181a2f95a38..f93b68737be55 100644
--- 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,7 +35,7 @@ public function testWrite()
         $this->cache->write($meta);
 
         $this->assertInstanceOf(
-            'Symfony\\Component\\Validator\\Mapping\\ClassMetadata',
+            ClassMetadata::class,
             $this->cache->read('Foo\\Bar'),
             'write() stores metadata'
         );
@@ -42,7 +43,7 @@ public function testWrite()
 
     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');
     }
 }