8000 Merge branch '3.4' into 4.3 · symfony/symfony@f550ca9 · GitHub
[go: up one dir, main page]

Skip to content

Commit f550ca9

Browse files
Merge branch '3.4' into 4.3
* 3.4: fix tests
2 parents 3a520f2 + 1818445 commit f550ca9

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
namespace Symfony\Component\Validator\Tests\Mapping\Factory;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Cache\Adapter\ArrayAdapter;
1516
use Symfony\Component\Validator\Constraints\Callback;
17+
use Symfony\Component\Validator\Mapping\Cache\Psr6Cache;
1618
use Symfony\Component\Validator\Mapping\ClassMetadata;
1719
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
1820
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
@@ -78,41 +80,20 @@ public function testMergeParentConstraints()
7880

7981
public function testWriteMetadataToCache()
8082
{
81-
$cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
83+
$cache = new Psr6Cache(new ArrayAdapter());
8284
$factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
8385

8486
$parentClassConstraints = [
8587
new ConstraintA(['groups' => ['Default', 'EntityParent']]),
8688
new ConstraintA(['groups' => ['Default', 'EntityInterfaceA', 'EntityParent']]),
8789
];
88-
$interfaceAConstraints = [
89-
new ConstraintA(['groups' => ['Default', 'EntityInterfaceA']]),
90-
];
91-
92-
$cache->expects($this->never())
93-
->method('has');
94-
$cache->expects($this->exactly(2))
95-
->method('read')
96-
->withConsecutive(
97-
[$this->equalTo(self::PARENT_CLASS)],
98-
[$this->equalTo(self::INTERFACE_A_CLASS)]
99-
)
100-
->willReturn(false);
101-
$cache->expects($this->exactly(2))
102-
->method('write')
103-
->withConsecutive(
104-
$this->callback(function ($metadata) use ($interfaceAConstraints) {
105-
return $interfaceAConstraints == $metadata->getConstraints();
106-
}),
107-
$this->callback(function ($metadata) use ($parentClassConstraints) {
108-
return $parentClassConstraints == $metadata->getConstraints();
109-
})
110-
);
11190

11291
$metadata = $factory->getMetadataFor(self::PARENT_CLASS);
11392

11493
$this->assertEquals(self::PARENT_CLASS, $metadata->getClassName());
11594
$this->assertEquals($parentClassConstraints, $metadata->getConstraints());
95+
$this->assertInstanceOf(ClassMetadata::class, $cache->read(self::PARENT_CLASS));
96+
$this->assertInstanceOf(ClassMetadata::class, $cache->read(self::INTERFACE_A_CLASS));
11697
}
11798

11899
public function testReadMetadataFromCache()

0 commit comments

Comments
 (0)
0