Improving wording and coding style

Author: moufmouf

src/Utils/DefaultNamingStrategy.php

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

src/Utils/NamingStrategyInterface.php

@@ -93,5 +93,12 @@ public function getJsonProperty(AbstractBeanPropertyDescriptor $property): strin
      */
     public function getFindByIndexMethodName(Index $index, array $elements): string;
 
-    public function getAutopivotEntityNameFrom(ForeignKeyConstraint $constraint, bool $useAlternativeName): string;
+    /**
+     * Returns the prefix used when naming auto-pivot getters/setters.
+     *
+     * @param ForeignKeyConstraint $constraint
+     * @param bool $useAlternativeName
+     * @return string
+     */
+    public function getAutoPivotEntityName(ForeignKeyConstraint $constraint, bool $useAlternativeName): string;
 }

src/Utils/PivotTableMethodsDescriptor.php

@@ -115,7 +115,7 @@ public function getBeanClassName(): string
     private function getPluralName() : string
     {
         if ($this->isAutoPivot()) {
-            $name = Inflector::pluralize($this->namingStrategy->getAutopivotEntityNameFrom($this->remoteFk, false));
+            $name = Inflector::pluralize($this->namingStrategy->getAutoPivotEntityName($this->remoteFk, false));
             if ($this->useAlternateName) {
                 $name .= 'By_'.$this->pivotTable->getName();
             }
@@ -135,11 +135,11 @@ private function getPluralName() : string
     private function getSingularName() : string
     {
         if ($this->isAutoPivot()) {
-            $name = $this->namingStrategy->getAutopivotEntityNameFrom($this->remoteFk, false);
+            $name = $this->namingStrategy->getAutoPivotEntityName($this->remoteFk, false);
             if ($this->useAlternateName) {
                 $name .= 'By_'.$this->pivotTable->getName();
             }
-        } else if (!$this->useAlternateName) {
+        } elseif (!$this->useAlternateName) {
             $name = TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName());
         } else {
             $name = TDBMDaoGenerator::toSingular($this->remoteFk->getForeignTableName()).'By_'.$this->pivotTable->getName();

tests/AbstractTDBMObjectTest.php

@@ -6,7 +6,6 @@
 
 class AbstractTDBMObjectTest extends TestCase
 {
-
     public function testGetManyToManyRelationshipDescriptor()
     {
         $object = new TDBMObject();

tests/TDBMObjectTest.php

@@ -6,7 +6,6 @@
 
 class TDBMObjectTest extends TestCase
 {
-
     public function testJsonSerialize()
     {
         $object = new TDBMObject();