Removed completeRuntimeMetadata() method from ClassMetadataFactory an…

…d moved to the appropriate location
doctrine · Jul 3, 2019 · 906c146 · 906c146
1 parent 0476201
commit 906c146
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 36 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/Builder/TableMetadataBuilder.php b/lib/Doctrine/ORM/Mapping/Builder/TableMetadataBuilder.php
@@ -44,9 +44,10 @@ public function build() : Mapping\TableMetadata
         assert($this->entityClassMetadata !== null);
 
         $namingStrategy = $this->metadataBuildingContext->getNamingStrategy();
-        $tableMetadata  = new Mapping\TableMetadata();
-
-        $tableMetadata->setName($namingStrategy->classToTableName($this->entityClassMetadata->getClassName()));
+        $tableName      = $this->tableAnnotation !== null && ! empty($this->tableAnnotation->name)
+            ? $this->tableAnnotation->name
+            : $namingStrategy->classToTableName($this->entityClassMetadata->getClassName());
+        $tableMetadata  = new Mapping\TableMetadata($tableName);
 
         if ($this->tableAnnotation === null) {
             return $tableMetadata;

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -1119,6 +1119,24 @@ public function setTable(TableMetadata $table) : void
         if (empty($table->getName())) {
             $table->setName($this->namingStrategy->classToTableName($this->className));
         }
+
+        // Make sure inherited and declared properties reflect newly defined table
+        foreach ($this->declaredProperties as $property) {
+            switch (true) {
+                case $property instanceof FieldMetadata:
+                    $property->setTableName($property->getTableName() ?? $table->getName());
+                    break;
+
+                case $property instanceof ToOneAssociationMetadata:
+                    // Resolve association join column table names
+                    foreach ($property->getJoinColumns() as $joinColumn) {
+                        /** @var JoinColumnMetadata $joinColumn */
+                        $joinColumn->setTableName($joinColumn->getTableName() ?? $table->getName());
+                    }
+
+                    break;
+            }
+        }
     }
 
     /**

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -390,7 +390,6 @@ protected function doLoadMetadata(
         $classMetadata = $this->driver->loadMetadataForClass($className, $parent, $metadataBuildingContext);
 
         $this->completeIdentifierGeneratorMappings($classMetadata);
-        $this->completeRuntimeMetadata($classMetadata, $parent);
 
         if ($this->evm->hasListeners(Events::loadClassMetadata)) {
             $eventArgs = new LoadClassMetadataEventArgs($classMetadata, $this->em);
@@ -404,38 +403,6 @@ protected function doLoadMetadata(
         return $classMetadata;
     }
 
-    protected function completeRuntimeMetadata(ClassMetadata $class, ?ClassMetadata $parent = null) : void
-    {
-        if (! $parent || ! $parent->isMappedSuperclass) {
-            return;
-        }
-
-        if ($class->isMappedSuperclass) {
-            return;
-        }
-
-        $tableName = $class->getTableName();
-
-        // Resolve column table names
-        foreach ($class->getDeclaredPropertiesIterator() as $property) {
-            if ($property instanceof FieldMetadata) {
-                $property->setTableName($property->getTableName() ?? $tableName);
-
-                continue;
-            }
-
-            if (! ($property instanceof ToOneAssociationMetadata)) {
-                continue;
-            }
-
-            // Resolve association join column table names
-            foreach ($property->getJoinColumns() as $joinColumn) {
-                /** @var JoinColumnMetadata $joinColumn */
-                $joinColumn->setTableName($joinColumn->getTableName() ?? $tableName);
-            }
-        }
-    }
-
     /**
      * Validate runtime metadata is correctly defined.
      *