[7.x] PHP 8.4 Support (#1184)

* wip * wip * wip * Only run gateway tests on PHP 8.4, to reduce the number of requests. * Require Statamic 5.41 or higher * We don't really need this. * Require Runway 7.13
duncanmcclean · Nov 29, 2024 · bb7129a · bb7129a
1 parent db9af36
commit bb7129a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -12,12 +12,15 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.3, 8.2]
-        laravel: [11.*, 10.*]
-        statamic: [^5.0]
+        php: [8.2, 8.3, 8.4]
+        laravel: [10.*, 11.*]
+        stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
+        exclude:
+          - php: 8.4
+            laravel: 10.*
 
-    name: ${{ matrix.php }} - ${{ matrix.statamic }} - ${{ matrix.laravel }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
@@ -27,18 +30,17 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: composer:v2
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" --no-interaction --no-update
-          composer install --no-interaction
+          composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: Run PHPUnit
         run: vendor/bin/pest
         env:
-          STRIPE_KEY: ${{ secrets.STRIPE_KEY }}
-          STRIPE_SECRET: ${{ secrets.STRIPE_SECRET }}
-          MOLLIE_KEY: ${{ secrets.MOLLIE_KEY }}
-          MOLLIE_PROFILE: ${{ secrets.MOLLIE_PROFILE }}
+          STRIPE_KEY: ${{ matrix.php == '8.4' && secrets.STRIPE_KEY || '' }}
+          STRIPE_SECRET: ${{ matrix.php == '8.4' && secrets.STRIPE_SECRET || '' }}
+          MOLLIE_KEY: ${{ matrix.php == '8.4' && secrets.MOLLIE_KEY || '' }}
+          MOLLIE_PROFILE: ${{ matrix.php == '8.4' && secrets.MOLLIE_PROFILE || '' }}
diff --git a/composer.json b/composer.json
@@ -31,19 +31,20 @@
     "require": {
         "php": "^8.2",
         "ext-intl": "*",
-        "laravel/framework": "^10.34 || ^11.0",
+        "laravel/framework": "^10.34 || ^11.0.3",
         "mollie/mollie-api-php": "^2.30.0",
         "moneyphp/money": "^4.0",
         "paypal/paypal-checkout-sdk": "^1.0",
         "pixelfear/composer-dist-plugin": "^0.1.0",
         "spatie/ignition": "^1.13",
-        "statamic/cms": "^5.0",
+        "statamic/cms": "^5.41",
         "stillat/proteus": "^3.0 || ^4.0",
         "stripe/stripe-php": "^13.0"
     },
     "require-dev": {
-        "statamic-rad-pack/runway": "dev-master",
-        "orchestra/testbench": "^8.0 || ^9.0",
+        "statamic-rad-pack/runway": "^7.13",
+        "orchestra/testbench": "^8.28 || ^9.6.1",
+        "phpunit/phpunit": "^10.5.35",
         "pestphp/pest": "^2.2",
         "pestphp/pest-plugin-laravel": "^2.0",
         "spatie/ray": "^1.17",