Merge pull request #153 from CPS-IT/feature/php-8.4

CPS-IT · Nov 7, 2024 · ce51940 · ce51940
2 parents 5e254b2 + 87d55f3
commit ce51940
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/cgl.yaml b/.github/workflows/cgl.yaml
@@ -19,6 +19,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
+          # @todo Switch to PHP 8.4 once PHP-CS-Fixer supports it
           php-version: 8.3
           tools: composer:v2, composer-require-checker, composer-unused, cs2pr
           coverage: none

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ["8.1", "8.2", "8.3"]
+        php-version: ["8.1", "8.2", "8.3", "8.4"]
         dependencies: ["highest", "lowest"]
     steps:
       - uses: actions/checkout@v4
@@ -52,7 +52,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           tools: composer:v2
           coverage: pcov
 

diff --git a/composer.json b/composer.json
@@ -12,7 +12,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",
 		"friendsofphp/php-cs-fixer": "^3.14"
 	},
 	"require-dev": {

diff --git a/composer.lock b/composer.lock