Skip to content

Commit 8f6a8c0

Browse files
committed
refactor: Fix phpstan return.type
1 parent d24e64a commit 8f6a8c0

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

system/Router/RouteCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public function setHTTPVerb(string $verb)
652652
* It does not allow any options to be set on the route, or to
653653
* define the method used.
654654
*/
655-
public function map(array $routes = [], ?array $options = null): static
655+
public function map(array $routes = [], ?array $options = null): RouteCollectionInterface
656656
{
657657
foreach ($routes as $from => $to) {
658658
$this->add($from, $to, $options);

tests/system/Commands/Utilities/Routes/FilterFinderTest.php

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use CodeIgniter\HTTP\IncomingRequest;
2222
use CodeIgniter\HTTP\Response;
2323
use CodeIgniter\Router\RouteCollection;
24+
use CodeIgniter\Router\RouteCollectionInterface;
2425
use CodeIgniter\Router\Router;
2526
use CodeIgniter\Test\CIUnitTestCase;
2627
use CodeIgniter\Test\ConfigFromArrayTrait;
@@ -53,7 +54,7 @@ protected function setUp(): void
5354
$this->moduleConfig->enabled = false;
5455
}
5556

56-
private function createRouteCollection(array $routes = []): RouteCollection
57+
private function createRouteCollection(array $routes = []): RouteCollectionInterface
5758
{
5859
$collection = new RouteCollection(service('locator'), $this->moduleConfig, new Routing());
5960

@@ -66,7 +67,7 @@ private function createRouteCollection(array $routes = []): RouteCollection
6667
return $collection->map($routes);
6768
}
6869

69-
private function createRouter(RouteCollection $collection): Router
70+
private function createRouter(RouteCollectionInterface $collection): Router
7071
{
7172
return new Router($collection, $this->request);
7273
}
@@ -101,6 +102,9 @@ private function createFilters(array $config = []): Filters
101102

102103
public function testFindGlobalsFilters(): void
103104
{
105+
/**
106+
* @var RouteCollection $collection
107+
*/
104108
$collection = $this->createRouteCollection();
105109
$router = $this->createRouter($collection);
106110
$filters = $this->createFilters();
@@ -118,6 +122,9 @@ public function testFindGlobalsFilters(): void
118122

119123
public function testFindGlobalsFiltersWithRedirectRoute(): void
120124
{
125+
/**
126+
* @var RouteCollection $collection
127+
*/
121128
$collection = $this->createRouteCollection();
122129
$collection->addRedirect('users/about', 'profile');
123130

@@ -137,6 +144,9 @@ public function testFindGlobalsFiltersWithRedirectRoute(): void
137144

138145
public function testFindGlobalsAndRouteFilters(): void
139146
{
147+
/**
148+
* @var RouteCollection $collection
149+
*/
140150
$collection = $this->createRouteCollection();
141151
$collection->get('admin', ' AdminController::index', ['filter' => 'honeypot']);
142152
$router = $this->createRouter($collection);
@@ -155,6 +165,9 @@ public function testFindGlobalsAndRouteFilters(): void
155165

156166
public function testFindGlobalsAndRouteClassnameFilters(): void
157167
{
168+
/**
169+
* @var RouteCollection $collection
170+
*/
158171
$collection = $this->createRouteCollection();
159172
$collection->get('admin', ' AdminController::index', ['filter' => InvalidChars::class]);
160173
$router = $this->createRouter($collection);
@@ -173,6 +186,9 @@ public function testFindGlobalsAndRouteClassnameFilters(): void
173186

174187
public function testFindGlobalsAndRouteMultipleFilters(): void
175188
{
189+
/**
190+
* @var RouteCollection $collection
191+
*/
176192
$collection = $this->createRouteCollection();
177193
$collection->get('admin', ' AdminController::index', ['filter' => ['honeypot', InvalidChars::class]]);
178194
$router = $this->createRouter($collection);
@@ -191,6 +207,9 @@ public function testFindGlobalsAndRouteMultipleFilters(): void
191207

192208
public function testFilterOrder(): void
193209
{
210+
/**
211+
* @var RouteCollection $collection
212+
*/
194213
$collection = $this->createRouteCollection([]);
195214
$collection->get('/', ' Home::index', ['filter' => ['route1', 'route2']]);
196215
$router = $this->createRouter($collection);
@@ -256,6 +275,9 @@ public function testFilterOrderWithOldFilterOrder(): void
256275
$feature = config(Feature::class);
257276
$feature->oldFilterOrder = true;
258277

278+
/**
279+
* @var RouteCollection $collection
280+
*/
259281
$collection = $this->createRouteCollection([]);
260282
$collection->get('/', ' Home::index', ['filter' => ['route1', 'route2']]);
261283
$router = $this->createRouter($collection);

0 commit comments

Comments
 (0)