Merge pull request #1156 from veewee/php84

PHP 8.4 support
phpro · Oct 25, 2024 · bd69934 · bd69934
2 parents eca0436 + c744502
commit bd69934
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 124 deletions.
diff --git a/.github/workflows/grumphp.yml b/.github/workflows/grumphp.yml
@@ -10,7 +10,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest, macos-latest] #windows-latest currently not working
-                php-versions: ['8.1', '8.2', '8.3']
+                php-versions: ['8.1', '8.2', '8.3', '8.4']
                 composer-deps: ['highest', 'lowest', 'lock']
                 composer-versions: ['composer:v2']
             fail-fast: false
@@ -30,9 +30,10 @@ jobs:
                 php -m
                 composer --version
             - name: Set env vars for latest PHP version
-              if: matrix.php-versions == '8.3'
+              if: matrix.php-versions == '8.4'
               run: |
                 export COMPOSER_IGNORE_PLATFORM_REQ=php+
+                export BOX_REQUIREMENT_CHECKER=0
             - name: Get composer cache directory
               id: composercache
               run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
@@ -64,6 +65,6 @@ jobs:
             - name: Run the tests on unix
               if: runner.os != 'Windows'
               run: php vendor/bin/grumphp run --no-interaction --testsuite=ci
-              #continue-on-error: ${{ matrix.php-versions == '8.1' && matrix.composer-options == '--prefer-lowest' }}
+              continue-on-error: ${{ matrix.php-versions == '8.4' && matrix.composer-deps == 'lowest' }}
             - name: Run paratest outside of grumphp
               run: php ./vendor/bin/paratest --testsuite=E2E -f --verbose
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,12 +5,14 @@ shallow_clone: false
 platform:
   - x64
 
-#matrix:
-#  allow_failures:
-#    - php_version: 8.3
+matrix:
+  allow_failures:
+    - php_version: 8.4
 
 environment:
   matrix:
+    - dependencies: lock
+      php_version: 8.4
     - dependencies: lock
       php_version: 8.3
     - dependencies: lock

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-json": "*",
         "composer-plugin-api": "^2.0",
         "amphp/amp": "^3.0",