bug #6124 Add full support for AssetMapper entries (javiereguiluz)

This PR was merged into the 4.x branch. Discussion ---------- Add full support for AssetMapper entries Fixes #6123. Commits ------- 7c52583 dd full support for AssetMapper entries
EasyCorp · Jan 31, 2024 · 66cdc15 · 66cdc15
2 parents c2ceb14 + 7c52583
commit 66cdc15
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/Dto/AssetsDto.php b/src/Dto/AssetsDto.php
@@ -145,6 +145,11 @@ public function loadedOn(?string $pageName): self
                 $filteredAssets->addJsAsset($jsAsset);
             }
         }
+        foreach ($this->assetMapperAssets as $assetMapperAsset) {
+            if ($assetMapperAsset->getLoadedOn()->has($pageName)) {
+                $filteredAssets->addAssetMapperAsset($assetMapperAsset);
+            }
+        }
         foreach ($this->webpackEncoreAssets as $webpackEncoreAsset) {
             if ($webpackEncoreAsset->getLoadedOn()->has($pageName)) {
                 $filteredAssets->addWebpackEncoreAsset($webpackEncoreAsset);
@@ -162,6 +167,7 @@ public function loadedOn(?string $pageName): self
 
     public function mergeWith(self $assetsDto): self
     {
+        $this->assetMapperAssets = array_merge($this->assetMapperAssets, $assetsDto->getAssetMapperAssets());
         $this->webpackEncoreAssets = array_merge($this->webpackEncoreAssets, $assetsDto->getWebpackEncoreAssets());
         $this->cssAssets = array_merge($this->cssAssets, $assetsDto->getCssAssets());
         $this->jsAssets = array_merge($this->jsAssets, $assetsDto->getJsAssets());

diff --git a/src/Dto/FieldDto.php b/src/Dto/FieldDto.php
@@ -401,6 +401,11 @@ public function setAssets(AssetsDto $assets): void
         $this->assets = $assets;
     }
 
+    public function addAssetMapperEncoreAsset(AssetDto $assetDto): void
+    {
+        $this->assets->addAssetMapperAsset($assetDto);
+    }
+
     public function addWebpackEncoreAsset(AssetDto $assetDto): void
     {
         $this->assets->addWebpackEncoreAsset($assetDto);

diff --git a/src/Field/FieldTrait.php b/src/Field/FieldTrait.php
@@ -257,6 +257,23 @@ public function addWebpackEncoreEntries(Asset|string ...$entryNamesOrAssets): se
         return $this;
     }
 
+    public function addAssetMapperEntries(Asset|string ...$entryNamesOrAssets): self
+    {
+        if (!class_exists('Symfony\\Component\\AssetMapper\\AssetMapper')) {
+            throw new \RuntimeException('You are trying to add AssetMapper entries in a field but AssetMapper is not installed in your project. Try running "composer require symfony/asset-mapper"');
+        }
+
+        foreach ($entryNamesOrAssets as $entryNameOrAsset) {
+            if (\is_string($entryNameOrAsset)) {
+                $this->dto->addAssetMapperEncoreAsset(new AssetDto($entryNameOrAsset));
+            } else {
+                $this->dto->addAssetMapperEncoreAsset($entryNameOrAsset->getAsDto());
+            }
+        }
+
+        return $this;
+    }
+
     public function addCssFiles(Asset|string ...$pathsOrAssets): self
     {
         foreach ($pathsOrAssets as $pathOrAsset) {