Merge branch 'develop' into 4.6

paulbalandan · paulbalandan · commit e475fd8fa41d · 2025-01-08T02:49:47.000+08:00
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

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ public function testCSRFMeta(): void`
`400`	`400`
`401`	`401`	`public function testModelNotExists(): void`
`402`	`402`	`{`
`403`		`- $this->assertNull(model(UnexsistenceClass::class));`
	`403`	`+ $this->assertNull(model(UnexsistenceClass::class)); // @phpstan-ignore class.notFound`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`public function testModelExistsBasename(): void`
Original file line number	Diff line number	Diff line change
`@@ -142,13 +142,13 @@ public function testHelperLoadsAppHelperFirst(): void`
`142`	`142`
`143`	`143`	`// this chunk is not needed really; just added so that IDEs will be happy`
`144`	`144`	`if (! function_exists('foo_bar_baz')) {`
`145`		`- function foo_bar_baz(): string`
	`145`	`+ function foo_bar_baz(): string // @phpstan-ignore function.inner`
`146`	`146`	`{`
`147`	`147`	`return __FILE__;`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
`151`		`- $this->assertSame($this->dummyHelpers[0], foo_bar_baz()); // @phpstan-ignore-line function.notFound`
	`151`	`+ $this->assertSame($this->dummyHelpers[0], foo_bar_baz()); // @phpstan-ignore function.notFound`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public function testNamespacedHelperNotFound(): void`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testBadController(): void`
`53`	`53`	`$logger = new Logger(new LoggerConfig());`
`54`	`54`	`$this->withUri('http://example.com')`
`55`	`55`	`->withLogger($logger)`
`56`		`- ->controller(NeverHeardOfIt::class)`
	`56`	`+ ->controller(NeverHeardOfIt::class) // @phpstan-ignore class.notFound`
`57`	`57`	`->execute('index');`
`58`	`58`	`}`
`59`	`59`