refactor: fix method.alreadyNarrowedType errors

admin/starter/tests/unit/HealthTest.php

@@ -11,7 +11,7 @@ final class HealthTest extends CIUnitTestCase
 {
     public function testIsDefinedAppPath(): void
     {
-        $this->assertTrue(defined('APPPATH'));
+        $this->assertDirectoryExists(APPPATH);
     }
 
     public function testBaseUrlHasBeenSet(): void

tests/system/CLI/CLITest.php

@@ -292,7 +292,10 @@ public function testColorSupportOnHyperTerminals(): void
     public function testStreamSupports(): void
     {
         $this->assertTrue(CLI::streamSupports('stream_isatty', STDOUT));
-        $this->assertIsBool(CLI::streamSupports('sapi_windows_vt100_support', STDOUT));
+        $this->assertSame(
+            function_exists('sapi_windows_vt100_support'),
+            CLI::streamSupports('sapi_windows_vt100_support', STDOUT),
+        );
     }
 
     public function testColor(): void
@@ -587,12 +590,12 @@ public function testWindow(): void
         $height = new ReflectionProperty(CLI::class, 'height');
         $height->setValue(null, null);
 
-        $this->assertIsInt(CLI::getHeight());
+        $this->assertGreaterThan(0, CLI::getHeight());
 
         $width = new ReflectionProperty(CLI::class, 'width');
         $width->setValue(null, null);
 
-        $this->assertIsInt(CLI::getWidth());
+        $this->assertGreaterThan(0, CLI::getWidth());
     }
 
     #[RequiresOperatingSystem('Darwin|Linux')]

tests/system/CodeIgniterTest.php

@@ -984,7 +984,7 @@ public function testStartControllerPermitsInvoke(): void
         $startController();
 
         // No PageNotFoundException
-        $this->assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 
     public function testRouteAttributeCacheIntegration(): void

tests/system/CommonFunctionsTest.php

@@ -773,7 +773,6 @@ public static function provideCleanPathActuallyCleaningThePaths(): iterable
 
     public function testIsCli(): void
     {
-        $this->assertIsBool(is_cli());
         $this->assertTrue(is_cli());
     }
 

tests/system/Config/FactoriesTest.php

@@ -439,7 +439,6 @@ public function testGetComponentInstances(): array
 
         $data = Factories::getComponentInstances('config');
 
-        $this->assertIsArray($data);
         $this->assertArrayHasKey('aliases', $data);
         $this->assertArrayHasKey('instances', $data);
 
@@ -469,7 +468,6 @@ public function testSetComponentInstances(array $data): array
 
         $data = Factories::getComponentInstances('config');
 
-        $this->assertIsArray($data);
         $this->assertArrayHasKey('aliases', $data);
         $this->assertArrayHasKey('instances', $data);
 

tests/system/Database/Live/UpdateTest.php

@@ -75,7 +75,7 @@ public function testUpdateSetsAllWithoutWhereAndLimit(): void
         } catch (DatabaseException) {
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
-            $this->assertTrue(true);
+            $this->expectNotToPerformAssertions();
         }
     }
 
@@ -110,7 +110,7 @@ public function testUpdateWithWhereAndLimit(): void
         } catch (DatabaseException) {
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
-            $this->assertTrue(true);
+            $this->expectNotToPerformAssertions();
         }
     }
 

tests/system/HTTP/CLIRequestTest.php

@@ -431,7 +431,6 @@ public function testFetchGlobalReturnsArrayValues(): void
         $result = $this->request->fetchGlobal('post');
 
         $this->assertSame($post, $result);
-        $this->assertIsArray($result['ANNOUNCEMENTS']);
         $this->assertCount(2, $result['ANNOUNCEMENTS']);
     }
 

tests/system/HTTP/RequestTest.php

@@ -195,7 +195,6 @@ public function testFetchGlobalReturnsArrayValues(): void
         $result = $this->request->fetchGlobal('post');
 
         $this->assertSame($post, $result);
