Skip to content

Commit 3a90d72

Browse files
paulbalandanpaulbalandan
authored
chore: fix errors on merging develop to 4.6 (#9332)
* re-bump dependencies * regenerate phpstan baseline
1 parent bd5945d commit 3a90d72

11 files changed

+27
-152
lines changed

‎composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
},
1919
"require-dev": {
2020
"codeigniter/phpstan-codeigniter": "^1.5.1",
21-
"fakerphp/faker": "^1.9",
22-
"kint-php/kint": "^5.0.4",
23-
"mikey179/vfsstream": "^1.6",
21+
"fakerphp/faker": "^1.24",
22+
"kint-php/kint": "^6.0",
23+
"mikey179/vfsstream": "^1.6.12",
2424
"nexusphp/tachycardia": "^2.0",
2525
"phpstan/extension-installer": "^1.4",
2626
"phpstan/phpstan": "^2.0",
2727
"phpstan/phpstan-strict-rules": "^2.0",
2828
"phpunit/phpcov": "^9.0.2 || ^10.0",
2929
"phpunit/phpunit": "^10.5.16 || ^11.2",
30-
"predis/predis": "^1.1 || ^2.0",
30+
"predis/predis": "^1.1 || ^2.3",
3131
"rector/rector": "2.0.3",
3232
"shipmonk/phpstan-baseline-per-identifier": "^2.0"
3333
},

‎utils/phpstan-baseline/argument.type.neon

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# total 75 errors
1+
# total 73 errors
22

33
parameters:
44
ignoreErrors:
@@ -307,16 +307,6 @@ parameters:
307307
count: 1
308308
path: ../../tests/system/Test/TestResponseTest.php
309309

310-
-
311-
message: '#^Parameter \#1 \$config of class CodeIgniter\\Validation\\Validation constructor expects Config\\Validation, stdClass given\.$#'
312-
count: 1
313-
path: ../../tests/system/Validation/CreditCardRulesTest.php
314-
315-
-
316-
message: '#^Parameter \#1 \$config of class CodeIgniter\\Validation\\Validation constructor expects Config\\Validation, stdClass given\.$#'
317-
count: 1
318-
path: ../../tests/system/Validation/FileRulesTest.php
319-
320310
-
321311
message: '#^Parameter \#1 \$config of class CodeIgniter\\Validation\\Validation constructor expects Config\\Validation, stdClass given\.$#'
322312
count: 1

‎utils/phpstan-baseline/assign.propertyType.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
path: ../../system/Controller.php
99

1010
-
11-
message: '#^Property class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:\$format \(''html''\|''json''\|''xml''\|null\) does not accept ''txt''\.$#'
11+
message: '#^Property class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:\$format \(''html''\|''json''\|''xml''\|null\) does not accept ''txt''\.$#'
1212
count: 1
1313
path: ../../tests/system/API/ResponseTraitTest.php
1414

‎utils/phpstan-baseline/booleanNot.exprNotBoolean.neon

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# total 13 errors
1+
# total 12 errors
22

33
parameters:
44
ignoreErrors:
@@ -37,11 +37,6 @@ parameters:
3737
count: 1
3838
path: ../../system/Test/CIUnitTestCase.php
3939

40-
-
41-
message: '#^Only booleans are allowed in a negated boolean, array\|null given\.$#'
42-
count: 6
43-
path: ../../system/Validation/FileRules.php
44-
4540
-
4641
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
4742
count: 1

‎utils/phpstan-baseline/codeigniter.superglobalAccessAssign.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ parameters:
244244

245245
-
246246
message: '#^Assigning ''GET'' directly on offset ''REQUEST_METHOD'' of \$_SERVER is discouraged\.$#'
247-
count: 36
247+
count: 38
248248
path: ../../tests/system/Filters/FiltersTest.php
249249

250250
-

‎utils/phpstan-baseline/method.childReturnType.neon

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# total 43 errors
1+
# total 39 errors
22

33
parameters:
44
ignoreErrors:
@@ -127,26 +127,6 @@ parameters:
127127
count: 1
128128
path: ../../system/HTTP/OutgoingRequest.php
129129

