From e4c80101a87057f7e992dbb9ca8aa5ee2e196a0d Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Thu, 20 Nov 2025 23:03:57 +0000 Subject: [PATCH 1/2] Feature | PHP 8.5 Support --- .github/workflows/php-cs-fixer.yml | 30 +++++++++++++++++++++--------- .github/workflows/phpstan.yml | 4 ++-- .github/workflows/tests.yml | 5 +++-- composer.json | 7 +++---- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index 7375fd9..ad01818 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -12,18 +12,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 96bb0ce..5fe6b29 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -14,12 +14,12 @@ jobs: name: phpstan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.5' coverage: none - name: Install composer dependencies diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 025b193..031eb25 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,14 +19,14 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, windows-latest ] - php: [ 8.1, 8.2, 8.3 ] + php: [ 8.2, 8.3, 8.4, 8.5 ] stability: [ prefer-lowest, prefer-stable ] name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -43,5 +43,6 @@ jobs: - name: Install dependencies run: | composer update --${{ matrix.stability }} --prefer-dist --no-interaction + - name: Execute tests run: vendor/bin/pest diff --git a/composer.json b/composer.json index 6283698..5cff88f 100644 --- a/composer.json +++ b/composer.json @@ -12,15 +12,14 @@ ], "homepage": "https://github.com/saloonphp/pagination-plugin", "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": "^3.0 || ^4.0", "phpstan/phpstan": "^1.9", - "spatie/ray": "^1.33", - "illuminate/collections": "^10.9", + "illuminate/collections": "^11.0 || ^12.0", "spatie/invade": "^2.0" }, "minimum-stability": "stable", From e9d5feb81456dd6a8c287f800eda4b69d8802752 Mon Sep 17 00:00:00 2001 From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com> Date: Thu, 20 Nov 2025 23:07:11 +0000 Subject: [PATCH 2/2] Fixed spacing --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 031eb25..6d7e819 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,6 +43,6 @@ jobs: - name: Install dependencies run: | composer update --${{ matrix.stability }} --prefer-dist --no-interaction - + - name: Execute tests run: vendor/bin/pest