From d48546d2dd513dd68049d74bb3e6afb82e372e6e Mon Sep 17 00:00:00 2001 From: Austin Morris Date: Sat, 6 Dec 2014 15:10:00 -0500 Subject: [PATCH 1/7] fix instantiation of embedded object in ReflectionEmbeddedProperty --- .../Mapping/ReflectionEmbeddedProperty.php | 8 ++++- .../Tests/Models/Mapping/AbstractEmbedded.php | 33 +++++++++++++++++++ .../Tests/Models/Mapping/Embedded.php | 33 +++++++++++++++++++ .../Doctrine/Tests/Models/Mapping/Entity.php | 33 +++++++++++++++++++ .../ReflectionEmbeddedPropertyTest.php | 19 +++++++++++ 5 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php create mode 100644 tests/Doctrine/Tests/Models/Mapping/Embedded.php create mode 100644 tests/Doctrine/Tests/Models/Mapping/Entity.php diff --git a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php index 0163ebb89..bad10f2b4 100644 --- a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php +++ b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php @@ -48,6 +48,11 @@ class ReflectionEmbeddedProperty extends ReflectionProperty */ private $instantiator; + /** + * @var string + */ + private $reflectionClass; + /** * @param ReflectionProperty $parentProperty * @param ReflectionProperty $childProperty @@ -57,6 +62,7 @@ class ReflectionEmbeddedProperty extends ReflectionProperty { $this->parentProperty = $parentProperty; $this->childProperty = $childProperty; + $this->reflectionClass = $class; parent::__construct($childProperty->getDeclaringClass()->getName(), $childProperty->getName()); } @@ -85,7 +91,7 @@ class ReflectionEmbeddedProperty extends ReflectionProperty if (null === $embeddedObject) { $this->instantiator = $this->instantiator ?: new Instantiator(); - $embeddedObject = $this->instantiator->instantiate($this->class); + $embeddedObject = $this->instantiator->instantiate($this->reflectionClass); $this->parentProperty->setValue($object, $embeddedObject); } diff --git a/tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php b/tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php new file mode 100644 index 000000000..01bb568e1 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php @@ -0,0 +1,33 @@ +foo; + } + + /** + * @param $foo + * @return $this + */ + public function setFoo($foo) + { + $this->foo = $foo; + return $this; + } +} diff --git a/tests/Doctrine/Tests/Models/Mapping/Embedded.php b/tests/Doctrine/Tests/Models/Mapping/Embedded.php new file mode 100644 index 000000000..2509df592 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Mapping/Embedded.php @@ -0,0 +1,33 @@ +bar; + } + + /** + * @param $bar + * @return $this + */ + public function setBar($bar) + { + $this->bar = $bar; + return $this; + } +} diff --git a/tests/Doctrine/Tests/Models/Mapping/Entity.php b/tests/Doctrine/Tests/Models/Mapping/Entity.php new file mode 100644 index 000000000..8dcf86f44 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Mapping/Entity.php @@ -0,0 +1,33 @@ +embedded; + } + + /** + * @param Embedded $embedded + * @return $this + */ + public function setEmbedded($embedded) + { + $this->embedded = $embedded; + return $this; + } +} diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php index 8a67efdf3..0553f6e4c 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Instantiator\Instantiator; use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty; +use Doctrine\Tests\Models\Mapping\Entity; use ReflectionProperty; /** @@ -66,6 +67,24 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase )); } + public function testSetValueCanInstantiateObject() + { + $entity = new Entity(); + $parentProperty = new ReflectionProperty('Doctrine\Tests\Models\Mapping\Entity', 'embedded'); + $parentProperty->setAccessible(true); + $childProperty = new ReflectionProperty('Doctrine\Tests\Models\Mapping\Embedded', 'foo'); + $childProperty->setAccessible(true); + $embeddedPropertyReflection = new ReflectionEmbeddedProperty( + $parentProperty, + $childProperty, + 'Doctrine\Tests\Models\Mapping\Embedded' + ); + + $embeddedPropertyReflection->setValue($entity, 4); + + $this->assertEquals(4, $entity->getEmbedded()->getFoo()); + } + /** * Data provider * From d259ba91b384db43ecc34baff54b1f16fc37c8be Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 8 Dec 2014 01:17:25 +0100 Subject: [PATCH 2/7] #1213 - DDC-3437 - refactoring tests to support embeddable class name != embeddable class property declaring class --- .../ReflectionEmbeddedPropertyTest.php | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php index 0553f6e4c..9796aeadd 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php @@ -15,20 +15,18 @@ use ReflectionProperty; class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase { /** - * @param ReflectionProperty $parentProperty - * @param ReflectionProperty $childProperty + * @param ReflectionProperty $parentProperty property of the embeddable/entity where to write the embeddable to + * @param ReflectionProperty $childProperty property of the embeddable class where to write values to + * @param string $embeddableClass name of the embeddable class to be instantiated * * @dataProvider getTestedReflectionProperties */ public function testCanSetAndGetEmbeddedProperty( ReflectionProperty $parentProperty, - ReflectionProperty $childProperty + ReflectionProperty $childProperty, + $embeddableClass ) { - $embeddedPropertyReflection = new ReflectionEmbeddedProperty( - $parentProperty, - $childProperty, - $childProperty->getDeclaringClass()->getName() - ); + $embeddedPropertyReflection = new ReflectionEmbeddedProperty($parentProperty, $childProperty, $embeddableClass); $instantiator = new Instantiator(); @@ -44,21 +42,18 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase } /** - * @param ReflectionProperty $parentProperty - * @param ReflectionProperty $childProperty + * @param ReflectionProperty $parentProperty property of the embeddable/entity where to write the embeddable to + * @param ReflectionProperty $childProperty property of the embeddable class where to write values to + * @param string $embeddableClass name of the embeddable class to be instantiated * * @dataProvider getTestedReflectionProperties */ public function testWillSkipReadingPropertiesFromNullEmbeddable( ReflectionProperty $parentProperty, - ReflectionProperty $childProperty - ) - { - $embeddedPropertyReflection = new ReflectionEmbeddedProperty( - $parentProperty, - $childProperty, - $childProperty->getDeclaringClass()->getName() - ); + ReflectionProperty $childProperty, + $embeddableClass + ) { + $embeddedPropertyReflection = new ReflectionEmbeddedProperty($parentProperty, $childProperty, $embeddableClass); $instantiator = new Instantiator(); @@ -88,7 +83,7 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase /** * Data provider * - * @return ReflectionProperty[][] + * @return ReflectionProperty[][]|string[][] */ public function getTestedReflectionProperties() { @@ -102,6 +97,7 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', 'id' ), + 'Doctrine\\Tests\\Models\\Generic\\BooleanModel' ), // reflection on classes extending internal PHP classes: array( @@ -113,6 +109,7 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', 'privateProperty' ), + 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' ), array( $this->getReflectionProperty( @@ -123,6 +120,7 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', 'protectedProperty' ), + 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' ), array( $this->getReflectionProperty( @@ -133,6 +131,7 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', 'publicProperty' ), + 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' ), ); } From d75d6ffb1137cf89b18e56a851e8922caf448721 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 8 Dec 2014 01:17:57 +0100 Subject: [PATCH 3/7] #1213 - DDC-3437 - adding relevant test assets --- .../Tests/Models/Reflection/AbstractEmbeddable.php | 11 +++++++++++ .../Tests/Models/Reflection/ConcreteEmbeddable.php | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 tests/Doctrine/Tests/Models/Reflection/AbstractEmbeddable.php create mode 100644 tests/Doctrine/Tests/Models/Reflection/ConcreteEmbeddable.php diff --git a/tests/Doctrine/Tests/Models/Reflection/AbstractEmbeddable.php b/tests/Doctrine/Tests/Models/Reflection/AbstractEmbeddable.php new file mode 100644 index 000000000..2fecb4613 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Reflection/AbstractEmbeddable.php @@ -0,0 +1,11 @@ + Date: Mon, 8 Dec 2014 01:18:36 +0100 Subject: [PATCH 4/7] #1213 - DDC-3437 - integrating new tests into the pre-existing data-provider --- .../ReflectionEmbeddedPropertyTest.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php index 9796aeadd..98fa1152f 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php @@ -99,6 +99,29 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase ), 'Doctrine\\Tests\\Models\\Generic\\BooleanModel' ), + // reflection on embeddables that have properties defined in abstract ancestors: + array( + $this->getReflectionProperty( + 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', + 'id' + ), + $this->getReflectionProperty( + 'Doctrine\\Tests\\Models\\Reflection\\AbstractEmbeddable', + 'propertyInAbstractClass' + ), + 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable' + ), + array( + $this->getReflectionProperty( + 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', + 'id' + ), + $this->getReflectionProperty( + 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable', + 'propertyInConcreteClass' + ), + 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable' + ), // reflection on classes extending internal PHP classes: array( $this->getReflectionProperty( From 55bcc193aeb58ccd9d7c4871c5a3a38f6a573862 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 8 Dec 2014 01:19:15 +0100 Subject: [PATCH 5/7] #1213 - DDC-3437 - removing redundant test method --- .../Mapping/ReflectionEmbeddedPropertyTest.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php index 98fa1152f..9be006e5a 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php @@ -62,24 +62,6 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase )); } - public function testSetValueCanInstantiateObject() - { - $entity = new Entity(); - $parentProperty = new ReflectionProperty('Doctrine\Tests\Models\Mapping\Entity', 'embedded'); - $parentProperty->setAccessible(true); - $childProperty = new ReflectionProperty('Doctrine\Tests\Models\Mapping\Embedded', 'foo'); - $childProperty->setAccessible(true); - $embeddedPropertyReflection = new ReflectionEmbeddedProperty( - $parentProperty, - $childProperty, - 'Doctrine\Tests\Models\Mapping\Embedded' - ); - - $embeddedPropertyReflection->setValue($entity, 4); - - $this->assertEquals(4, $entity->getEmbedded()->getFoo()); - } - /** * Data provider * From 357292de440d160cf60473f68e46cf4148c43f02 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 8 Dec 2014 01:20:00 +0100 Subject: [PATCH 6/7] #1213 - DDC-3437 - removing unused test assets --- .../Tests/Models/Mapping/AbstractEmbedded.php | 33 ------------------- .../Tests/Models/Mapping/Embedded.php | 33 ------------------- .../Doctrine/Tests/Models/Mapping/Entity.php | 33 ------------------- 3 files changed, 99 deletions(-) delete mode 100644 tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php delete mode 100644 tests/Doctrine/Tests/Models/Mapping/Embedded.php delete mode 100644 tests/Doctrine/Tests/Models/Mapping/Entity.php diff --git a/tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php b/tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php deleted file mode 100644 index 01bb568e1..000000000 --- a/tests/Doctrine/Tests/Models/Mapping/AbstractEmbedded.php +++ /dev/null @@ -1,33 +0,0 @@ -foo; - } - - /** - * @param $foo - * @return $this - */ - public function setFoo($foo) - { - $this->foo = $foo; - return $this; - } -} diff --git a/tests/Doctrine/Tests/Models/Mapping/Embedded.php b/tests/Doctrine/Tests/Models/Mapping/Embedded.php deleted file mode 100644 index 2509df592..000000000 --- a/tests/Doctrine/Tests/Models/Mapping/Embedded.php +++ /dev/null @@ -1,33 +0,0 @@ -bar; - } - - /** - * @param $bar - * @return $this - */ - public function setBar($bar) - { - $this->bar = $bar; - return $this; - } -} diff --git a/tests/Doctrine/Tests/Models/Mapping/Entity.php b/tests/Doctrine/Tests/Models/Mapping/Entity.php deleted file mode 100644 index 8dcf86f44..000000000 --- a/tests/Doctrine/Tests/Models/Mapping/Entity.php +++ /dev/null @@ -1,33 +0,0 @@ -embedded; - } - - /** - * @param Embedded $embedded - * @return $this - */ - public function setEmbedded($embedded) - { - $this->embedded = $embedded; - return $this; - } -} From cf1b16a505e954e39a0c472793548715b08152c5 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 8 Dec 2014 01:22:20 +0100 Subject: [PATCH 7/7] #1213 - DDC-3437 - renaming variables/alignment/clarifications in docblocks --- .../Mapping/ReflectionEmbeddedProperty.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php index bad10f2b4..b224fff4e 100644 --- a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php +++ b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php @@ -34,35 +34,35 @@ use ReflectionProperty; class ReflectionEmbeddedProperty extends ReflectionProperty { /** - * @var ReflectionProperty + * @var ReflectionProperty reflection property of the class where the embedded object has to be put */ private $parentProperty; /** - * @var ReflectionProperty + * @var ReflectionProperty reflection property of the embedded object */ private $childProperty; + /** + * @var string name of the embedded class to be eventually instantiated + */ + private $embeddedClass; + /** * @var Instantiator|null */ private $instantiator; - /** - * @var string - */ - private $reflectionClass; - /** * @param ReflectionProperty $parentProperty * @param ReflectionProperty $childProperty - * @param string $class + * @param string $embeddedClass */ - public function __construct(ReflectionProperty $parentProperty, ReflectionProperty $childProperty, $class) + public function __construct(ReflectionProperty $parentProperty, ReflectionProperty $childProperty, $embeddedClass) { - $this->parentProperty = $parentProperty; - $this->childProperty = $childProperty; - $this->reflectionClass = $class; + $this->parentProperty = $parentProperty; + $this->childProperty = $childProperty; + $this->embeddedClass = (string) $embeddedClass; parent::__construct($childProperty->getDeclaringClass()->getName(), $childProperty->getName()); } @@ -91,7 +91,7 @@ class ReflectionEmbeddedProperty extends ReflectionProperty if (null === $embeddedObject) { $this->instantiator = $this->instantiator ?: new Instantiator(); - $embeddedObject = $this->instantiator->instantiate($this->reflectionClass); + $embeddedObject = $this->instantiator->instantiate($this->embeddedClass); $this->parentProperty->setValue($object, $embeddedObject); }