Merge pull request #620 from CPS-IT/renovate/php-8.x

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: frontend-asset-handler
 type: php
 docroot: ""
-php_version: "8.1"
+php_version: "8.4"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"

.github/workflows/cgl.yaml

@@ -19,6 +19,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
+          # @todo Use PHP 8.4 once PHP-CS-Fixer supports PHP 8.4
           php-version: 8.3
           tools: composer:v2, composer-require-checker, composer-unused, cs2pr
           coverage: none

.github/workflows/tests.yaml

@@ -14,7 +14,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: ["locked", "highest", "lowest"]
     steps:
       - uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           tools: composer:v2
           coverage: pcov
 

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",
 		"ext-filter": "*",
 		"ext-json": "*",
 		"ext-mbstring": "*",

rector.php

@@ -22,8 +22,6 @@
  */
 
 use Rector\Config\RectorConfig;
-use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
-use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\Set\ValueObject\LevelSetList;
 
@@ -34,8 +32,6 @@
     ]);
 
     $rectorConfig->skip([
-        AddLiteralSeparatorToNumberRector::class,
-        JsonThrowOnErrorRector::class,
         NullToStrictStringFuncCallArgRector::class => [
             __DIR__.'/src/Command/FetchAssetsCommand.php',
             __DIR__.'/src/Command/InspectAssetsCommand.php',

src/Command/ConfigAssetsCommand.php

@@ -286,7 +286,7 @@ private function doWrite(Config\Config $config, string $path, mixed $newValue):
      */
     private function buildAndValidatePath(array $assetDefinitions, string $path): string
     {
-        $pathSegments = str_getcsv($path, '/');
+        $pathSegments = str_getcsv($path, '/', escape: '\\');
         $strictPath = is_numeric($pathSegments[0]);
 
         if (!$strictPath) {

src/Helper/ArrayHelper.php

@@ -98,7 +98,7 @@ public static function setArrayValueByPath(array $array, string $path, mixed $va
         $node = &$array;
 
         // Assure required structure in array
-        foreach (str_getcsv($path, '/') as $segment) {
+        foreach (str_getcsv($path, '/', escape: '\\') as $segment) {
             if (!isset($node[$segment])) {
                 $node[$segment] = [];
             }