diff --git a/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php b/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php index 5c671220d2c1..f05a4ae9811f 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 0b181a2f95a3..f93b68737be5 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'); } }
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: