Merge pull request #8434 from kenjis/refactor-Forge-variables

refactor: improve Forge variable names
codeigniter4 · Jan 20, 2024 · 28cf32b · 28cf32b
2 parents 83c582c + 213f0b9
commit 28cf32b
Show file tree

Hide file tree

Showing 8 changed files with 274 additions and 240 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -1451,11 +1451,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(array\\|bool\\|string\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_alterTable\\(\\) should be covariant with return type \\(array\\<string\\>\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -1656,11 +1651,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(array\\|string\\|null\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_alterTable\\(\\) should be covariant with return type \\(array\\<string\\>\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(SQLite3Result\\|false\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<SQLite3,SQLite3Stmt,SQLite3Result\\>\\:\\:_getResult\\(\\)$#',
 	'count' => 1,