diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 7bc6baa7..a1bbf1a6 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -17,14 +17,18 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate - - name: Cache Composer packages + - name: Get Composer Cache Directory id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Cache Composer packages uses: actions/cache@v2 with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-php- + ${{ runner.os }}-composer- - name: Install dependencies if: steps.composer-cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index fe76aa5e..93c3f94a 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -14,14 +14,18 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Cache Composer packages + - name: Get Composer Cache Directory id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Cache Composer packages uses: actions/cache@v2 with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-php- + ${{ runner.os }}-composer- - name: Install dependencies if: steps.composer-cache.outputs.cache-hit != 'true' diff --git a/composer.json b/composer.json index 4a19c9d7..41008e5a 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ } }, "require-dev": { - "vimeo/psalm": "^4.3", + "vimeo/psalm": "^4.6", "squizlabs/php_codesniffer": "^3.5", "phpunit/phpunit": "^9.5" } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 10081529..045646be 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -704,9 +704,8 @@ - + $autoIncrementOffsets - $columns