Clean up phpstan output.

cakephp · Dec 27, 2023 · 6b8d237 · 6b8d237
1 parent bc23881
commit 6b8d237
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -16,29 +16,24 @@ parameters:
 			path: src/Command/BakeMigrationSnapshotCommand.php
 
 		-
-			message: "#^Parameter \\#1 \\$table of method Phinx\\\\Db\\\\Adapter\\\\AdapterInterface\\:\\:createTable\\(\\) expects Phinx\\\\Db\\\\Table\\\\Table, Migrations\\\\Db\\\\Table\\\\Table given\\.$#"
+			message: "#^Offset 'id' on non\\-empty\\-array\\<string, mixed\\> in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 2
-			path: src/Db/Plan/Plan.php
+			path: src/Db/Adapter/MysqlAdapter.php
 
 		-
-			message: "#^Parameter \\#1 \\$table of method Phinx\\\\Db\\\\Adapter\\\\AdapterInterface\\:\\:executeActions\\(\\) expects Phinx\\\\Db\\\\Table\\\\Table, Migrations\\\\Db\\\\Table\\\\Table given\\.$#"
-			count: 2
-			path: src/Db/Plan/Plan.php
-
-		-
-			message: "#^Parameter \\#2 \\$actions of method Phinx\\\\Db\\\\Adapter\\\\AdapterInterface\\:\\:executeActions\\(\\) expects array\\<Phinx\\\\Db\\\\Action\\\\Action\\>, array\\<Migrations\\\\Db\\\\Action\\\\Action\\> given\\.$#"
-			count: 2
-			path: src/Db/Plan/Plan.php
+			message: "#^Parameter \\#4 \\$options of method Migrations\\\\Db\\\\Adapter\\\\PdoAdapter\\:\\:createPdoConnection\\(\\) expects array\\<int, mixed\\>, array\\<int\\|string, mixed\\> given\\.$#"
+			count: 1
+			path: src/Db/Adapter/MysqlAdapter.php
 
 		-
-			message: "#^Parameter \\#2 \\$columns of method Phinx\\\\Db\\\\Adapter\\\\AdapterInterface\\:\\:createTable\\(\\) expects array\\<Phinx\\\\Db\\\\Table\\\\Column\\>, array\\<Migrations\\\\Db\\\\Table\\\\Column\\> given\\.$#"
-			count: 2
-			path: src/Db/Plan/Plan.php
+			message: "#^Right side of && is always true\\.$#"
+			count: 1
+			path: src/Db/Adapter/MysqlAdapter.php
 
 		-
-			message: "#^Parameter \\#3 \\$indexes of method Phinx\\\\Db\\\\Adapter\\\\AdapterInterface\\:\\:createTable\\(\\) expects array\\<Phinx\\\\Db\\\\Table\\\\Index\\>, array\\<Migrations\\\\Db\\\\Table\\\\Index\\> given\\.$#"
-			count: 2
-			path: src/Db/Plan/Plan.php
+			message: "#^Access to an undefined property PDO\\:\\:\\$connection\\.$#"
+			count: 1
+			path: src/Db/Adapter/PdoAdapter.php
 
 		-
 			message: "#^Possibly invalid array key type Cake\\\\Database\\\\Schema\\\\TableSchemaInterface\\|string\\.$#"

diff --git a/src/Db/Adapter/MysqlAdapter.php b/src/Db/Adapter/MysqlAdapter.php
@@ -1362,7 +1362,7 @@ protected function getColumnSqlDefinition(Column $column): string
 
         $def .= $column->getEncoding() ? ' CHARACTER SET ' . $column->getEncoding() : '';
         $def .= $column->getCollation() ? ' COLLATE ' . $column->getCollation() : '';
-        $def .= !$column->isSigned() && isset($this->signedColumnTypes[$column->getType()]) ? ' unsigned' : '';
+        $def .= !$column->isSigned() && isset($this->signedColumnTypes[(string)$column->getType()]) ? ' unsigned' : '';
         $def .= $column->isNull() ? ' NULL' : ' NOT NULL';
 
         if (
@@ -1450,7 +1450,7 @@ protected function getIndexSqlDefinition(Index $index): string
             $def .= ' (';
             foreach ($columns as $column) {
                 $limit = !isset($limits[$column]) || $limits[$column] <= 0 ? '' : '(' . $limits[$column] . ')';
-                $columnSort = isset($order[$column]) ?? '';
+                $columnSort = $order[$column] ?? '';
                 $def .= '`' . $column . '`' . $limit . ' ' . $columnSort . ', ';
             }
             $def = rtrim($def, ', ');

diff --git a/src/Db/Adapter/PdoAdapter.php b/src/Db/Adapter/PdoAdapter.php
@@ -196,7 +196,9 @@ public function execute(string $sql, array $params = []): int
         }
 
         if (empty($params)) {
-            return $this->getConnection()->exec($sql);
+            $result = $this->getConnection()->exec($sql);
+
+            return is_int($result) ? $result : 0;
         }
 
         $stmt = $this->getConnection()->prepare($sql);
@@ -347,7 +349,9 @@ public function bulkinsert(Table $table, array $rows): void
         );
         $current = current($rows);
         $keys = array_keys($current);
-        $sql .= '(' . implode(', ', array_map([$this, 'quoteColumnName'], $keys)) . ') VALUES ';
+
+        $callback = fn ($key) => $this->quoteColumnName($key);
+        $sql .= '(' . implode(', ', array_map($callback, $keys)) . ') VALUES ';
 
         if ($this->isDryRunEnabled()) {
             $values = array_map(function ($row) {