PHPStan fixes

compositephp · Jun 18, 2023 · e4543eb · e4543eb
1 parent e2264b6
commit e4543eb
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/src/AbstractTable.php b/src/AbstractTable.php
@@ -132,9 +132,9 @@ public function saveMany(array $entities): void
                         tableName: $this->getTableName(),
                         rows: $chunk,
                     );
-                    if ($multiInsert->sql) {
-                        $stmt = $this->getConnection()->prepare($multiInsert->sql);
-                        $stmt->executeQuery($multiInsert->parameters);
+                    if ($multiInsert->getSql()) {
+                        $stmt = $this->getConnection()->prepare($multiInsert->getSql());
+                        $stmt->executeQuery($multiInsert->getParameters());
                     }
                 }
             }
@@ -223,7 +223,7 @@ protected function findOneInternal(array $where): ?array
 
     /**
      * @param array<int|string|array<string,mixed>> $pkList
-     * @return array
+     * @return array<array<string, mixed>>
      * @throws DbException
      * @throws EntityException
      * @throws \Doctrine\DBAL\Exception
@@ -253,7 +253,7 @@ protected function findMultiInternal(array $pkList): array
             $query = $this->select();
             $expressions = [];
             foreach ($pkList as $i => $pkArray) {
-                if (!is_array($pkArray) || array_is_list($pkArray)) {
+                if (!is_array($pkArray)) {
                     throw new DbException('For tables with composite keys, input array must consist associative arrays');
                 }
                 $pkOrExpr = [];
@@ -276,7 +276,7 @@ protected function findMultiInternal(array $pkList): array
     /**
      * @param array<string, mixed> $whereParams
      * @param array<string, string>|string $orderBy
-     * @return array<string, mixed>
+     * @return list<array<string,mixed>>
      * @throws \Doctrine\DBAL\Exception
      */
     protected function findAllInternal(

diff --git a/src/MultiQuery/MultiInsert.php b/src/MultiQuery/MultiInsert.php
@@ -4,33 +4,47 @@
 
 class MultiInsert
 {
-    public readonly string $sql;
-    public readonly array $parameters;
+    private string $sql = '';
+    /** @var array<string, mixed> */
+    private array $parameters = [];
 
+    /**
+     * @param string $tableName
+     * @param list<array<string, mixed>> $rows
+     */
     public function __construct(string $tableName, array $rows) {
         if (!$rows) {
-            $this->sql = '';
-            $this->parameters = [];
             return;
         }
         $firstRow = reset($rows);
-        $columnNames = array_map(fn ($columnName) => "`$columnName`", array_keys($firstRow));
-        $sql = "INSERT INTO `$tableName` (" . implode(', ', $columnNames) . ") VALUES ";
-        $valuesSql = $parameters = [];
+        $columnNames = array_map(fn($columnName) => "`$columnName`", array_keys($firstRow));
+        $this->sql = "INSERT INTO `$tableName` (" . implode(', ', $columnNames) . ") VALUES ";
+        $valuesSql = [];
 
         $index = 0;
         foreach ($rows as $row) {
             $valuePlaceholder = [];
             foreach ($row as $column => $value) {
                 $valuePlaceholder[] = ":$column$index";
-                $parameters["$column$index"] = $value;
+                $this->parameters["$column$index"] = $value;
             }
             $valuesSql[] = '(' . implode(', ', $valuePlaceholder) . ')';
             $index++;
         }
 
-        $sql .= implode(', ', $valuesSql);
-        $this->sql = $sql . ';';
-        $this->parameters = $parameters;
+        $this->sql .= implode(', ', $valuesSql) . ';';
+    }
+
+    public function getSql(): string
+    {
+        return $this->sql;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getParameters(): array
+    {
+        return $this->parameters;
     }
 }
diff --git a/src/TableConfig.php b/src/TableConfig.php
@@ -9,6 +9,7 @@
 
 class TableConfig
 {
+    /** @var array<class-string, true> */
     private readonly array $entityTraits;
 
     /**

diff --git a/tests/MultiQuery/MultiInsertTest.php b/tests/MultiQuery/MultiInsertTest.php
@@ -13,8 +13,8 @@ public function test_multiInsertQuery($tableName, $rows, $expectedSql, $expected
     {
         $multiInserter = new MultiInsert($tableName, $rows);
 
-        $this->assertEquals($expectedSql, $multiInserter->sql);
-        $this->assertEquals($expectedParameters, $multiInserter->parameters);
+        $this->assertEquals($expectedSql, $multiInserter->getSql());
+        $this->assertEquals($expectedParameters, $multiInserter->getParameters());
     }
 
     public static function multiInsertQuery_dataProvider()