Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit aa60d5b

Browse filesBrowse files
committed
[Validator] Minor fixes for the PSR-6 adapter
1 parent f1cdc6f commit aa60d5b
Copy full SHA for aa60d5b

File tree

2 files changed

+8
-13
lines changed
Filter options

2 files changed

+8
-13
lines changed

‎src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
+2-4Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ public function __construct(CacheItemPoolInterface $cacheItemPool)
3636
*/
3737
public function has($class)
3838
{
39-
$item = $this->cacheItemPool->getItem($this->escapeClassName($class));
40-
41-
return $item->isHit();
39+
return $this->cacheItemPool->hasItem($this->escapeClassName($class));
4240
}
4341

4442
/**
@@ -75,6 +73,6 @@ public function write(ClassMetadata $metadata)
7573
*/
7674
private function escapeClassName($class)
7775
{
78-
return strtr($class, '\\', '_');
76+
return str_replace('\\', '_', $class);
7977
}
8078
}

‎src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
+6-9Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Validator\Tests\Mapping\Cache;
1313

1414
use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
15+
use Symfony\Component\Validator\Mapping\ClassMetadata;
1516

1617
abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
1718
{
@@ -22,7 +23,7 @@ abstract class AbstractCacheTest extends \PHPUnit_Framework_TestCase
2223

2324
public function testWrite()
2425
{
25-
$meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
26+
$meta = $this->getMockBuilder(ClassMetadata::class)
2627
->disableOriginalConstructor()
2728
->setMethods(array('getClassName'))
2829
->getMock();
@@ -34,15 +35,15 @@ public function testWrite()
3435
$this->cache->write($meta);
3536

3637
$this->assertInstanceOf(
37-
'Symfony\\Component\\Validator\\Mapping\\ClassMetadata',
38+
ClassMetadata::class,
3839
$this->cache->read('Foo\\Bar'),
3940
'write() stores metadata'
4041
);
4142
}
4243

4344
public function testHas()
4445
{
45-
$meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
46+
$meta = $this->getMockBuilder(ClassMetadata::class)
4647
->disableOriginalConstructor()
4748
->setMethods(array('getClassName'))
4849
->getMock();
@@ -59,7 +60,7 @@ public function testHas()
5960

6061
public function testRead()
6162
{
62-
$meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
63+
$meta = $this->getMockBuilder(ClassMetadata::class)
6364
->disableOriginalConstructor()
6465
->setMethods(array('getClassName'))
6566
->getMock();
@@ -72,10 +73,6 @@ public function testRead()
7273

7374
$this->cache->write($meta);
7475

75-
$this->assertInstanceOf(
76-
'Symfony\\Component\\Validator\\Mapping\\ClassMetadata',
77-
$this->cache->read('Foo\\Bar'),
78-
'read() returns metadata'
79-
);
76+
$this->assertInstanceOf(ClassMetadata::class, $this->cache->read('Foo\\Bar'), 'read() returns metadata');
8077
}
8178
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.