diff --git a/.github/workflows/test-psalm.yml b/.github/workflows/test-psalm.yml index ea948ab3bc65..d24c2916df5e 100644 --- a/.github/workflows/test-psalm.yml +++ b/.github/workflows/test-psalm.yml @@ -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 diff --git a/composer.json b/composer.json index 350c69184c18..4e7ea70e622c 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/psalm_autoload.php b/psalm-autoload.php similarity index 100% rename from psalm_autoload.php rename to psalm-autoload.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 53d1b6ce876a..778bdd654739 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + |parser_callable_string|parser_callable>]]> @@ -10,28 +10,6 @@ - - - - - - - - memcached]]> - memcached]]> - memcached]]> - memcached]]> - memcached]]> - memcached]]> - - - - - - - - - |parser_callable_string|parser_callable>]]> @@ -39,11 +17,6 @@ ]]> - - - db->transStatus]]> - - @@ -53,6 +26,17 @@ + + + + + + + + + + + @@ -82,7 +66,6 @@ - @@ -112,11 +95,6 @@ - - - - - @@ -140,12 +118,64 @@ + + attributes]]> + casts]]> + casts]]> + casts]]> + casts]]> + + + + country]]> + created_at]]> + deleted]]> + email]]> + name]]> + country]]> + created_at]]> + deleted]]> + email]]> + name]]> + + + + + country]]> + created_at]]> + created_at]]> + deleted]]> + email]]> + name]]> + name]]> + name]]> + name]]> + + + + + country]]> + deleted]]> + email]]> + id]]> + name]]> + country]]> + country]]> + deleted]]> + id]]> + name]]> + country]]> + deleted]]> + id]]> + name]]> + + diff --git a/psalm.xml b/psalm.xml index 45242620028f..d6033313a621 100644 --- a/psalm.xml +++ b/psalm.xml @@ -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" > diff --git a/utils/composer.json b/utils/composer.json index 81445f4c704b..4c9ae87b3021 100644 --- a/utils/composer.json +++ b/utils/composer.json @@ -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": {