diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Validator] Minor fixes for the PSR-6 adapter

Browse Source
This commit is contained in:
Kévin Dunglas 2016-01-26 19:13:14 +01:00
parent f1cdc6fd26
commit aa60d5be20
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
View File

@ -36,9 +36,7 @@ class Psr6Cache implements CacheInterface
*/
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 @@ class Psr6Cache implements CacheInterface
*/
private function escapeClassName($class)
{
return strtr($class, '\\', '_');
return str_replace('\\', '_', $class);
}
}

15
src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
View File

@ -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 @@ abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
$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 @@ abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
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 @@ abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
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 @@ abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
$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');
}
}