Merge pull request #10385 from nicolas-grekas/uninitialized-prop-repr…

…oducer Fix initializing lazy objects and get rid of "Typed property must not be accessed before initialization" errors
doctrine · Jan 16, 2023 · de7eee5 · de7eee5
2 parents 4051937 + 3b8692f
commit de7eee5
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 7 deletions.
diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php
@@ -165,6 +165,10 @@ protected function hydrateRowData(array $row, array &$result)
             }
         }
 
+        if (isset($this->_hints[Query::HINT_REFRESH_ENTITY])) {
+            $this->registerManaged($this->class, $this->_hints[Query::HINT_REFRESH_ENTITY], $data);
+        }
+
         $uow    = $this->_em->getUnitOfWork();
         $entity = $uow->createEntity($entityName, $data, $this->_hints);
 

diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
@@ -18,6 +18,7 @@
 use Doctrine\ORM\Utility\IdentifierFlattener;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\Proxy;
+use ReflectionProperty;
 use Symfony\Component\VarExporter\ProxyHelper;
 use Symfony\Component\VarExporter\VarExporter;
 
@@ -313,17 +314,24 @@ private function generateSkippedProperties(ClassMetadata $class): string
     {
         $skippedProperties = ['__isCloning' => true];
         $identifiers       = array_flip($class->getIdentifierFieldNames());
+        $filter            = ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED | ReflectionProperty::IS_PRIVATE;
+        $reflector         = $class->getReflectionClass();
 
-        foreach ($class->getReflectionClass()->getProperties() as $property) {
-            $name = $property->getName();
+        while ($reflector) {
+            foreach ($reflector->getProperties($filter) as $property) {
+                $name = $property->getName();
 
-            if ($property->isStatic() || (($class->hasField($name) || $class->hasAssociation($name)) && ! isset($identifiers[$name]))) {
-                continue;
-            }
+                if ($property->isStatic() || (($class->hasField($name) || $class->hasAssociation($name)) && ! isset($identifiers[$name]))) {
+                    continue;
+                }
 
-            $prefix = $property->isPrivate() ? "\0" . $property->getDeclaringClass()->getName() . "\0" : ($property->isProtected() ? "\0*\0" : '');
+                $prefix = $property->isPrivate() ? "\0" . $property->getDeclaringClass()->getName() . "\0" : ($property->isProtected() ? "\0*\0" : '');
+
+                $skippedProperties[$prefix . $name] = true;
+            }
 
-            $skippedProperties[$prefix . $name] = true;
+            $filter    = ReflectionProperty::IS_PRIVATE;
+            $reflector = $reflector->getParentClass();
         }
 
         uksort($skippedProperties, 'strnatcmp');

diff --git a/tests/Doctrine/Tests/Models/GH10336/GH10336Entity.php b/tests/Doctrine/Tests/Models/GH10336/GH10336Entity.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\GH10336;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="gh10336_entities")
+ */
+class GH10336Entity
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue
+     */
+    public ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="GH10336Relation")
+     * @ORM\JoinColumn(name="relation_id", referencedColumnName="id", nullable=true)
+     */
+    public ?GH10336Relation $relation = null;
+}
diff --git a/tests/Doctrine/Tests/Models/GH10336/GH10336Relation.php b/tests/Doctrine/Tests/Models/GH10336/GH10336Relation.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\GH10336;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="gh10336_relations")
+ */
+class GH10336Relation
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue
+     */
+    public ?int $id = null;
+
+    /**
+     * @ORM\Column(type="string")
+     */
+    public string $value;
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH10336Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH10336Test.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\GH10336\GH10336Entity;
+use Doctrine\Tests\Models\GH10336\GH10336Relation;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @requires PHP 7.4
+ */
+final class GH10336Test extends OrmFunctionalTestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->createSchemaForModels(
+            GH10336Entity::class,
+            GH10336Relation::class
+        );
+    }
+
+    public function testCanAccessRelationPropertyAfterClear(): void
+    {
+        $relation         = new GH10336Relation();
+        $relation->value  = 'foo';
+        $entity           = new GH10336Entity();
+        $entity->relation = $relation;
+
+        $this->_em->persist($entity);
+        $this->_em->persist($relation);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $entity = $this->_em->find(GH10336Entity::class, 1);
+
+        $this->_em->clear();
+
+        $this->assertSame('foo', $entity->relation->value);
+    }
+}