diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index af1b85e..3812812 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -18,8 +18,13 @@ jobs: with: php-version: "8.3" - - name: Install composer dependencies + - name: Install composer dependencies (date-time) uses: ramsey/composer-install@v3 + - name: Install composer dependencies (psalm) + uses: ramsey/composer-install@v3 + with: + working-directory: "tools/psalm" + - name: Run Psalm - run: vendor/bin/psalm --show-info=false --find-unused-psalm-suppress --no-progress + run: tools/psalm/vendor/bin/psalm --show-info=false --no-progress --config=tools/psalm/psalm.xml diff --git a/.gitignore b/.gitignore index 9fad048..1ba7872 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,7 @@ /tools/rector/* !/tools/rector/composer.json !/tools/rector/rector.php +!/tools/psalm +/tools/psalm/* +!/tools/psalm/composer.json +!/tools/psalm/psalm.xml diff --git a/README.md b/README.md index 6979852..c23ffa5 100644 --- a/README.md +++ b/README.md @@ -219,10 +219,16 @@ vendor/bin/phpunit ### Static analysis +Install Psalm in its own folder: + +```sh +composer install --working-dir=tools/psalm +``` + Run Psalm static analysis: ```sh -vendor/bin/psalm --no-cache +tools/psalm/vendor/bin/psalm --no-cache --config=tools/psalm/psalm.xml ``` ### Coding Style diff --git a/composer.json b/composer.json index 6283b08..c5897c3 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,6 @@ "require-dev": { "phpunit/phpunit": "^10.5", "php-coveralls/php-coveralls": "^2.2", - "vimeo/psalm": "5.25.0", "guzzlehttp/guzzle": "^7.0" }, "suggest": { diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json new file mode 100644 index 0000000..85d784e --- /dev/null +++ b/tools/psalm/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "vimeo/psalm": "^5.26" + } +} diff --git a/psalm.xml b/tools/psalm/psalm.xml similarity index 93% rename from psalm.xml rename to tools/psalm/psalm.xml index f19428c..0fe9541 100644 --- a/psalm.xml +++ b/tools/psalm/psalm.xml @@ -1,7 +1,7 @@