Deeper Composite FK: Fix flatten in case of inheritance

Author: homersimpsons

src/Utils/AbstractBeanPropertyDescriptor.php

@@ -67,7 +67,7 @@ abstract public function getPhpType(): string;
      */
     public function getParamAnnotation(): ParamTag
     {
-        return new ParamTag($this->getVariableName(), [ $this->getPhpType() ]);
+        return new ParamTag($this->getSafeVariableName(), [ $this->getPhpType() ]);
     }
 
     public function getVariableName(): string

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -258,15 +258,22 @@ private function getLazySerializeCode(string $propertyAccess): string
         $rows = [];
         foreach ($this->getForeignKey()->getUnquotedForeignColumns() as $column) {
             $descriptor = $this->getBeanPropertyDescriptor($column);
+            $shouldFlatten = false;
             if ($descriptor instanceof InheritanceReferencePropertyDescriptor) {
                 $descriptor = $descriptor->getNonScalarReferencedPropertyDescriptor();
+                $shouldFlatten = true;
             }
+
             $indexName = ltrim($descriptor->getVariableName(), '$');
             $columnGetterName = $descriptor->getGetterName();
             if ($descriptor instanceof ObjectBeanPropertyDescriptor) {
-                $varName = '$o' . lcfirst($indexName);
-                $lazySerializeCode = $descriptor->getLazySerializeCode($varName);
-                $rows[] = "'$indexName' => ($varName = $propertyAccess->$columnGetterName()) ? $lazySerializeCode : null";
+                if ($shouldFlatten) {
+                    $rows[] = trim($descriptor->getLazySerializeCode($propertyAccess), '[]');
+                } else {
+                    $varName = $descriptor->getSafeVariableName();
+                    $lazySerializeCode = $descriptor->getLazySerializeCode($varName);
+                    $rows[] = "'$indexName' => ($varName = $propertyAccess->$columnGetterName()) ? $lazySerializeCode : null";
+                }
             } elseif ($descriptor instanceof ScalarBeanPropertyDescriptor) {
                 $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
             } else {
@@ -279,10 +286,10 @@ private function getLazySerializeCode(string $propertyAccess): string
     private function getBeanPropertyDescriptor(string $column): AbstractBeanPropertyDescriptor
     {
         foreach ($this->foreignBeanDescriptor->getBeanPropertyDescriptors() as $descriptor) {
-            if ($descriptor instanceof ObjectBeanPropertyDescriptor && in_array($column, $descriptor->getForeignKey()->getLocalColumns(), true)) {
+            if ($descriptor instanceof ScalarBeanPropertyDescriptor && $descriptor->getColumnName() === $column) {
                 return $descriptor;
             }
-            if ($descriptor instanceof ScalarBeanPropertyDescriptor && $descriptor->getColumnName() === $column) {
+            if ($descriptor instanceof ObjectBeanPropertyDescriptor && in_array($column, $descriptor->getForeignKey()->getLocalColumns(), true)) {
                 return $descriptor;
             }
         }