Merge pull request #83 from CakeDC/issue/81-2.x

Branch 2.x: 81 - Fix resolveExtends including parent assets many times if any plugin uses AssetCompress

Author: markstory

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
       run: echo "::set-output name=date::$(date +'%Y-%m')"
 
     - name: Cache composer dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}

src/AssetConfig.php

@@ -255,8 +255,8 @@ protected function resolveExtends(): void
             if (!$parentConfig) {
                 return $config;
             }
-            $config['files'] = array_merge($parentConfig['files'], $config['files']);
-            $config['filters'] = array_merge($parentConfig['filters'], $config['filters']);
+            $config['files'] = array_unique(array_merge($parentConfig['files'], $config['files']));
+            $config['filters'] = array_unique(array_merge($parentConfig['filters'], $config['filters']));
             $config['theme'] = $parentConfig['theme'] || $config['theme'];
 
             return $config;

src/AssetProcess.php

@@ -105,7 +105,7 @@ public function run(?string $input = null): string
             $descriptorSpec,
             $pipes,
             null,
-            $this->_env
+            $this->_env,
         );
         if (is_resource($process)) {
             fwrite($pipes[0], $input);

src/Cli/BuildTask.php

@@ -64,7 +64,7 @@ protected function addArguments(): void
                 'description' => 'The config file to use.',
                 'required' => true,
             ],
-            ]
+            ],
         );
     }
 

src/Cli/ClearTask.php

@@ -49,7 +49,7 @@ protected function addArguments(): void
                 'description' => 'The config file to use.',
                 'required' => true,
             ],
-            ]
+            ],
         );
     }
 

src/Factory.php

@@ -77,7 +77,7 @@ public function cachedCompiler(string $outputDir = '', bool $debug = false): Cac
     {
         return new CachedCompiler(
             $this->cacher($outputDir),
-            $this->compiler($debug)
+            $this->compiler($debug),
         );
     }
 

src/Filter/ClosureCompiler.php

@@ -136,7 +136,7 @@ protected function _query(string $content, array $args = []): string|bool
             CURLOPT_RETURNTRANSFER => 1,
             CURLOPT_HEADER => 0,
             CURLOPT_FOLLOWLOCATION => 0,
-            ]
+            ],
         );
 
         $output = curl_exec($ch);

src/Filter/CssDependencyTrait.php

@@ -147,7 +147,7 @@ protected function _prependPrefixToFilename(string $name): string
         return str_replace(
             $ds . $filename,
             $ds . $this->optionalDependencyPrefix . $filename,
-            $name
+            $name,
         );
     }
 }

src/Filter/FilterRegistry.php

@@ -114,7 +114,7 @@ public function collection(AssetTarget $target): FilterCollection
                 [
                 'target' => $target->name(),
                 'paths' => $target->paths(),
-                ]
+                ],
             );
             $filters[] = $copy;
         }

src/Filter/Hogan.php

@@ -106,7 +106,7 @@ protected function _generateScript(string $file, string $filename, string $input
             json_encode($input),
             json_encode($config),
             $id,
-            $filepath
+            $filepath,
         );
         file_put_contents($file, $contents);
     }