refactor: Fix phpstan return.type (#9375)

* refactor: Fix phpstan return.type * refactor: Fix phpstan return.type
codeigniter4 · Jan 8, 2025 · 72b7f8a · 72b7f8a
1 parent 3eb8a09
commit 72b7f8a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -21,6 +21,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Router\RouteCollectionInterface;
 use CodeIgniter\Router\Router;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ConfigFromArrayTrait;
@@ -53,7 +54,7 @@ protected function setUp(): void
         $this->moduleConfig->enabled = false;
     }
 
-    private function createRouteCollection(array $routes = []): RouteCollection
+    private function createRouteCollection(array $routes = []): RouteCollectionInterface
     {
         $collection = new RouteCollection(service('locator'), $this->moduleConfig, new Routing());
 
@@ -66,7 +67,7 @@ private function createRouteCollection(array $routes = []): RouteCollection
         return $collection->map($routes);
     }
 
-    private function createRouter(RouteCollection $collection): Router
+    private function createRouter(RouteCollectionInterface $collection): Router
     {
         return new Router($collection, $this->request);
     }
@@ -101,6 +102,9 @@ private function createFilters(array $config = []): Filters
 
     public function testFindGlobalsFilters(): void
     {
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection();
         $router     = $this->createRouter($collection);
         $filters    = $this->createFilters();
@@ -118,6 +122,9 @@ public function testFindGlobalsFilters(): void
 
     public function testFindGlobalsFiltersWithRedirectRoute(): void
     {
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection();
         $collection->addRedirect('users/about', 'profile');
 
@@ -137,6 +144,9 @@ public function testFindGlobalsFiltersWithRedirectRoute(): void
 
     public function testFindGlobalsAndRouteFilters(): void
     {
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection();
         $collection->get('admin', ' AdminController::index', ['filter' => 'honeypot']);
         $router  = $this->createRouter($collection);
@@ -155,6 +165,9 @@ public function testFindGlobalsAndRouteFilters(): void
 
     public function testFindGlobalsAndRouteClassnameFilters(): void
     {
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection();
         $collection->get('admin', ' AdminController::index', ['filter' => InvalidChars::class]);
         $router  = $this->createRouter($collection);
@@ -173,6 +186,9 @@ public function testFindGlobalsAndRouteClassnameFilters(): void
 
     public function testFindGlobalsAndRouteMultipleFilters(): void
     {
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection();
         $collection->get('admin', ' AdminController::index', ['filter' => ['honeypot', InvalidChars::class]]);
         $router  = $this->createRouter($collection);
@@ -191,6 +207,9 @@ public function testFindGlobalsAndRouteMultipleFilters(): void
 
     public function testFilterOrder(): void
     {
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection([]);
         $collection->get('/', ' Home::index', ['filter' => ['route1', 'route2']]);
         $router  = $this->createRouter($collection);
@@ -256,6 +275,9 @@ public function testFilterOrderWithOldFilterOrder(): void
         $feature                 = config(Feature::class);
         $feature->oldFilterOrder = true;
 
+        /**
+         * @var RouteCollection $collection
+         */
         $collection = $this->createRouteCollection([]);
         $collection->get('/', ' Home::index', ['filter' => ['route1', 'route2']]);
         $router  = $this->createRouter($collection);

diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -43,7 +43,6 @@ includes:
     - property.readOnlyByPhpDocDefaultValue.neon
     - property.unusedType.neon
     - return.missing.neon
-    - return.type.neon
     - return.unusedType.neon
     - staticMethod.notFound.neon
     - ternary.shortNotAllowed.neon

diff --git a/utils/phpstan-baseline/return.type.neon b/utils/phpstan-baseline/return.type.neon