Optimize and harden EncoreHelper a bit (pimcore#15239)

* Optimize and harden EncoreHelper a bit * Fix typo Co-authored-by: Matthias Schuhmayer <[email protected]> --------- Co-authored-by: Matthias Schuhmayer <[email protected]>
michalananapps · Jul 19, 2023 · 988f120 · 988f120
1 parent c21bbf4
commit 988f120
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/Helper/EncoreHelper.php b/lib/Helper/EncoreHelper.php
@@ -20,15 +20,18 @@ final class EncoreHelper
 {
     public static function getBuildPathsFromEntrypoints(string $entrypointsFile, string $type = 'js'): array
     {
+        if (!file_exists($entrypointsFile)) {
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $entrypointsFile));
+        }
+
         $entrypointsContent = file_get_contents($entrypointsFile);
-        $entrypointsJson = json_decode($entrypointsContent, true)['entrypoints'];
-        $entrypoints = array_keys($entrypointsJson);
+        $entrypoints = json_decode($entrypointsContent, true, flags: JSON_THROW_ON_ERROR)['entrypoints'];
 
         $paths = [];
         foreach ($entrypoints as $entrypoint) {
-            $paths = array_merge($paths, $entrypointsJson[$entrypoint][$type] ?? []);
+            $paths[] = $entrypoint[$type] ?? [];
         }
 
-        return $paths;
+        return array_merge(...$paths);
     }
 }