Skip to content

[Validator] Fix caching of constraints derived from non-serializable parents #20793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[Validator] Fix caching of constraints derived from non-serializable parents #20793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9fc77c
[Validator] Fix issue 12302 - cache constraints
uwej711 Dec 3, 2016
e61f311
fix test for PHP 5.3
uwej711 Dec 7, 2016
427cc5c
fix test for PHP 5.3
uwej711 Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,11 @@ public function getMetadataFor($value)
return $this->loadedClasses[$class];
}

if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {
return $this->loadedClasses[$class];
if (null !== $this->cache && false !== ($metadata = $this->cache->read($class))) {
// Include constraints from the parent class
$this->mergeConstraints($metadata);

return $this->loadedClasses[$class] = $metadata;
}

if (!class_exists($class) && !interface_exists($class)) {
Expand All @@ -111,6 +114,22 @@ public function getMetadataFor($value)

$metadata = new ClassMetadata($class);

if (null !== $this->loader) {
$this->loader->loadClassMetadata($metadata);
}

if (null !== $this->cache) {
$this->cache->write($metadata);
}

// Include constraints from the parent class
$this->mergeConstraints($metadata);

return $this->loadedClasses[$class] = $metadata;
}

private function mergeConstraints(ClassMetadata $metadata)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would use a name like mergeConstraintFromParentClasses().

{
// Include constraints from the parent class
if ($parent = $metadata->getReflectionClass()->getParentClass()) {
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
Expand Down Expand Up @@ -141,16 +160,6 @@ public function getMetadataFor($value)
}
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
}

if (null !== $this->loader) {
$this->loader->loadClassMetadata($metadata);
}

if (null !== $this->cache) {
$this->cache->write($metadata);
}

return $this->loadedClasses[$class] = $metadata;
}

/**
Expand Down
51 changes: 43 additions & 8 deletions src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Component\Validator\Tests\Mapping\Factory;

use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
Expand All @@ -30,8 +31,8 @@ public function testLoadClassMetadataWithInterface()
$metadata = $factory->getMetadataFor(self::PARENT_CLASS);

$constraints = array(
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
);

$this->assertEquals($constraints, $metadata->getConstraints());
Expand All @@ -45,8 +46,6 @@ public function testMergeParentConstraints()
$constraints = array(
new ConstraintA(array('groups' => array(
'Default',
'EntityInterfaceA',
'EntityParent',
'Entity',
))),
new ConstraintA(array('groups' => array(
Expand All @@ -56,8 +55,8 @@ public function testMergeParentConstraints()
))),
new ConstraintA(array('groups' => array(
'Default',
'EntityParentInterface',
'EntityInterfaceB',
'EntityInterfaceA',
'EntityParent',
'Entity',
))),
new ConstraintA(array('groups' => array(
Expand All @@ -67,6 +66,8 @@ public function testMergeParentConstraints()
))),
new ConstraintA(array('groups' => array(
'Default',
'EntityParentInterface',
'EntityInterfaceB',
'Entity',
))),
);
Expand All @@ -80,8 +81,8 @@ public function testWriteMetadataToCache()
$factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);

$parentClassConstraints = array(
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
);
$interfaceAConstraints = array(
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA'))),
Expand Down Expand Up @@ -122,17 +123,51 @@ public function testReadMetadataFromCache()
$metadata = new ClassMetadata(self::PARENT_CLASS);
$metadata->addConstraint(new ConstraintA());

$parentClass = self::PARENT_CLASS;
$interfaceClass = self::INTERFACE_A_CLASS;

$loader->expects($this->never())
->method('loadClassMetadata');

$cache->expects($this->never())
->method('has');
$cache->expects($this->once())
$cache->expects($this->exactly(2))
->method('read')
->will($this->returnValue($metadata));
->withConsecutive(
array(self::PARENT_CLASS),
array(self::INTERFACE_A_CLASS)
)
->willReturnCallback(function ($name) use ($metadata, $parentClass, $interfaceClass) {
if ($parentClass == $name) {
return $metadata;
}

return new ClassMetadata($interfaceClass);
});

$this->assertEquals($metadata, $factory->getMetadataFor(self::PARENT_CLASS));
}

public function testMetadataCacheWithRuntimeConstraint()
{
$cache = $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface');
$factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);

$cache
->expects($this->any())
->method('write')
->will($this->returnCallback(function ($metadata) { serialize($metadata);}))
;

$cache->expects($this->any())
->method('read')
->will($this->returnValue(false));

$metadata = $factory->getMetadataFor(self::PARENT_CLASS);
$metadata->addConstraint(new Callback(function () {}));

$metadata = $factory->getMetadataFor(self::CLASS_NAME);
}
}

class TestLoader implements LoaderInterface
Expand Down