Deeper Composite FK: Implementation

Author: homersimpsons

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -261,11 +261,13 @@ private function getLazySerializeCode(string $propertyAccess): string
             if ($descriptor instanceof InheritanceReferencePropertyDescriptor) {
                 $descriptor = $descriptor->getNonScalarReferencedPropertyDescriptor();
             }
+            $indexName = ltrim($descriptor->getVariableName(), '$');
+            $columnGetterName = $descriptor->getGetterName();
             if ($descriptor instanceof ObjectBeanPropertyDescriptor) {
-                $rows[] = trim($descriptor->getLazySerializeCode($propertyAccess), '[]');
+                $varName = '$o' . lcfirst($indexName);
+                $lazySerializeCode = $descriptor->getLazySerializeCode($varName);
+                $rows[] = "'$indexName' => ($varName = $propertyAccess->$columnGetterName()) ? $lazySerializeCode : null";
             } elseif ($descriptor instanceof ScalarBeanPropertyDescriptor) {
-                $indexName = ltrim($descriptor->getVariableName(), '$');
-                $columnGetterName = $descriptor->getGetterName();
                 $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
             } else {
                 throw new TDBMException('PropertyDescriptor of class `' . get_class($descriptor) . '` cannot be serialized.');
@@ -277,6 +279,9 @@ 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)) {
+                return $descriptor;
+            }
             if ($descriptor instanceof ScalarBeanPropertyDescriptor && $descriptor->getColumnName() === $column) {
                 return $descriptor;
             }

tests/TDBMDaoGeneratorTest.php

@@ -2165,7 +2165,7 @@ public function testLazyStopRecursionOnCompositeForeignKey(): void
         $compositeFkSourceDao = new CompositeFkSourceDao($this->tdbmService);
         $compositeFkSourceBean = $compositeFkSourceDao->getById(1);
         $json = $compositeFkSourceBean->jsonSerialize(true);
-        $this->assertEquals(1, $json['compositeFkTarget']['id1']);
+        $this->assertEquals(1, $json['compositeFkTarget']['1']['id']);
         $this->assertEquals(1, $json['compositeFkTarget']['id2']);
     }