Merge branch 'autoPivot' of github.com:Kharhamel/tdbm into autoPivot2

Author: moufmouf

src/Utils/DefaultNamingStrategy.php

@@ -326,4 +326,9 @@ private function getSchema(): Schema
         }
         return $this->schema;
     }
+
+    public function getAutopivotEntityNameFrom(ForeignKeyConstraint $constraint, bool $useAlternativeName): string
+    {
+        return $this->getForeignKeyUpperCamelCaseName($constraint, $useAlternativeName);
+    }
 }

src/Utils/NamingStrategyInterface.php

@@ -92,4 +92,6 @@ public function getJsonProperty(AbstractBeanPropertyDescriptor $property): strin
      * @return string
      */
     public function getFindByIndexMethodName(Index $index, array $elements): string;
+
+    public function getAutopivotEntityNameFrom(ForeignKeyConstraint $constraint, bool $useAlternativeName): string;
 }

src/Utils/PivotTableMethodsDescriptor.php

@@ -3,6 +3,7 @@
 
 namespace TheCodingMachine\TDBM\Utils;
 
+use Doctrine\Common\Inflector\Inflector;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Table;
@@ -114,7 +115,10 @@ public function getBeanClassName(): string
     private function getPluralName() : string
     {
         if ($this->isAutoPivot()) {
-            $name = $this->remoteFk->getForeignTableName().'By_'.$this->pivotTable->getName().'Via_'.implode('And_', $this->localFk->getUnquotedLocalColumns());
+            $name = Inflector::pluralize($this->namingStrategy->getAutopivotEntityNameFrom($this->remoteFk, false));
+            if ($this->useAlternateName) {
+                $name .= 'By_'.$this->pivotTable->getName();
+            }
         } elseif (!$this->useAlternateName) {
             $name = $this->remoteFk->getForeignTableName();
         } else {
@@ -131,8 +135,11 @@ private function getPluralName() : string
     private function getSingularName() : string
     {
         if ($this->isAutoPivot()) {
-            $name = TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()).'By_'.$this->pivotTable->getName().'Via_'.implode('And_', $this->localFk->getUnquotedLocalColumns());
-        } elseif (!$this->useAlternateName) {
+            $name = $this->namingStrategy->getAutopivotEntityNameFrom($this->remoteFk, false);
+            if ($this->useAlternateName) {
+                $name .= 'By_'.$this->pivotTable->getName();
+            }
+        } else if (!$this->useAlternateName) {
             $name = TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName());
         } else {
             $name = TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()).'By_'.$this->pivotTable->getName();

tests/TDBMDaoGeneratorTest.php

@@ -1997,7 +1997,7 @@ public function testFloydHasNoParent(): void
     {
         $artists = new ArtistDao($this->tdbmService);
         $pinkFloyd = $artists->getById(1);
-        $parents = $pinkFloyd->getArtistsByArtistsRelationsViaChildId();
+        $parents = $pinkFloyd->getParents();
 
         $this->assertEquals([], $parents);
     }
@@ -2006,7 +2006,7 @@ public function testFloydHasOneChild(): void
     {
         $artists = new ArtistDao($this->tdbmService);
         $pinkFloyd = $artists->getById(1);
-        $children = $pinkFloyd->getArtistsByArtistsRelationsViaParentId();
+        $children = $pinkFloyd->getChildren();
 
         $this->assertEquals(1, count($children));
         $this->assertEquals(2, $children[0]->getId());