PHP 8.4 (#156)

yiisoft · Jan 15, 2025 · 1cd4df5 · 1cd4df5
1 parent cd1986e
commit 1cd4df5
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -27,6 +27,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 ## 5.0.1 under development
 
+- Chg #156: Change PHP constraint in `composer.json` to `~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0` (@vjik) 
 - Chg #155: Improve static analyze annotations (@vjik)
 - Enh #155: Remove unnecessary `array_filter` call in `AssetUtil::extractFilePathsForExport()` method (@vjik)
+- Bug #156: Fix the nullable parameter declarations for compatibility with PHP 8.4 (@vjik)
 
 ## 5.0.0 December 11, 2024
 

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-mbstring": "*",
         "psr/log": "^1.1|^2.0|^3.0",
         "yiisoft/aliases": "^1.1|^2.0|^3.0",

diff --git a/src/AssetConverter.php b/src/AssetConverter.php
@@ -247,7 +247,7 @@ private function runCommand(
         string $basePath,
         string $asset,
         string $result,
-        string $options = null
+        ?string $options = null
     ): bool {
         $basePath = $this->aliases->get($basePath);
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ jobs: @@
           os: >-
             ['ubuntu-latest']
           php: >-
-            ['8.3']
+            ['8.4']