Merge branch '2.7' into 2.8
* 2.7: [TwigBundle] added missing dependencies for tests fixed CS Fix #19943 Make sure to process each interface metadata only once
This commit is contained in:
commit
997e6d7a0b
@ -32,7 +32,8 @@
|
|||||||
"symfony/routing": "~2.1|~3.0.0",
|
"symfony/routing": "~2.1|~3.0.0",
|
||||||
"symfony/templating": "~2.1|~3.0.0",
|
"symfony/templating": "~2.1|~3.0.0",
|
||||||
"symfony/yaml": "~2.3|~3.0.0",
|
"symfony/yaml": "~2.3|~3.0.0",
|
||||||
"symfony/framework-bundle": "~2.7|~3.0.0"
|
"symfony/framework-bundle": "~2.7|~3.0.0",
|
||||||
|
"doctrine/annotations": "~1.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
|
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
|
||||||
|
@ -116,9 +116,27 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
|
|||||||
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
|
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Include constraints from all implemented interfaces that have not been processed via parent class yet
|
$interfaces = $metadata->getReflectionClass()->getInterfaces();
|
||||||
foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
|
|
||||||
if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name || ($parent && $parent->implementsInterface($interface->name))) {
|
$interfaces = array_filter($interfaces, function ($interface) use ($parent, $interfaces) {
|
||||||
|
$interfaceName = $interface->getName();
|
||||||
|
|
||||||
|
if ($parent && $parent->implementsInterface($interfaceName)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($interfaces as $i) {
|
||||||
|
if ($i !== $interface && $i->implementsInterface($interfaceName)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Include constraints from all directly implemented interfaces
|
||||||
|
foreach ($interfaces as $interface) {
|
||||||
|
if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
|
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
|
||||||
|
@ -19,7 +19,7 @@ use Symfony\Component\Validator\ExecutionContextInterface;
|
|||||||
* @Assert\GroupSequence({"Foo", "Entity"})
|
* @Assert\GroupSequence({"Foo", "Entity"})
|
||||||
* @Assert\Callback({"Symfony\Component\Validator\Tests\Fixtures\CallbackClass", "callback"})
|
* @Assert\Callback({"Symfony\Component\Validator\Tests\Fixtures\CallbackClass", "callback"})
|
||||||
*/
|
*/
|
||||||
class Entity extends EntityParent
|
class Entity extends EntityParent implements EntityInterfaceB
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @Assert\NotNull
|
* @Assert\NotNull
|
||||||
|
@ -11,6 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Validator\Tests\Fixtures;
|
namespace Symfony\Component\Validator\Tests\Fixtures;
|
||||||
|
|
||||||
interface EntityInterface
|
interface EntityInterfaceA
|
||||||
{
|
{
|
||||||
}
|
}
|
@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Validator\Tests\Fixtures;
|
||||||
|
|
||||||
|
interface EntityInterfaceB extends EntityParentInterface
|
||||||
|
{
|
||||||
|
}
|
@ -13,7 +13,7 @@ namespace Symfony\Component\Validator\Tests\Fixtures;
|
|||||||
|
|
||||||
use Symfony\Component\Validator\Constraints\NotNull;
|
use Symfony\Component\Validator\Constraints\NotNull;
|
||||||
|
|
||||||
class EntityParent implements EntityInterface
|
class EntityParent implements EntityInterfaceA
|
||||||
{
|
{
|
||||||
protected $firstName;
|
protected $firstName;
|
||||||
private $internal;
|
private $internal;
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Validator\Tests\Fixtures;
|
||||||
|
|
||||||
|
interface EntityParentInterface
|
||||||
|
{
|
||||||
|
}
|
@ -18,17 +18,19 @@ use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
|
|||||||
|
|
||||||
class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
|
const CLASS_NAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
|
||||||
const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
|
const PARENT_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
|
||||||
const INTERFACECLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterface';
|
const INTERFACE_A_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterfaceA';
|
||||||
|
const INTERFACE_B_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterfaceB';
|
||||||
|
const PARENT_INTERFACE_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParentInterface';
|
||||||
|
|
||||||
public function testLoadClassMetadataWithInterface()
|
public function testLoadClassMetadataWithInterface()
|
||||||
{
|
{
|
||||||
$factory = new LazyLoadingMetadataFactory(new TestLoader());
|
$factory = new LazyLoadingMetadataFactory(new TestLoader());
|
||||||
$metadata = $factory->getMetadataFor(self::PARENTCLASS);
|
$metadata = $factory->getMetadataFor(self::PARENT_CLASS);
|
||||||
|
|
||||||
$constraints = array(
|
$constraints = array(
|
||||||
new ConstraintA(array('groups' => array('Default', 'EntityInterface', 'EntityParent'))),
|
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
|
||||||
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
|
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -38,12 +40,12 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testMergeParentConstraints()
|
public function testMergeParentConstraints()
|
||||||
{
|
{
|
||||||
$factory = new LazyLoadingMetadataFactory(new TestLoader());
|
$factory = new LazyLoadingMetadataFactory(new TestLoader());
|
||||||
$metadata = $factory->getMetadataFor(self::CLASSNAME);
|
$metadata = $factory->getMetadataFor(self::CLASS_NAME);
|
||||||
|
|
||||||
$constraints = array(
|
$constraints = array(
|
||||||
new ConstraintA(array('groups' => array(
|
new ConstraintA(array('groups' => array(
|
||||||
'Default',
|
'Default',
|
||||||
'EntityInterface',
|
'EntityInterfaceA',
|
||||||
'EntityParent',
|
'EntityParent',
|
||||||
'Entity',
|
'Entity',
|
||||||
))),
|
))),
|
||||||
@ -52,6 +54,17 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
'EntityParent',
|
'EntityParent',
|
||||||
'Entity',
|
'Entity',
|
||||||
))),
|
))),
|
||||||
|
new ConstraintA(array('groups' => array(
|
||||||
|
'Default',
|
||||||
|
'EntityParentInterface',
|
||||||
|
'EntityInterfaceB',
|
||||||
|
'Entity',
|
||||||
|
))),
|
||||||
|
new ConstraintA(array('groups' => array(
|
||||||
|
'Default',
|
||||||
|
'EntityInterfaceB',
|
||||||
|
'Entity',
|
||||||
|
))),
|
||||||
new ConstraintA(array('groups' => array(
|
new ConstraintA(array('groups' => array(
|
||||||
'Default',
|
'Default',
|
||||||
'Entity',
|
'Entity',
|
||||||
@ -67,34 +80,36 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
$factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
|
$factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
|
||||||
|
|
||||||
$parentClassConstraints = array(
|
$parentClassConstraints = array(
|
||||||
new ConstraintA(array('groups' => array('Default', 'EntityInterface', 'EntityParent'))),
|
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
|
||||||
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
|
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
|
||||||
);
|
);
|
||||||
$interfaceConstraints = array(new ConstraintA(array('groups' => array('Default', 'EntityInterface'))));
|
$interfaceAConstraints = array(
|
||||||
|
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA'))),
|
||||||
|
);
|
||||||
|
|
||||||
$cache->expects($this->never())
|
$cache->expects($this->never())
|
||||||
->method('has');
|
->method('has');
|
||||||
$cache->expects($this->exactly(2))
|
$cache->expects($this->exactly(2))
|
||||||
->method('read')
|
->method('read')
|
||||||
->withConsecutive(
|
->withConsecutive(
|
||||||
array($this->equalTo(self::PARENTCLASS)),
|
array($this->equalTo(self::PARENT_CLASS)),
|
||||||
array($this->equalTo(self::INTERFACECLASS))
|
array($this->equalTo(self::INTERFACE_A_CLASS))
|
||||||
)
|
)
|
||||||
->will($this->returnValue(false));
|
->will($this->returnValue(false));
|
||||||
$cache->expects($this->exactly(2))
|
$cache->expects($this->exactly(2))
|
||||||
->method('write')
|
->method('write')
|
||||||
->withConsecutive(
|
->withConsecutive(
|
||||||
$this->callback(function ($metadata) use ($interfaceConstraints) {
|
$this->callback(function ($metadata) use ($interfaceAConstraints) {
|
||||||
return $interfaceConstraints == $metadata->getConstraints();
|
return $interfaceAConstraints == $metadata->getConstraints();
|
||||||
}),
|
}),
|
||||||
$this->callback(function ($metadata) use ($parentClassConstraints) {
|
$this->callback(function ($metadata) use ($parentClassConstraints) {
|
||||||
return $parentClassConstraints == $metadata->getConstraints();
|
return $parentClassConstraints == $metadata->getConstraints();
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
$metadata = $factory->getMetadataFor(self::PARENTCLASS);
|
$metadata = $factory->getMetadataFor(self::PARENT_CLASS);
|
||||||
|
|
||||||
$this->assertEquals(self::PARENTCLASS, $metadata->getClassName());
|
$this->assertEquals(self::PARENT_CLASS, $metadata->getClassName());
|
||||||
$this->assertEquals($parentClassConstraints, $metadata->getConstraints());
|
$this->assertEquals($parentClassConstraints, $metadata->getConstraints());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -104,7 +119,7 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
$cache = $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface');
|
$cache = $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface');
|
||||||
$factory = new LazyLoadingMetadataFactory($loader, $cache);
|
$factory = new LazyLoadingMetadataFactory($loader, $cache);
|
||||||
|
|
||||||
$metadata = new ClassMetadata(self::PARENTCLASS);
|
$metadata = new ClassMetadata(self::PARENT_CLASS);
|
||||||
$metadata->addConstraint(new ConstraintA());
|
$metadata->addConstraint(new ConstraintA());
|
||||||
|
|
||||||
$loader->expects($this->never())
|
$loader->expects($this->never())
|
||||||
@ -116,7 +131,7 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
->method('read')
|
->method('read')
|
||||||
->will($this->returnValue($metadata));
|
->will($this->returnValue($metadata));
|
||||||
|
|
||||||
$this->assertEquals($metadata, $factory->getMetadataFor(self::PARENTCLASS));
|
$this->assertEquals($metadata, $factory->getMetadataFor(self::PARENT_CLASS));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user