Fix initializing lazy objects and get rid of "Typed property must not…

… be accessed before initialization" errors
doctrine · Jan 9, 2023 · c9efc1c · c9efc1c
1 parent c5e4e41
commit c9efc1c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 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;
 
@@ -314,17 +315,23 @@ private function generateSkippedProperties(ClassMetadata $class): string
  $skippedProperties = ['__isCloning' => true];
  $identifiers = array_flip($class->getIdentifierFieldNames());
 
- foreach ($class->getReflectionClass()->getProperties() as $property) {
-  $name = $property->getName();
+ $filter = ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED | ReflectionProperty::IS_PRIVATE;
+ $reflector = $class->getReflectionClass();
 
- if ($property->isStatic() || (($class->hasField($name) || $class->hasAssociation($name)) && ! isset($identifiers[$name]))) {
- continue;
- }
+ do {
+ foreach ($reflector->getProperties($filter) as $property) {
+ $name = $property->getName();
+
+ 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;
+ } while ($reflector = $reflector->getParentClass());
 
  uksort($skippedProperties, 'strnatcmp');