Inheritance: Correct serialization on different pk column name

Author: homersimpsons

src/Utils/BeanDescriptor.php

@@ -298,6 +298,7 @@ private function getPropertiesForTable(Table $table): array
                         continue 2;
                     }
                 }
+                $propertyDescriptor = new ObjectBeanPropertyDescriptor($table, $fk, $this->namingStrategy, $this->beanNamespace, $this->annotationParser, $this->registry->getBeanForTableName($fk->getForeignTableName()));
                 // Check that this property is not an inheritance relationship
                 $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
                 if ($parentRelationship !== null && $parentRelationship->getName() === $fk->getName()) {
@@ -306,12 +307,11 @@ private function getPropertiesForTable(Table $table): array
                         $column,
                         $this->namingStrategy,
                         $this->annotationParser,
-                        new ScalarBeanPropertyDescriptor($table, $column, $this->namingStrategy, $this->annotationParser)
+                        $propertyDescriptor
                     );
                 } else {
-                    $beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->namingStrategy, $this->beanNamespace, $this->annotationParser, $this->registry->getBeanForTableName($fk->getForeignTableName()));;
+                    $beanPropertyDescriptors[] = $propertyDescriptor;
                 }
-
             } else {
                 $beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column, $this->namingStrategy, $this->annotationParser);
             }

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -253,17 +253,21 @@ public function getJsonSerializeCode(): string
         return $code;
     }
 
-    private function getLazySerializeCode(string $propertyAccess): string
+    public function getLazySerializeCode(string $propertyAccess): string
     {
         $rows = [];
         foreach ($this->getForeignKey()->getUnquotedForeignColumns() as $column) {
             $descriptor = $this->getBeanPropertyDescriptor($column);
             if ($descriptor instanceof ScalarReferencePropertyDescriptor) {
                 $descriptor = $descriptor->getReferencedPropertyDescriptor();
             }
-            $indexName = ltrim($descriptor->getVariableName(), '$');
-            $columnGetterName = $descriptor->getGetterName();
-            $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
+            if ($descriptor instanceof ObjectBeanPropertyDescriptor) {
+                $rows[] = trim($descriptor->getLazySerializeCode($propertyAccess), '[]');
+            } else {
+                $indexName = ltrim($descriptor->getVariableName(), '$');
+                $columnGetterName = $descriptor->getGetterName();
+                $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
+            }
         }
         return '[' . implode(', ', $rows) . ']';
     }

src/Utils/ScalarReferencePropertyDescriptor.php

@@ -34,4 +34,9 @@ public function getReferencedPropertyDescriptor(): AbstractBeanPropertyDescripto
     {
         return $this->referencedPropertyDescriptor;
     }
+
+    public function getJsonSerializeCode(): string
+    {
+        return $this->referencedPropertyDescriptor->getJsonSerializeCode();
+    }
 }