130-
-
131-
message: '#^Return type \(CodeIgniter\\I18n\\Time\) of method CodeIgniter\\I18n\\Time\:\:setTimestamp\(\) should be covariant with return type \(static\(DateTimeImmutable\)\) of method DateTimeImmutable\:\:setTimestamp\(\)$#'
132-
count: 1
133-
path: ../../system/I18n/Time.php
134-
135-
-
136-
message: '#^Return type \(CodeIgniter\\I18n\\Time\) of method CodeIgniter\\I18n\\Time\:\:setTimezone\(\) should be covariant with return type \(static\(DateTimeImmutable\)\) of method DateTimeImmutable\:\:setTimezone\(\)$#'
137-
count: 1
138-
path: ../../system/I18n/Time.php
139-
140-
-
141-
message: '#^Return type \(CodeIgniter\\I18n\\TimeLegacy\) of method CodeIgniter\\I18n\\TimeLegacy\:\:setTimestamp\(\) should be covariant with return type \(static\(DateTime\)\) of method DateTime\:\:setTimestamp\(\)$#'
142-
count: 1
143-
path: ../../system/I18n/TimeLegacy.php
144-
145-
-
146-
message: '#^Return type \(CodeIgniter\\I18n\\TimeLegacy\) of method CodeIgniter\\I18n\\TimeLegacy\:\:setTimezone\(\) should be covariant with return type \(static\(DateTime\)\) of method DateTime\:\:setTimezone\(\)$#'
147-
count: 1
148-
path: ../../system/I18n/TimeLegacy.php
149-
150130
-
151131
message: '#^Return type \(CodeIgniter\\Images\\Handlers\\BaseHandler\) of method CodeIgniter\\Images\\Handlers\\BaseHandler\:\:fit\(\) should be covariant with return type \(\$this\(CodeIgniter\\Images\\ImageHandlerInterface\)\) of method CodeIgniter\\Images\\ImageHandlerInterface\:\:fit\(\)$#'
152132
count: 1

‎utils/phpstan-baseline/method.notFound.neon

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# total 47 errors
1+
# total 41 errors
22

33
parameters:
44
ignoreErrors:
@@ -17,36 +17,6 @@ parameters:
1717
count: 2
1818
path: ../../system/Debug/Toolbar/Collectors/Views.php
1919

20-
-
21-
message: '#^Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface\:\:getDefaultNamespace\(\)\.$#'
22-
count: 2
23-
path: ../../system/Router/Router.php
24-
25-
-
26-
message: '#^Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface\:\:getFiltersForRoute\(\)\.$#'
27-
count: 1
28-
path: ../../system/Router/Router.php
29-
30-
-
31-
message: '#^Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface\:\:getRegisteredControllers\(\)\.$#'
32-
count: 1
33-
path: ../../system/Router/Router.php
34-
35-
-
36-
message: '#^Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface\:\:getRoutesOptions\(\)\.$#'
37-
count: 1
38-
path: ../../system/Router/Router.php
39-
40-
-
41-
message: '#^Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface\:\:isFiltered\(\)\.$#'
42-
count: 1
43-
path: ../../system/Router/Router.php
44-
45-
-
46-
message: '#^Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface\:\:setHTTPVerb\(\)\.$#'
47-
count: 1
48-
path: ../../system/Router/Router.php
49-
5020
-
5121
message: '#^Call to an undefined method CodeIgniter\\Database\\ConnectionInterface\:\:tableExists\(\)\.$#'
5222
count: 1

‎utils/phpstan-baseline/missingType.iterableValue.neon

Lines changed: 7 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# total 1686 errors
1+
# total 1673 errors
22

33
parameters:
44
ignoreErrors:
@@ -532,16 +532,6 @@ parameters:
532532
count: 1
533533
path: ../../system/Commands/Translation/LocalizationFinder.php
534534

535-
-
536-
message: '#^Method CodeIgniter\\Commands\\Utilities\\FilterCheck\:\:addRequiredFilters\(\) has parameter \$filters with no value type specified in iterable type array\.$#'
537-
count: 1
538-
path: ../../system/Commands/Utilities/FilterCheck.php
539-
540-
-
541-
message: '#^Method CodeIgniter\\Commands\\Utilities\\FilterCheck\:\:addRequiredFilters\(\) return type has no value type specified in iterable type array\.$#'
542-
count: 1
543-
path: ../../system/Commands/Utilities/FilterCheck.php
544-
545535
-
546536
message: '#^Method CodeIgniter\\Commands\\Utilities\\Namespaces\:\:outputAllNamespaces\(\) has parameter \$params with no value type specified in iterable type array\.$#'
547537
count: 1
@@ -1352,11 +1342,6 @@ parameters:
13521342
count: 1
13531343
path: ../../system/Database/BaseConnection.php
13541344

