fix: conflict fixed.

codeigniter4 · Aug 4, 2024 · 01edca8 · 01edca8
1 parent 7727d15
commit 01edca8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
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 change
@@ Expand Up / @@ -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
          *
@@ Expand Down @@