fix: conflict fixed.

ping-yee · ping-yee · commit 01edca8b94db · 2024-08-04T16:06:36.000+08:00
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -2677,12 +2677,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Forge.php',
 ];
-$ignoreErrors[] = [
-	// identifier: missingType.iterableValue
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:dropColumn\\(\\) has parameter \\$columnNames with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Forge.php',
-];
 $ignoreErrors[] = [
 	// identifier: missingType.iterableValue
 	'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:modifyColumn\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#',
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
@@ -778,7 +778,7 @@ public function addColumn(string $table, $fields): bool
     }
 
     /**
-     * @param array|string $columnNames column names to DROP
+     * @param list<string>|string $columnNames column names to DROP
      *
      * @return bool
      *
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
@@ -154,7 +154,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
     }
 
     /**
-     * @param array|string $columnNames column names to DROP
+     * @param list<string>|string $columnNames column names to DROP
      *
      * @return bool
      *
diff --git a/writable/test_com.sitedb.web b/writable/test_com.sitedb.web

Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ public function addColumn(string $table, $fields): bool`
`778`	`778`	`}`
`779`	`779`
`780`	`780`	`/**`
`781`		`- * @param array\|string $columnNames column names to DROP`
	`781`	`+ * @param list<string>\|string $columnNames column names to DROP`
`782`	`782`	`*`
`783`	`783`	`* @return bool`
`784`	`784`	`*`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ protected function _alterTable(string $alterType, string $table, $processedField`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
`157`		`- * @param array\|string $columnNames column names to DROP`
	`157`	`+ * @param list<string>\|string $columnNames column names to DROP`
`158`	`158`	`*`
`159`	`159`	`* @return bool`
`160`	`160`	`*`