1355-
-
1356-
message: '#^Property CodeIgniter\\Database\\BaseConnection\:\:\$aliasedTables type has no value type specified in iterable type array\.$#'
1357-
count: 1
1358-
path: ../../system/Database/BaseConnection.php
1359-
13601345
-
13611346
message: '#^Property CodeIgniter\\Database\\BaseConnection\:\:\$dataCache type has no value type specified in iterable type array\.$#'
13621347
count: 1
@@ -3107,21 +3092,6 @@ parameters:
31073092
count: 1
31083093
path: ../../system/Filters/Filters.php
31093094

3110-
-
3111-
message: '#^Method CodeIgniter\\Filters\\Filters\:\:enableFilters\(\) has parameter \$names with no value type specified in iterable type array\.$#'
3112-
count: 1
3113-
path: ../../system/Filters/Filters.php
3114-
3115-
-
3116-
message: '#^Method CodeIgniter\\Filters\\Filters\:\:getFilters\(\) return type has no value type specified in iterable type array\.$#'
3117-
count: 1
3118-
path: ../../system/Filters/Filters.php
3119-
3120-
-
3121-
message: '#^Method CodeIgniter\\Filters\\Filters\:\:getFiltersClass\(\) return type has no value type specified in iterable type array\.$#'
3122-
count: 1
3123-
path: ../../system/Filters/Filters.php
3124-
31253095
-
31263096
message: '#^Method CodeIgniter\\Filters\\Filters\:\:getRequiredFilters\(\) return type has no value type specified in iterable type array\.$#'
31273097
count: 1
@@ -3132,36 +3102,11 @@ parameters:
31323102
count: 1
31333103
path: ../../system/Filters/Filters.php
31343104

3135-
-
3136-
message: '#^Method CodeIgniter\\Filters\\Filters\:\:registerArguments\(\) has parameter \$arguments with no value type specified in iterable type array\.$#'
3137-
count: 1
3138-
path: ../../system/Filters/Filters.php
3139-
3140-
-
3141-
message: '#^Method CodeIgniter\\Filters\\Filters\:\:runAfter\(\) has parameter \$filterClasses with no value type specified in iterable type array\.$#'
3142-
count: 1
3143-
path: ../../system/Filters/Filters.php
3144-
3145-
-
3146-
message: '#^Method CodeIgniter\\Filters\\Filters\:\:runBefore\(\) has parameter \$filterClasses with no value type specified in iterable type array\.$#'
3147-
count: 1
3148-
path: ../../system/Filters/Filters.php
3149-
31503105
-
31513106
message: '#^Method CodeIgniter\\Filters\\Filters\:\:setToolbarToLast\(\) return type has no value type specified in iterable type array\.$#'
31523107
count: 1
31533108
path: ../../system/Filters/Filters.php
31543109

3155-
-
3156-
message: '#^Property CodeIgniter\\Filters\\Filters\:\:\$filters type has no value type specified in iterable type array\.$#'
3157-
count: 1
3158-
path: ../../system/Filters/Filters.php
3159-
3160-
-
3161-
message: '#^Property CodeIgniter\\Filters\\Filters\:\:\$filtersClass type has no value type specified in iterable type array\.$#'
3162-
count: 1
3163-
path: ../../system/Filters/Filters.php
3164-
31653110
-
31663111
message: '#^Method CodeIgniter\\Filters\\ForceHTTPS\:\:after\(\) has parameter \$arguments with no value type specified in iterable type array\.$#'
31673112
count: 1
@@ -6653,32 +6598,32 @@ parameters:
66536598
path: ../../tests/system/API/ResponseTraitTest.php
66546599

