21
21
use CodeIgniter \HTTP \IncomingRequest ;
22
22
use CodeIgniter \HTTP \Response ;
23
23
use CodeIgniter \Router \RouteCollection ;
24
+ use CodeIgniter \Router \RouteCollectionInterface ;
24
25
use CodeIgniter \Router \Router ;
25
26
use CodeIgniter \Test \CIUnitTestCase ;
26
27
use CodeIgniter \Test \ConfigFromArrayTrait ;
@@ -53,7 +54,7 @@ protected function setUp(): void
53
54
$ this ->moduleConfig ->enabled = false ;
54
55
}
55
56
56
- private function createRouteCollection (array $ routes = []): RouteCollection
57
+ private function createRouteCollection (array $ routes = []): RouteCollectionInterface
57
58
{
58
59
$ collection = new RouteCollection (service ('locator ' ), $ this ->moduleConfig , new Routing ());
59
60
@@ -66,7 +67,7 @@ private function createRouteCollection(array $routes = []): RouteCollection
66
67
return $ collection ->map ($ routes );
67
68
}
68
69
69
- private function createRouter (RouteCollection $ collection ): Router
70
+ private function createRouter (RouteCollectionInterface $ collection ): Router
70
71
{
71
72
return new Router ($ collection , $ this ->request );
72
73
}
@@ -101,6 +102,9 @@ private function createFilters(array $config = []): Filters
101
102
102
103
public function testFindGlobalsFilters (): void
103
104
{
105
+ /**
106
+ * @var RouteCollection $collection
107
+ */
104
108
$ collection = $ this ->createRouteCollection ();
105
109
$ router = $ this ->createRouter ($ collection );
106
110
$ filters = $ this ->createFilters ();
@@ -118,6 +122,9 @@ public function testFindGlobalsFilters(): void
118
122
119
123
public function testFindGlobalsFiltersWithRedirectRoute (): void
120
124
{
125
+ /**
126
+ * @var RouteCollection $collection
127
+ */
121
128
$ collection = $ this ->createRouteCollection ();
122
129
$ collection ->addRedirect ('users/about ' , 'profile ' );
123
130
@@ -137,6 +144,9 @@ public function testFindGlobalsFiltersWithRedirectRoute(): void
137
144
138
145
public function testFindGlobalsAndRouteFilters (): void
139
146
{
147
+ /**
148
+ * @var RouteCollection $collection
149
+ */
140
150
$ collection = $ this ->createRouteCollection ();
141
151
$ collection ->get ('admin ' , ' AdminController::index ' , ['filter ' => 'honeypot ' ]);
142
152
$ router = $ this ->createRouter ($ collection );
@@ -155,6 +165,9 @@ public function testFindGlobalsAndRouteFilters(): void
155
165
156
166
public function testFindGlobalsAndRouteClassnameFilters (): void
157
167
{
168
+ /**
169
+ * @var RouteCollection $collection
170
+ */
158
171
$ collection = $ this ->createRouteCollection ();
159
172
$ collection ->get ('admin ' , ' AdminController::index ' , ['filter ' => InvalidChars::class]);
160
173
$ router = $ this ->createRouter ($ collection );
@@ -173,6 +186,9 @@ public function testFindGlobalsAndRouteClassnameFilters(): void
173
186
174
187
public function testFindGlobalsAndRouteMultipleFilters (): void
175
188
{
189
+ /**
190
+ * @var RouteCollection $collection
191
+ */
176
192
$ collection = $ this ->createRouteCollection ();
177
193
$ collection ->get ('admin ' , ' AdminController::index ' , ['filter ' => ['honeypot ' , InvalidChars::class]]);
178
194
$ router = $ this ->createRouter ($ collection );
@@ -191,6 +207,9 @@ public function testFindGlobalsAndRouteMultipleFilters(): void
191
207
192
208
public function testFilterOrder (): void
193
209
{
210
+ /**
211
+ * @var RouteCollection $collection
212
+ */
194
213
$ collection = $ this ->createRouteCollection ([]);
195
214
$ collection ->get ('/ ' , ' Home::index ' , ['filter ' => ['route1 ' , 'route2 ' ]]);
196
215
$ router = $ this ->createRouter ($ collection );
@@ -256,6 +275,9 @@ public function testFilterOrderWithOldFilterOrder(): void
256
275
$ feature = config (Feature::class);
257
276
$ feature ->oldFilterOrder = true ;
258
277
278
+ /**
279
+ * @var RouteCollection $collection
280
+ */
259
281
$ collection = $ this ->createRouteCollection ([]);
260
282
$ collection ->get ('/ ' , ' Home::index ' , ['filter ' => ['route1 ' , 'route2 ' ]]);
261
283
$ router = $ this ->createRouter ($ collection );
0 commit comments