Fixing PHPStan

Author: moufmouf

src/Utils/BeanDescriptor.php

@@ -388,7 +388,6 @@ private function getPivotTableDescriptors(): array
             // There are exactly 2 FKs since this is a pivot table.
             $fks = array_values($table->getForeignKeys());
 
-            //todo auto pivot case?
             if ($fks[0]->getForeignTableName() === $this->table->getName()) {
                 list($localFk, $remoteFk) = $fks;
                 $descs[] = new PivotTableMethodsDescriptor($table, $localFk, $remoteFk, $this->namingStrategy, $this->beanNamespace, $this->annotationParser);
@@ -397,8 +396,6 @@ private function getPivotTableDescriptors(): array
                 list($remoteFk, $localFk) = $fks;
                 $descs[] = new PivotTableMethodsDescriptor($table, $localFk, $remoteFk, $this->namingStrategy, $this->beanNamespace, $this->annotationParser);
             }
-
-
         }
 
         return $descs;
@@ -642,7 +639,7 @@ public function generatePhpCode(): ?FileGenerator
         if ($onDeleteCode) {
             $class->addMethodFromGenerator($onDeleteCode);
         }
-        $cloneCode = $this->generateCloneCode();
+        $cloneCode = $this->generateCloneCode($pivotTableMethodsDescriptors);
         $cloneCode = $this->codeGeneratorListener->onBaseBeanCloneGenerated($cloneCode, $this, $this->configuration, $class);
         if ($cloneCode) {
             $class->addMethodFromGenerator($cloneCode);
@@ -1426,7 +1423,11 @@ private function generateGetManyToManyRelationshipDescriptorKeysCode(array $pivo
         return $method;
     }
 
-    private function generateCloneCode(): MethodGenerator
+    /**
+     * @param PivotTableMethodsDescriptor[] $pivotTableMethodsDescriptors
+     * @return MethodGenerator
+     */
+    private function generateCloneCode(array $pivotTableMethodsDescriptors): MethodGenerator
     {
         $precode = '';
         $postcode = '';
@@ -1436,7 +1437,7 @@ private function generateCloneCode(): MethodGenerator
         }
 
         //cloning many to many relationships
-        foreach ($this->getPivotTableDescriptors() as $beanMethodDescriptor) {
+        foreach ($pivotTableMethodsDescriptors as $beanMethodDescriptor) {
             $precode .= $beanMethodDescriptor->getCloneRule()."\n";
         }
 

src/Utils/ManyToManyRelationshipPathDescriptor.php

@@ -30,6 +30,14 @@ class ManyToManyRelationshipPathDescriptor
      */
     private $whereKeys;
 
+    /**
+     * ManyToManyRelationshipPathDescriptor constructor.
+     * @param string $targetTable
+     * @param string $pivotTable
+     * @param string[] $joinForeignKeys
+     * @param string[] $joinLocalKeys
+     * @param string[] $whereKeys
+     */
     public function __construct(string $targetTable, string $pivotTable, array $joinForeignKeys, array $joinLocalKeys, array $whereKeys)
     {
         $this->targetTable = $targetTable;
@@ -39,35 +47,11 @@ public function __construct(string $targetTable, string $pivotTable, array $join
         $this->whereKeys = $whereKeys;
     }
 
-    /**
-     * @return mixed[]
-     */
-    public static function generateModelArray(ForeignKeyConstraint $remoteFk, ForeignKeyConstraint $localFk): array
-    {
-        return [$remoteFk->getForeignTableName(), $remoteFk->getLocalTableName(), $remoteFk->getUnquotedForeignColumns(), $remoteFk->getUnquotedLocalColumns(), $localFk->getUnquotedLocalColumns()];
-    }
-
     public static function generateModelKey(ForeignKeyConstraint $remoteFk, ForeignKeyConstraint $localFk): string
     {
         return $remoteFk->getLocalTableName().".".implode("__", $localFk->getUnquotedLocalColumns());
     }
 
-    /**
-     * @param mixed[] $modelArray
-     */
-    public static function createFromModelArray(array $modelArray): self
-    {
-        $obj = new self();
-        $obj->targetTable = $modelArray[0];
-        $obj->pivotTable = $modelArray[1];
-
-        $obj->joinForeignKeys = $modelArray[2];
-        $obj->joinLocalKeys= $modelArray[3];
-        $obj->whereKeys = $modelArray[4];
-
-        return $obj;
-    }
-
     public function getPivotName(): string
     {
         return $this->pivotTable;
@@ -102,6 +86,10 @@ public function getPivotWhere(): string
 
     }
 
+    /**
+     * @param string[] $primaryKeys
+     * @return string[]
+     */
     public function getPivotParams(array $primaryKeys): array
     {
         $params = [];

src/Utils/PivotTableMethodsDescriptor.php

@@ -59,10 +59,6 @@ class PivotTableMethodsDescriptor implements MethodDescriptorInterface
      * @var string
      */
     private $pathKey;
-    /**
-     * @var array
-     */
-    private $pathModel;
 
     /**
      * @param Table $pivotTable The pivot table
@@ -80,7 +76,6 @@ public function __construct(Table $pivotTable, ForeignKeyConstraint $localFk, Fo
         $this->annotationParser = $annotationParser;
 
         $this->pathKey = ManyToManyRelationshipPathDescriptor::generateModelKey($this->remoteFk, $this->localFk);
-        $this->pathModel = ManyToManyRelationshipPathDescriptor::generateModelArray($this->remoteFk, $this->localFk);
     }
 
     /**