From f5500e0271e10bb8c8ac4256d167ccae550b1535 Mon Sep 17 00:00:00 2001 From: smiley Date: Mon, 22 Apr 2024 00:22:11 +0200 Subject: [PATCH 1/3] Update workflow runs (cherry picked from commit 9c9dc46f13d36e75585a4884641cd88846faa102) --- .github/workflows/backwards-compatibility.yml | 2 +- .github/workflows/benchmarks.yml | 5 +++-- .github/workflows/coding-standards.yml | 4 ++-- .github/workflows/composer-json-lint.yml | 4 ++-- .github/workflows/phpunit.yml | 4 ++-- .github/workflows/static-analysis.yml | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/backwards-compatibility.yml b/.github/workflows/backwards-compatibility.yml index 6f9ffa3..dea5a3c 100644 --- a/.github/workflows/backwards-compatibility.yml +++ b/.github/workflows/backwards-compatibility.yml @@ -11,7 +11,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 0 diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 206357b..08a7302 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -17,12 +17,13 @@ jobs: php-version: - "8.1" - "8.2" + - "8.3" operating-system: - "ubuntu-latest" steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -33,7 +34,7 @@ jobs: tools: composer:v2, cs2pr - name: "Install dependencies" - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 1531faa..402d6bf 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -21,7 +21,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -32,7 +32,7 @@ jobs: tools: composer:v2, cs2pr - name: "Install dependencies" - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" diff --git a/.github/workflows/composer-json-lint.yml b/.github/workflows/composer-json-lint.yml index fdd414c..5429f87 100644 --- a/.github/workflows/composer-json-lint.yml +++ b/.github/workflows/composer-json-lint.yml @@ -21,7 +21,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -32,7 +32,7 @@ jobs: tools: composer:v2, composer-normalize, composer-require-checker, composer-unused - name: "Install dependencies" - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 689adf1..a4bb08d 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -36,7 +36,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -51,7 +51,7 @@ jobs: run: "composer config --no-interaction -- minimum-stability dev" - name: "Install dependencies" - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 1265e36..fef0ae9 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -21,7 +21,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -32,7 +32,7 @@ jobs: tools: composer:v2, cs2pr - name: "Install dependencies" - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" From 9358186852db3385be84610024b7e7736464c8ac Mon Sep 17 00:00:00 2001 From: smiley Date: Mon, 22 Apr 2024 00:15:19 +0200 Subject: [PATCH 2/3] Move PHPUnit cache dir to .build (cherry picked from commit be0b9182eba59d75e78cfde919ec37de27e79bd8) --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ea11052..16da0ab 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,7 +13,7 @@ displayDetailsOnTestsThatTriggerNotices="true" displayDetailsOnTestsThatTriggerWarnings="true" executionOrder="random" - cacheDirectory=".phpunit.cache" + cacheDirectory=".build/.phpunit.cache" > From 3245d4c20a2009028f7c8ba02e5359aa8ca4a94f Mon Sep 17 00:00:00 2001 From: smiley Date: Mon, 22 Apr 2024 00:40:29 +0200 Subject: [PATCH 3/3] Cleanup .gitignore --- .gitignore | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd89d72..204b1f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ -/vendor/ +.build/ .idea/ +.phpbench/ +vendor/ +phpcs.xml +phpstan.neon phpunit.xml -/*.cache -/.phpbench