Skip to content

Commit 8d75426

Browse files
committed
chore: bump to psalm v6.12
1 parent 4bf608d commit 8d75426

File tree

5 files changed

+69
-22
lines changed

5 files changed

+69
-22
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"CodeIgniter\\ComposerScripts::postUpdate"
9090
],
9191
"post-autoload-dump": [
92-
"@composer update --working-dir=utils --ignore-platform-req=php"
92+
"@composer update --ansi --working-dir=utils"
9393
],
9494
"analyze": [
9595
"Composer\\Config::disableProcessTimeout",
File renamed without changes.

psalm-baseline.xml

Lines changed: 64 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
2+
<files psalm-version="6.12.1@e71404b0465be25cf7f8a631b298c01c5ddd864f">
33
<file src="app/Config/View.php">
44
<UndefinedDocblockClass>
55
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
@@ -26,24 +26,13 @@
2626
<code><![CDATA[Memcache|Memcached]]></code>
2727
</UndefinedDocblockClass>
2828
</file>
29-
<file src="system/Commands/Utilities/Routes/ControllerMethodReader.php">
30-
<DuplicateArrayKey>
31-
<code><![CDATA[$routeWithoutController]]></code>
32-
<code><![CDATA[$routeWithoutController]]></code>
33-
</DuplicateArrayKey>
34-
</file>
3529
<file src="system/Config/View.php">
3630
<UndefinedDocblockClass>
3731
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
3832
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
3933
<code><![CDATA[array<string, parser_callable_string>]]></code>
4034
</UndefinedDocblockClass>
4135
</file>
42-
<file src="system/Database/BasePreparedQuery.php">
43-
<InaccessibleProperty>
44-
<code><![CDATA[$this->db->transStatus]]></code>
45-
</InaccessibleProperty>
46-
</file>
4736
<file src="system/Database/OCI8/Connection.php">
4837
<UndefinedConstant>
4938
<code><![CDATA[OCI_COMMIT_ON_SUCCESS]]></code>
@@ -53,6 +42,17 @@
5342
<code><![CDATA[SQLT_CHR]]></code>
5443
</UndefinedConstant>
5544
</file>
45+
<file src="system/Database/OCI8/PreparedQuery.php">
46+
<UndefinedClass>
47+
<code><![CDATA[$binaryData]]></code>
48+
<code><![CDATA[OCILob]]></code>
49+
</UndefinedClass>
50+
<UndefinedConstant>
51+
<code><![CDATA[OCI_B_BLOB]]></code>
52+
<code><![CDATA[OCI_D_LOB]]></code>
53+
<code><![CDATA[OCI_TEMP_BLOB]]></code>
54+
</UndefinedConstant>
55+
</file>
5656
<file src="system/Debug/Toolbar/Views/toolbar.tpl.php">
5757
<InaccessibleMethod>
5858
<code><![CDATA[renderTimeline]]></code>
@@ -82,7 +82,6 @@
8282
<MissingImmutableAnnotation>
8383
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
8484
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
85-
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
8685
</MissingImmutableAnnotation>
8786
</file>
8887
<file src="system/View/Parser.php">
@@ -112,11 +111,6 @@
112111
<code><![CDATA[$this]]></code>
113112
</InvalidScope>
114113
</file>
115-
<file src="tests/system/CLI/ConsoleTest.php">
116-
<DuplicateArrayKey>
117-
<code><![CDATA[$command]]></code>
118-
</DuplicateArrayKey>
119-
</file>
120114
<file src="tests/system/CommonFunctionsTest.php">
121115
<UndefinedClass>
122116
<code><![CDATA[UnexsistenceClass]]></code>
@@ -140,12 +134,64 @@
140134
<EmptyArrayAccess>
141135
<code><![CDATA[$current[$key]]]></code>
142136
</EmptyArrayAccess>
137+
<InaccessibleProperty>
138+
<code><![CDATA[$entity->attributes]]></code>
139+
<code><![CDATA[$entity->casts]]></code>
140+
<code><![CDATA[$entity->casts]]></code>
141+
<code><![CDATA[$entity->casts]]></code>
142+
<code><![CDATA[$entity->casts]]></code>
143+
</InaccessibleProperty>
143144
</file>
144145
<file src="tests/system/HTTP/RedirectResponseTest.php">
145146
<EmptyArrayAccess>
146147
<code><![CDATA[$_SESSION['_ci_old_input']]]></code>
147148
</EmptyArrayAccess>
148149
</file>
150+
<file src="tests/system/Models/InsertModelTest.php">
151+
<InaccessibleProperty>
152+
<code><![CDATA[$entity->country]]></code>
153+
<code><![CDATA[$entity->created_at]]></code>
154+
<code><![CDATA[$entity->deleted]]></code>
155+
<code><![CDATA[$entity->email]]></code>
156+
<code><![CDATA[$entity->name]]></code>
157+
<code><![CDATA[$entityTwo->country]]></code>
158+
<code><![CDATA[$entityTwo->created_at]]></code>
159+
<code><![CDATA[$entityTwo->deleted]]></code>
160+
<code><![CDATA[$entityTwo->email]]></code>
161+
<code><![CDATA[$entityTwo->name]]></code>
162+
</InaccessibleProperty>
163+
</file>
164+
<file src="tests/system/Models/SaveModelTest.php">
165+
<InaccessibleProperty>
166+
<code><![CDATA[$entity->country]]></code>
167+
<code><![CDATA[$entity->created_at]]></code>
168+
<code><![CDATA[$entity->created_at]]></code>
169+
<code><![CDATA[$entity->deleted]]></code>
170+
<code><![CDATA[$entity->email]]></code>
171+
<code><![CDATA[$entity->name]]></code>
172+
<code><![CDATA[$entity->name]]></code>
173+
<code><![CDATA[$entity->name]]></code>
174+
<code><![CDATA[$entity->name]]></code>
175+
</InaccessibleProperty>
176+
</file>
177+
<file src="tests/system/Models/UpdateModelTest.php">
178+
<InaccessibleProperty>
179+
<code><![CDATA[$entity->country]]></code>
180+
<code><![CDATA[$entity->deleted]]></code>
181+
<code><![CDATA[$entity->email]]></code>
182+
<code><![CDATA[$entity->id]]></code>
183+
<code><![CDATA[$entity->name]]></code>
184+
<code><![CDATA[$entity1->country]]></code>
185+
<code><![CDATA[$entity1->country]]></code>
186+
<code><![CDATA[$entity1->deleted]]></code>
187+
<code><![CDATA[$entity1->id]]></code>
188+
<code><![CDATA[$entity1->name]]></code>
189+
<code><![CDATA[$entity2->country]]></code>
190+
<code><![CDATA[$entity2->deleted]]></code>
191+
<code><![CDATA[$entity2->id]]></code>
192+
<code><![CDATA[$entity2->name]]></code>
193+
</InaccessibleProperty>
194+
</file>
149195
<file src="tests/system/Test/ControllerTestTraitTest.php">
150196
<UndefinedClass>
151197
<code><![CDATA[NeverHeardOfIt]]></code>

psalm.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xmlns="https://getpsalm.org/schema/config"
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
8-
autoloader="psalm_autoload.php"
8+
autoloader="psalm-autoload.php"
99
cacheDirectory="build/psalm/"
1010
errorBaseline="psalm-baseline.xml"
11-
findUnusedBaselineEntry="false"
11+
ensureOverrideAttribute="false"
12+
findUnusedBaselineEntry="true"
1213
findUnusedCode="false"
1314
>
1415
<projectFiles>

utils/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"friendsofphp/php-cs-fixer": "^3.76",
77
"nexusphp/cs-config": "^3.26",
88
"phpmetrics/phpmetrics": "^2.8 || ^3.0rc6",
9-
"vimeo/psalm": "^5.0"
9+
"vimeo/psalm": "^6.12"
1010
},
1111
"autoload": {
1212
"psr-4": {

0 commit comments

Comments
 (0)