Fixes in LegacyReflectionFields.

doctrine · Oct 10, 2024 · 5c38cb5 · 5c38cb5
1 parent de79548
commit 5c38cb5
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Mapping/LegacyReflectionFields.php b/src/Mapping/LegacyReflectionFields.php
@@ -29,7 +29,7 @@ public function offsetGet($field): mixed
         }
 
         if (isset($this->classMetadata->propertyAccessors[$field])) {
-            $fieldName = str_contains('.', $field) ? $this->classMetadata->fieldMappings[$field]->originalField : $field;
+            $fieldName = str_contains($field, '.') ? $this->classMetadata->fieldMappings[$field]->originalField : $field;
             $className = $this->classMetadata->name;
 
             if (isset($this->classMetadata->fieldMappings[$field]) && $this->classMetadata->fieldMappings[$field]->originalClass !== null) {
@@ -53,10 +53,18 @@ public function offsetGet($field): mixed
                 }
 
                 if ($this->classMetadata->fieldMappings[$field]->originalField !== null) {
+                    $parentField = str_replace('.' . $fieldName, '', $field);
+
+                    if (!str_contains($parentField, '.')) {
+                        $parentClass = $this->classMetadata->name;
+                    } else {
+                        $parentClass = $this->classMetadata->fieldMappings[$parentField]->originalClass;
+                    }
+
                     $this->reflFields[$field] = new ReflectionEmbeddedProperty(
+                        $this->getAccessibleProperty($parentClass, $parentField),
                         $this->reflFields[$field],
-                        $this->getAccessibleProperty($this->classMetadata->fieldMappings[$field]->originalClass, $this->classMetadata->fieldMappings[$field]->originalField),
-                        $this->classMetadata->embeddedClasses[$fieldName]->class,
+                        $this->classMetadata->fieldMappings[$field]->originalClass,
                     );
                 }
             }