Inheritance: Allow reference to reference, more specific classname

Author: homersimpsons

src/Utils/BeanDescriptor.php

@@ -201,7 +201,7 @@ public function getBeanPropertyDescriptors(): array
     public function getConstructorProperties(): array
     {
         $constructorProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return !$property instanceof ScalarReferencePropertyDescriptor && $property->isCompulsory();
+            return !$property instanceof InheritanceReferencePropertyDescriptor && $property->isCompulsory();
         });
 
         return $constructorProperties;
@@ -230,7 +230,7 @@ public function getPropertiesWithDefault(): array
     public function getExposedProperties(): array
     {
         $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return !$property instanceof ScalarReferencePropertyDescriptor && $property->getTable()->getName() === $this->table->getName();
+            return !$property instanceof InheritanceReferencePropertyDescriptor && $property->getTable()->getName() === $this->table->getName();
         });
 
         return $exposedProperties;
@@ -256,7 +256,7 @@ private function getProperties(Table $table): array
             $localProperties = $this->getPropertiesForTable($table);
             foreach ($localProperties as $name => $property) {
                 // We do not override properties if this is a primary key!
-                if (!$property instanceof ScalarReferencePropertyDescriptor && $property->isPrimaryKey()) {
+                if (!$property instanceof InheritanceReferencePropertyDescriptor && $property->isPrimaryKey()) {
                     continue;
                 }
                 $properties[$name] = $property;
@@ -302,7 +302,7 @@ private function getPropertiesForTable(Table $table): array
                 // Check that this property is not an inheritance relationship
                 $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
                 if ($parentRelationship !== null && $parentRelationship->getName() === $fk->getName()) {
-                    $beanPropertyDescriptors[] = new ScalarReferencePropertyDescriptor(
+                    $beanPropertyDescriptors[] = new InheritanceReferencePropertyDescriptor(
                         $table,
                         $column,
                         $this->namingStrategy,

src/Utils/ScalarReferencePropertyDescriptor.php renamed to src/Utils/InheritanceReferencePropertyDescriptor.php

@@ -8,9 +8,9 @@
 use TheCodingMachine\TDBM\Utils\Annotation\AnnotationParser;
 
 /**
- * This class represents a reference to a AbstractBeanPropertyDescriptor
+ * This class represents a reference to a AbstractBeanPropertyDescriptor used in an inheritance schema
  */
-class ScalarReferencePropertyDescriptor extends ScalarBeanPropertyDescriptor
+class InheritanceReferencePropertyDescriptor extends ScalarBeanPropertyDescriptor
 {
     /** @var AbstractBeanPropertyDescriptor */
     private $referencedPropertyDescriptor;
@@ -27,15 +27,18 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBeanPropertyDescriptor
+     * @return ScalarBeanPropertyDescriptor|ObjectBeanPropertyDescriptor
      */
-    public function getReferencedPropertyDescriptor(): AbstractBeanPropertyDescriptor
+    public function getNonScalarReferencedPropertyDescriptor(): AbstractBeanPropertyDescriptor
     {
+        if ($this->referencedPropertyDescriptor instanceof InheritanceReferencePropertyDescriptor) {
+            return $this->referencedPropertyDescriptor->getNonScalarReferencedPropertyDescriptor();
+        }
         return $this->referencedPropertyDescriptor;
     }
 
     public function getJsonSerializeCode(): string
     {
-        return $this->referencedPropertyDescriptor->getJsonSerializeCode();
+        return $this->getNonScalarReferencedPropertyDescriptor()->getJsonSerializeCode();
     }
 }

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -253,20 +253,22 @@ public function getJsonSerializeCode(): string
         return $code;
     }
 
-    public function getLazySerializeCode(string $propertyAccess): string
+    private function getLazySerializeCode(string $propertyAccess): string
     {
         $rows = [];
         foreach ($this->getForeignKey()->getUnquotedForeignColumns() as $column) {
             $descriptor = $this->getBeanPropertyDescriptor($column);
-            if ($descriptor instanceof ScalarReferencePropertyDescriptor) {
-                $descriptor = $descriptor->getReferencedPropertyDescriptor();
+            if ($descriptor instanceof InheritanceReferencePropertyDescriptor) {
+                $descriptor = $descriptor->getNonScalarReferencedPropertyDescriptor();
             }
             if ($descriptor instanceof ObjectBeanPropertyDescriptor) {
                 $rows[] = trim($descriptor->getLazySerializeCode($propertyAccess), '[]');
-            } else {
+            } 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.');
             }
         }
         return '[' . implode(', ', $rows) . ']';