From 53735e08efd9b8f6a1444a234eba0431de95f5db Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Thu, 20 Nov 2025 21:52:07 +0000 Subject: [PATCH 1/3] Feature | PHP 8.5 Support --- .github/workflows/php-cs-fixer.yml | 30 +++++++++++++++++++++--------- .github/workflows/phpstan.yml | 2 +- .github/workflows/tests.yml | 2 +- composer.json | 6 +++--- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index c5186ae..6e6c39f 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -11,18 +11,30 @@ on: permissions: contents: write +concurrency: + group: ${{ github.head_ref || github.ref || github.run_id }}_php_cs_fixer + cancel-in-progress: true + jobs: - php-cs-fixer: + lint: runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Run PHP CS Fixer - uses: docker://oskarstark/php-cs-fixer-ga + - uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 with: - args: --config=.php-cs-fixer.dist.php --allow-risky=yes - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + php-version: '8.2' + + - name: Install Dependencies + run: | + composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist + + - name: Run PHP CS Fixer + run: ./vendor/bin/php-cs-fixer fix --allow-risky=yes + + - name: Commit Changes + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: 🪄 Code Style Fixes + commit_options: '--no-verify' diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index c1e626f..5aeee91 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -13,7 +13,7 @@ jobs: name: phpstan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c908e0e..ca38328 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, windows-latest ] - php: [ 8.1, 8.2, 8.3, 8.4 ] + php: [ 8.2, 8.3, 8.4, 8.5 ] stability: [ prefer-lowest, prefer-stable ] name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index b47efdb..37412cd 100644 --- a/composer.json +++ b/composer.json @@ -12,18 +12,18 @@ ], "homepage": "https://github.com/sammyjo20", "require": { - "php": "^8.1", + "php": "^8.2", "saloonphp/saloon": "^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.5", - "pestphp/pest": "^2.6", + "pestphp/pest": "^v3.8.4 || ^v4.1.4", "phpstan/phpstan": "^1.9", "predis/predis": "^2.1", "psr/simple-cache": "^3.0", "spatie/ray": "^1.33", "mockery/mockery": "^1.5", - "orchestra/testbench": "^8.5" + "orchestra/testbench": "^8.5 || ^10.7" }, "minimum-stability": "stable", "prefer-stable": true, From 59c88d472c4a0ab8e95f9dd5b2dfdf59a6a2cd64 Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Thu, 20 Nov 2025 21:53:24 +0000 Subject: [PATCH 2/3] Updated redis tests --- .github/workflows/phpstan.yml | 2 +- .github/workflows/redis-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 5aeee91..fab703b 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -18,7 +18,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none - name: Install composer dependencies diff --git a/.github/workflows/redis-tests.yml b/.github/workflows/redis-tests.yml index 9e54899..9131fa7 100644 --- a/.github/workflows/redis-tests.yml +++ b/.github/workflows/redis-tests.yml @@ -18,7 +18,7 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest ] - php: [ 8.1, 8.2, 8.3, 8.4 ] + php: [ 8.2, 8.3, 8.4, 8.5 ] stability: [ prefer-lowest, prefer-stable ] services: # Label used to access the service container From 460a847f55637a6b40282132997e4bfe351607eb Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Thu, 20 Nov 2025 21:55:10 +0000 Subject: [PATCH 3/3] Bumped testbench and removed ray --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 37412cd..52835af 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,8 @@ "phpstan/phpstan": "^1.9", "predis/predis": "^2.1", "psr/simple-cache": "^3.0", - "spatie/ray": "^1.33", "mockery/mockery": "^1.5", - "orchestra/testbench": "^8.5 || ^10.7" + "orchestra/testbench": "^9.15 || ^10.7" }, "minimum-stability": "stable", "prefer-stable": true,