Allow PHP 8.4

azjezz · Oct 25, 2024 · 94c99cd · 94c99cd
1 parent 77af041
commit 94c99cd
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json

diff --git a/.github/workflows/documentation-check.yml b/.github/workflows/documentation-check.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json

diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/preload-check.yml b/.github/workflows/preload-check.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json

diff --git a/.github/workflows/security-analysis.yml b/.github/workflows/security-analysis.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,6 +15,7 @@ jobs:
         php-version:
           - "8.2"
           - "8.3"
+          - "8.4"
         operating-system:
           - "macos-latest"
           - "ubuntu-latest"

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ help:
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_\-\.]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
 install:                                                              			## install all dependencies for a development environment
-	composer install
+	COMPOSER_IGNORE_PLATFORM_REQ=php+ composer install
 
 coding-standard-fix:                                                            ## apply automated coding standard fixes
 	PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --config=config/.php_cs.dist.php

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "~8.2.0 || ~8.3.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-bcmath": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Psl/DateTime/DateTime.php b/src/Psl/DateTime/DateTime.php
@@ -179,7 +179,12 @@ public static function fromParts(Timezone $timezone, int $year, Month|int $month
             Internal\to_intl_timezone($timezone),
         );
 
-        $calendar->set($year, $month - 1, $day, $hours, $minutes, $seconds);
+        if (PHP_VERSION_ID >= 80300) {
+            $calendar->setDateTime($year, $month - 1, $day, $hours, $minutes, $seconds);
+        } else {
+            // @codeCoverageIgnore
+            $calendar->set($year, $month - 1, $day, $hours, $minutes, $seconds);
+        }
 
         if ($seconds !== $calendar->get(IntlCalendar::FIELD_SECOND)) {
             throw Exception\UnexpectedValueException::forSeconds($seconds, $calendar->get(IntlCalendar::FIELD_SECOND));