66556600
-
6656-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:fail\(\) has parameter \$messages with no value type specified in iterable type array\.$#'
6601+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:fail\(\) has parameter \$messages with no value type specified in iterable type array\.$#'
66576602
count: 1
66586603
path: ../../tests/system/API/ResponseTraitTest.php
66596604

66606605
-
6661-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:format\(\) has parameter \$data with no value type specified in iterable type array\.$#'
6606+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:format\(\) has parameter \$data with no value type specified in iterable type array\.$#'
66626607
count: 1
66636608
path: ../../tests/system/API/ResponseTraitTest.php
66646609

66656610
-
6666-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:respond\(\) has parameter \$data with no value type specified in iterable type array\.$#'
6611+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:respond\(\) has parameter \$data with no value type specified in iterable type array\.$#'
66676612
count: 1
66686613
path: ../../tests/system/API/ResponseTraitTest.php
66696614

66706615
-
6671-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:respondCreated\(\) has parameter \$data with no value type specified in iterable type array\.$#'
6616+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:respondCreated\(\) has parameter \$data with no value type specified in iterable type array\.$#'
66726617
count: 1
66736618
path: ../../tests/system/API/ResponseTraitTest.php
66746619

66756620
-
6676-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:respondDeleted\(\) has parameter \$data with no value type specified in iterable type array\.$#'
6621+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:respondDeleted\(\) has parameter \$data with no value type specified in iterable type array\.$#'
66776622
count: 1
66786623
path: ../../tests/system/API/ResponseTraitTest.php
66796624

66806625
-
6681-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:respondUpdated\(\) has parameter \$data with no value type specified in iterable type array\.$#'
6626+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:respondUpdated\(\) has parameter \$data with no value type specified in iterable type array\.$#'
66826627
count: 1
66836628
path: ../../tests/system/API/ResponseTraitTest.php
66846629

@@ -7867,16 +7812,6 @@ parameters:
78677812
count: 1
78687813
path: ../../tests/system/Throttle/ThrottleTest.php
78697814

7870-
-
7871-
message: '#^Method CodeIgniter\\Validation\\CreditCardRulesTest\:\:calculateLuhnChecksum\(\) has parameter \$digits with no value type specified in iterable type array\.$#'
7872-
count: 1
7873-
path: ../../tests/system/Validation/CreditCardRulesTest.php
7874-
7875-
-
7876-
message: '#^Method CodeIgniter\\Validation\\CreditCardRulesTest\:\:provideValidCCNumber\(\) return type has no value type specified in iterable type iterable\.$#'
7877-
count: 1
7878-
path: ../../tests/system/Validation/CreditCardRulesTest.php
7879-
78807815
-
78817816
message: '#^Property CodeIgniter\\Validation\\CreditCardRulesTest\:\:\$config type has no value type specified in iterable type array\.$#'
78827817
count: 1

‎utils/phpstan-baseline/missingType.parameter.neon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ parameters:
158158
path: ../../tests/system/API/ResponseTraitTest.php
159159

160160
-
161-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:__construct\(\) has parameter \$request with no type specified\.$#'
161+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:__construct\(\) has parameter \$request with no type specified\.$#'
162162
count: 1
163163
path: ../../tests/system/API/ResponseTraitTest.php
164164

165165
-
166-
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:__construct\(\) has parameter \$response with no type specified\.$#'
166+
message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:__construct\(\) has parameter \$response with no type specified\.$#'
167167
count: 1
168168
path: ../../tests/system/API/ResponseTraitTest.php
169169

‎utils/phpstan-baseline/missingType.property.neon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ parameters:
188188
path: ../../tests/system/API/ResponseTraitTest.php
189189

190190
-
191-
message: '#^Property class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:\$request has no type specified\.$#'
191+
message: '#^Property class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:\$request has no type specified\.$#'
192192
count: 1
193193
path: ../../tests/system/API/ResponseTraitTest.php
194194

195195
-
196-
message: '#^Property class@anonymous/tests/system/API/ResponseTraitTest\.php\:639\:\:\$response has no type specified\.$#'
196+
message: '#^Property class@anonymous/tests/system/API/ResponseTraitTest\.php\:621\:\:\$response has no type specified\.$#'
197197
count: 1
198198
path: ../../tests/system/API/ResponseTraitTest.php
199199

0 commit comments

Comments
 (0)