Merge pull request #16 from saloonphp/feature/php-8.5

Feature | PHP 8.5 Support

Author: Sammyjo20

.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'

.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

.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

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",