-        $this->assertIsArray($result['ANNOUNCEMENTS']);
         $this->assertCount(2, $result['ANNOUNCEMENTS']);
     }
 

tests/system/HTTP/URITest.php

@@ -1192,7 +1192,7 @@ public function testSetURISilent(): void
 
         $uri->setSilent()->setURI($url);
 
-        $this->assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 
     public function testCreateURIStringNoArguments(): void

tests/system/Helpers/TextHelperTest.php

@@ -130,8 +130,7 @@ public function testRandomString(): void
         $this->assertSame(16, strlen(random_string('numeric', 16)));
         $this->assertSame(8, strlen(random_string('numeric')));
 
-        $this->assertSame(16, strlen($random = random_string('crypto', 16)));
-        $this->assertIsString($random);
+        $this->assertSame(16, strlen(random_string('crypto', 16)));
     }
 
     /**

tests/system/HotReloader/DirectoryHasherTest.php

@@ -62,7 +62,6 @@ public function testHashApp(): void
 
         $results = $this->hasher->hashApp();
 
-        $this->assertIsArray($results);
         $this->assertArrayHasKey($this->fixtureDirectory, $results);
     }
 

tests/system/Publisher/PublisherSupportTest.php

@@ -106,7 +106,6 @@ public function testGetScratch(): void
 
         $scratch = $publisher->getScratch();
 
-        $this->assertIsString($scratch);
         $this->assertDirectoryExists($scratch);
         $this->assertDirectoryIsWritable($scratch);
         $this->assertNotNull($this->getPrivateProperty($publisher, 'scratch'));

tests/system/Security/SecurityTest.php

@@ -350,11 +350,11 @@ public function testGetters(): void
     {
         $security = $this->createMockSecurity();
 
-        $this->assertIsString($security->getHash());
-        $this->assertIsString($security->getTokenName());
-        $this->assertIsString($security->getHeaderName());
-        $this->assertIsString($security->getCookieName());
-        $this->assertIsBool($security->shouldRedirect());
+        $this->assertSame(32, strlen($security->getHash()));
+        $this->assertSame('csrf_test_name', $security->getTokenName());
+        $this->assertSame('X-CSRF-TOKEN', $security->getHeaderName());
+        $this->assertSame('csrf_cookie_name', $security->getCookieName());
+        $this->assertFalse($security->shouldRedirect());
     }
 
     public function testGetPostedTokenReturnsTokenFromPost(): void

tests/system/Test/FabricatorTest.php

@@ -128,8 +128,10 @@ public function testGetFakerReturnsUsableGenerator(): void
         $fabricator = new Fabricator(UserModel::class);
 
         $faker = $fabricator->getFaker();
+        $digit = $faker->randomDigit();
 
-        $this->assertIsNumeric($faker->randomDigit());
+        $this->assertGreaterThanOrEqual(0, $digit);
+        $this->assertLessThanOrEqual(9, $digit);
     }
 
     public function testSetFormattersChangesFormatters(): void

tests/system/Test/FilterTestTraitTest.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter\Test;
 
+use Closure;
 use CodeIgniter\HTTP\RequestInterface;
 use PHPUnit\Framework\Attributes\Group;
 use Tests\Support\Filters\Customfilter;
@@ -53,8 +54,7 @@ public function testGetCallerReturnsClosure(): void
     {
         $caller = $this->getFilterCaller('test-customfilter', 'before');
 
-        $this->assertIsCallable($caller);
-        $this->assertInstanceOf('Closure', $caller);
+        $this->assertInstanceOf(Closure::class, $caller);
     }
 
     public function testGetCallerInvalidPosition(): void

utils/phpstan-baseline/loader.neon

@@ -1,4 +1,4 @@
-# total 1808 errors
+# total 1786 errors
 
 includes:
     - argument.type.neon
@@ -8,7 +8,6 @@ includes:
     - deadCode.unreachable.neon
     - empty.notAllowed.neon
     - function.resultUnused.neon
-    - method.alreadyNarrowedType.neon
     - method.childParameterType.neon
     - method.childReturnType.neon
     - method.notFound.neon