Merge branch 'develop' into 4.6

codeigniter4 · Jan 7, 2025 · e475fd8 · e475fd8
2 parents d9aca42 + e5a60f3
commit e475fd8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.3",
-        "rector/rector": "2.0.5",
+        "rector/rector": "2.0.6",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -400,7 +400,7 @@ public function testCSRFMeta(): void
 
     public function testModelNotExists(): void
     {
-        $this->assertNull(model(UnexsistenceClass::class));
+        $this->assertNull(model(UnexsistenceClass::class)); // @phpstan-ignore class.notFound
     }
 
     public function testModelExistsBasename(): void

diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
@@ -142,13 +142,13 @@ public function testHelperLoadsAppHelperFirst(): void
 
         // this chunk is not needed really; just added so that IDEs will be happy
         if (! function_exists('foo_bar_baz')) {
-            function foo_bar_baz(): string
+            function foo_bar_baz(): string // @phpstan-ignore function.inner
             {
                 return __FILE__;
             }
         }
 
-        $this->assertSame($this->dummyHelpers[0], foo_bar_baz()); // @phpstan-ignore-line function.notFound
+        $this->assertSame($this->dummyHelpers[0], foo_bar_baz()); // @phpstan-ignore function.notFound
     }
 
     public function testNamespacedHelperNotFound(): void

diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
@@ -53,7 +53,7 @@ public function testBadController(): void
         $logger = new Logger(new LoggerConfig());
         $this->withUri('http://example.com')
             ->withLogger($logger)
-            ->controller(NeverHeardOfIt::class)
+            ->controller(NeverHeardOfIt::class) // @phpstan-ignore class.notFound
             ->execute('index');
     }
 

diff --git a/utils/phpstan-baseline/class.notFound.neon b/utils/phpstan-baseline/class.notFound.neon
diff --git a/utils/phpstan-baseline/function.inner.neon b/utils/phpstan-baseline/function.inner.neon
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -2,7 +2,6 @@ includes:
     - argument.type.neon
     - assign.propertyType.neon
     - booleanAnd.rightAlwaysTrue.neon
-    - class.notFound.neon
     - codeigniter.cacheHandlerInstance.neon
     - codeigniter.configArgumentInstanceof.neon
     - codeigniter.frameworkExceptionInstance.neon
@@ -17,7 +16,6 @@ includes:
     - empty.property.neon
     - expr.resultUnused.neon
     - function.alreadyNarrowedType.neon
-    - function.inner.neon
     - generator.valueType.neon
     - isset.offset.neon
     - isset.property.neon