Commit 79d247b
committed
refactor: add declare(strict_types=1) to all source files and fix type safety
Add strict_types declaration to all 34 PHP files under src/Klein/.
Fix all resulting TypeError failures and resolve all PHPStan errors.
strict_types — added to 33 files (Route.php already had it):
AbstractResponse, AbstractRouteFactory, App, DataCollection,
HeaderDataCollection, ResponseCookieDataCollection, RouteCollection,
ServerDataCollection, all Exceptions/*, HttpMethod, HttpStatus,
Klein, Request, Response, ResponseCookie, RouteFactory,
RouteRegexCompiler, ServiceProvider, IndexInterface,
RadixRouteIndex, Validator
Type coercion fixes exposed by strict_types:
- HeaderDataCollection: cast array key to string before explode()
- ResponseCookieDataCollection: use $value->getName() as key
instead of relying on implicit int-to-string coercion
- ServiceProvider::markdown(): cast $arg to string before
htmlentities()
- ServiceProvider::validateParam(): explicitly cast mixed param()
return to ?string before passing to validate()
PHPStan fixes (0 errors remaining):
- HeaderDataCollection: add @param array type hint
- Klein::filterMatchingRoutes(): narrow $requestMethod to string
- Klein catch-all filter: separate setRouteMatchedAgainstUri()
from boolean expression (was "always true" right-hand side)
- Route::$regex: remove unused nullable type
- Route::$regexMatchingParams/$routeMatched: change @type to @var
for PHPStan, add default value
- Route: remove unnecessary ?? on non-nullable $namespace
- Route::validateMethod(): rewrite using HttpMethod::tryFrom()
instead of duplicated 9-arm match blocks; validate array
elements with is_string() guard (annotated @var mixed)
- RouteRegexCompiler::getPathFor(): self:: instead of static::
for private constant
- RadixRouteIndex: add PHPDoc types for constructor params and
property; handle preg_split false return; suppress recursive
array reference and loop-inference edge cases
Code quality (incidental, already in working tree):
- Rename snake_case properties to camelCase: protocol_version,
is_name_prepared, number_of_skips, route_factory,
error_callbacks, http_error_callbacks, after_filter_callbacks,
output_buffer_level, http_messages
- Klein: use InvalidCallableException instead of raw
InvalidArgumentException for uncallable callbacks
- InvalidCallableException: add constructor with message prefix,
use proper imports
- RouteFactory/DataCollection: remove stray blank lines after
opening brace
- Klein: add visibility to class constants
- Klein::with(): require_once instead of require
- Request: expand @param $files to full array shape
- MockRequestFactory: add parameter types and return type
- RequestTest: use realistic associative arrays and file
structures in test data
Tests: 298 passed, 790 assertions. PHPStan: 0 errors.1 parent 5f626b3 commit 79d247b
38 files changed
Lines changed: 293 additions & 159 deletions
File tree
- src/Klein
- DataCollection
- Exceptions
- Routes
- Tree
- tests/Matecat/Tests/Klein
- DataCollection
- Mocks
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| 14 | + | |
| 15 | + | |
13 | 16 | | |
14 | 17 | | |
15 | 18 | | |
| |||
22 | 25 | | |
23 | 26 | | |
24 | 27 | | |
25 | | - | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
| |||
32 | 34 | | |
33 | 35 | | |
34 | 36 | | |
35 | | - | |
| 37 | + | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| |||
125 | 127 | | |
126 | 128 | | |
127 | 129 | | |
128 | | - | |
| 130 | + | |
129 | 131 | | |
130 | 132 | | |
131 | 133 | | |
132 | 134 | | |
133 | | - | |
| 135 | + | |
134 | 136 | | |
135 | 137 | | |
136 | 138 | | |
| |||
308 | 310 | | |
309 | 311 | | |
310 | 312 | | |
311 | | - | |
| 313 | + | |
312 | 314 | | |
313 | 315 | | |
314 | 316 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
133 | 135 | | |
134 | 136 | | |
135 | 137 | | |
136 | | - | |
137 | | - | |
138 | | - | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
139 | 141 | | |
140 | 142 | | |
141 | 143 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
| |||
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
23 | | - | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
| |||
31 | 33 | | |
32 | 34 | | |
33 | 35 | | |
34 | | - | |
| 36 | + | |
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
39 | | - | |
40 | | - | |
| 41 | + | |
| 42 | + | |
41 | 43 | | |
42 | 44 | | |
43 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
| |||
23 | 25 | | |
24 | 26 | | |
25 | 27 | | |
26 | | - | |
| 28 | + | |
27 | 29 | | |
28 | | - | |
| 30 | + | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
| |||
86 | 88 | | |
87 | 89 | | |
88 | 90 | | |
89 | | - | |
| 91 | + | |
90 | 92 | | |
91 | 93 | | |
92 | 94 | | |
| |||
131 | 133 | | |
132 | 134 | | |
133 | 135 | | |
134 | | - | |
| 136 | + | |
135 | 137 | | |
136 | 138 | | |
137 | 139 | | |
| |||
154 | 156 | | |
155 | 157 | | |
156 | 158 | | |
157 | | - | |
| 159 | + | |
158 | 160 | | |
159 | 161 | | |
160 | 162 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
58 | 60 | | |
59 | 61 | | |
60 | 62 | | |
61 | | - | |
| 63 | + | |
62 | 64 | | |
63 | 65 | | |
64 | 66 | | |
| |||
72 | 74 | | |
73 | 75 | | |
74 | 76 | | |
75 | | - | |
| 77 | + | |
76 | 78 | | |
77 | 79 | | |
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
81 | | - | |
| 83 | + | |
82 | 84 | | |
83 | 85 | | |
84 | 86 | | |
85 | | - | |
| 87 | + | |
86 | 88 | | |
87 | | - | |
| 89 | + | |
88 | 90 | | |
89 | 91 | | |
90 | 92 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
| |||
0 commit comments