Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/test-psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,7 @@ jobs:
restore-keys: ${{ runner.os }}-psalm-

- name: Install dependencies
run: |
if [ -f composer.lock ]; then
composer install --no-progress
else
composer update --no-progress
fi
run: composer update --ansi --no-interaction

- name: Run Psalm analysis
run: utils/vendor/bin/psalm
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"CodeIgniter\\ComposerScripts::postUpdate"
],
"post-autoload-dump": [
"@composer update --working-dir=utils --ignore-platform-req=php"
"@composer update --ansi --working-dir=utils"
],
"analyze": [
"Composer\\Config::disableProcessTimeout",
Expand Down
File renamed without changes.
98 changes: 64 additions & 34 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
<files psalm-version="6.12.1@e71404b0465be25cf7f8a631b298c01c5ddd864f">
<file src="app/Config/View.php">
<UndefinedDocblockClass>
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
Expand All @@ -10,40 +10,13 @@
<code><![CDATA[public $plugins = [];]]></code>
</UndefinedDocblockClass>
</file>
<file src="system/Cache/Handlers/MemcachedHandler.php">
<UndefinedClass>
<code><![CDATA[Memcache]]></code>
<code><![CDATA[Memcache]]></code>
<code><![CDATA[Memcache]]></code>
</UndefinedClass>
<UndefinedDocblockClass>
<code><![CDATA[$this->memcached]]></code>
<code><![CDATA[$this->memcached]]></code>
<code><![CDATA[$this->memcached]]></code>
<code><![CDATA[$this->memcached]]></code>
<code><![CDATA[$this->memcached]]></code>
<code><![CDATA[$this->memcached]]></code>
<code><![CDATA[Memcache|Memcached]]></code>
</UndefinedDocblockClass>
</file>
<file src="system/Commands/Utilities/Routes/ControllerMethodReader.php">
<DuplicateArrayKey>
<code><![CDATA[$routeWithoutController]]></code>
<code><![CDATA[$routeWithoutController]]></code>
</DuplicateArrayKey>
</file>
<file src="system/Config/View.php">
<UndefinedDocblockClass>
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
<code><![CDATA[array<string, parser_callable_string>]]></code>
</UndefinedDocblockClass>
</file>
<file src="system/Database/BasePreparedQuery.php">
<InaccessibleProperty>
<code><![CDATA[$this->db->transStatus]]></code>
</InaccessibleProperty>
</file>
<file src="system/Database/OCI8/Connection.php">
<UndefinedConstant>
<code><![CDATA[OCI_COMMIT_ON_SUCCESS]]></code>
Expand All @@ -53,6 +26,17 @@
<code><![CDATA[SQLT_CHR]]></code>
</UndefinedConstant>
</file>
<file src="system/Database/OCI8/PreparedQuery.php">
<UndefinedClass>
<code><![CDATA[$binaryData]]></code>
<code><![CDATA[OCILob]]></code>
</UndefinedClass>
<UndefinedConstant>
<code><![CDATA[OCI_B_BLOB]]></code>
<code><![CDATA[OCI_D_LOB]]></code>
<code><![CDATA[OCI_TEMP_BLOB]]></code>
</UndefinedConstant>
</file>
<file src="system/Debug/Toolbar/Views/toolbar.tpl.php">
<InaccessibleMethod>
<code><![CDATA[renderTimeline]]></code>
Expand Down Expand Up @@ -82,7 +66,6 @@
<MissingImmutableAnnotation>
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
</MissingImmutableAnnotation>
</file>
<file src="system/View/Parser.php">
Expand Down Expand Up @@ -112,11 +95,6 @@
<code><![CDATA[$this]]></code>
</InvalidScope>
</file>
<file src="tests/system/CLI/ConsoleTest.php">
<DuplicateArrayKey>
<code><![CDATA[$command]]></code>
</DuplicateArrayKey>
</file>
<file src="tests/system/CommonFunctionsTest.php">
<UndefinedClass>
<code><![CDATA[UnexsistenceClass]]></code>
Expand All @@ -140,12 +118,64 @@
<EmptyArrayAccess>
<code><![CDATA[$current[$key]]]></code>
</EmptyArrayAccess>
<InaccessibleProperty>
<code><![CDATA[$entity->attributes]]></code>
<code><![CDATA[$entity->casts]]></code>
<code><![CDATA[$entity->casts]]></code>
<code><![CDATA[$entity->casts]]></code>
<code><![CDATA[$entity->casts]]></code>
</InaccessibleProperty>
</file>
<file src="tests/system/HTTP/RedirectResponseTest.php">
<EmptyArrayAccess>
<code><![CDATA[$_SESSION['_ci_old_input']]]></code>
</EmptyArrayAccess>
</file>
<file src="tests/system/Models/InsertModelTest.php">
<InaccessibleProperty>
<code><![CDATA[$entity->country]]></code>
<code><![CDATA[$entity->created_at]]></code>
<code><![CDATA[$entity->deleted]]></code>
<code><![CDATA[$entity->email]]></code>
<code><![CDATA[$entity->name]]></code>
<code><![CDATA[$entityTwo->country]]></code>
<code><![CDATA[$entityTwo->created_at]]></code>
<code><![CDATA[$entityTwo->deleted]]></code>
<code><![CDATA[$entityTwo->email]]></code>
<code><![CDATA[$entityTwo->name]]></code>
</InaccessibleProperty>
</file>
<file src="tests/system/Models/SaveModelTest.php">
<InaccessibleProperty>
<code><![CDATA[$entity->country]]></code>
<code><![CDATA[$entity->created_at]]></code>
<code><![CDATA[$entity->created_at]]></code>
<code><![CDATA[$entity->deleted]]></code>
<code><![CDATA[$entity->email]]></code>
<code><![CDATA[$entity->name]]></code>
<code><![CDATA[$entity->name]]></code>
<code><![CDATA[$entity->name]]></code>
<code><![CDATA[$entity->name]]></code>
</InaccessibleProperty>
</file>
<file src="tests/system/Models/UpdateModelTest.php">
<InaccessibleProperty>
<code><![CDATA[$entity->country]]></code>
<code><![CDATA[$entity->deleted]]></code>
<code><![CDATA[$entity->email]]></code>
<code><![CDATA[$entity->id]]></code>
<code><![CDATA[$entity->name]]></code>
<code><![CDATA[$entity1->country]]></code>
<code><![CDATA[$entity1->country]]></code>
<code><![CDATA[$entity1->deleted]]></code>
<code><![CDATA[$entity1->id]]></code>
<code><![CDATA[$entity1->name]]></code>
<code><![CDATA[$entity2->country]]></code>
<code><![CDATA[$entity2->deleted]]></code>
<code><![CDATA[$entity2->id]]></code>
<code><![CDATA[$entity2->name]]></code>
</InaccessibleProperty>
</file>
<file src="tests/system/Test/ControllerTestTraitTest.php">
<UndefinedClass>
<code><![CDATA[NeverHeardOfIt]]></code>
Expand Down
3 changes: 2 additions & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
autoloader="psalm_autoload.php"
autoloader="psalm-autoload.php"
cacheDirectory="build/psalm/"
errorBaseline="psalm-baseline.xml"
ensureOverrideAttribute="false"
findUnusedBaselineEntry="false"
findUnusedCode="false"
>
Expand Down
2 changes: 1 addition & 1 deletion utils/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"friendsofphp/php-cs-fixer": "^3.76",
"nexusphp/cs-config": "^3.26",
"phpmetrics/phpmetrics": "^2.8 || ^3.0rc6",
"vimeo/psalm": "^5.0"
"vimeo/psalm": "^6.12"
},
"autoload": {
"psr-4": {
Expand Down
Loading