Merge remote-tracking branch 'upstream/develop' into 4.5

codeigniter4 · Jan 17, 2024 · 0da6311 · 0da6311
2 parents e8bcffc + 9582c8f
commit 0da6311
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 14 deletions.
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -19,7 +19,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.46.0",
+        "friendsofphp/php-cs-fixer": "^3.47.1",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.46.0",
+        "friendsofphp/php-cs-fixer": "^3.47.1",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
@@ -32,7 +32,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.19.0",
+        "rector/rector": "0.19.1",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -1186,11 +1186,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Class stdClass referenced with incorrect case\\: stdclass\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Database/SQLite3/Table.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,

diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
@@ -14,7 +14,7 @@
 namespace CodeIgniter\Database\SQLite3;
 
 use CodeIgniter\Database\Exceptions\DataException;
-use stdclass;
+use stdClass;
 
 /**
  * Class Table

diff --git a/tests/system/Database/Live/SQLite/GetIndexDataTest.php b/tests/system/Database/Live/SQLite/GetIndexDataTest.php
@@ -77,19 +77,19 @@ public function testGetIndexData(): void
 
         $expectedIndexes = [];
 
-        $row                        = new stdclass();
+        $row                        = new stdClass();
         $row->name                  = 'PRIMARY';
         $row->fields                = ['id'];
         $row->type                  = 'PRIMARY';
         $expectedIndexes['PRIMARY'] = $row;
 
-        $row                               = new stdclass();
+        $row                               = new stdClass();
         $row->name                         = 'testuser_email';
         $row->fields                       = ['email'];
         $row->type                         = 'UNIQUE';
         $expectedIndexes['testuser_email'] = $row;
 
-        $row                                 = new stdclass();
+        $row                                 = new stdClass();
         $row->name                           = 'testuser_country';
         $row->fields                         = ['country'];
         $row->type                           = 'INDEX';

diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
@@ -31,7 +31,7 @@ final class ExceptionsTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
-    private \CodeIgniter\Debug\Exceptions $exception;
+    private Exceptions $exception;
 
     public static function setUpBeforeClass(): void
     {

diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
@@ -29,7 +29,7 @@ final class ViewTest extends CIUnitTestCase
 {
     private FileLocator $loader;
     private string $viewsDir;
-    private \Config\View $config;
+    private Config\View $config;
 
     protected function setUp(): void
     {