From cf1b16a505e954e39a0c472793548715b08152c5 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 8 Dec 2014 01:22:20 +0100 Subject: [PATCH] #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); }