Merge master.

Author: dereuromark

.github/workflows/ci.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   testsuite:
     name: Unittests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.3']
+        php-version: ['8.1', '8.5']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -43,14 +43,14 @@ jobs:
 
     - name: Code Coverage Report
       if: success() && matrix.php-version == '8.1'
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v5
 
   cs-stan:
     name: Coding Standard & Static Analysis
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

composer.json

@@ -19,13 +19,14 @@
         "ext-fileinfo": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "php-collective/file-storage-factories": "dev-master as 1.0",
+        "php-collective/file-storage-factories": "dev-master as 0.1.0",
         "psr/http-message": "^1.0|^2.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.3",
-        "php-collective/code-sniffer": "^0.2.1"
+        "php-collective/code-sniffer": "^0.4.1",
+        "php-collective/file-storage-image-processor": "dev-master as 0.1.0"
     },
     "suggest": {
         "php-collective/file-storage-image-processor": "For image processing"

src/File.php

@@ -596,14 +596,38 @@ public function withoutMetadataKey(string $key): FileInterface
     public function withVariants(array $variants, bool $merge = true): FileInterface
     {
         $that = clone $this;
-        $that->variants = array_merge_recursive(
+        $that->variants = $this->arrayMergeDeep(
             $merge ? $that->variants : [],
             $variants,
         );
 
         return $that;
     }
 
+    /**
+     * Sets many variants at once
+     *
+     * @param array $array1
+     * @param array $array2
+     *
+     * @return array
+     */
+    protected function arrayMergeDeep(array $array1, array $array2): array {
+        foreach ($array2 as $key => $value) {
+            if (
+                isset($array1[$key]) &&
+                is_array($array1[$key]) &&
+                is_array($value)
+            ) {
+                $array1[$key] = $this->arrayMergeDeep($array1[$key], $value);
+            } else {
+                $array1[$key] = $value;
+            }
+        }
+
+        return $array1;
+    }
+
     /**
      * @inheritDoc
      */