Move config to di instead of di-web

yiisoft · Jan 15, 2024 · 15d5140 · 15d5140
1 parent 49d57b2
commit 15d5140
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/config/di-web.php → config/di.php b/config/di-web.php → config/di.php
@@ -57,9 +57,14 @@
 
         $assetManager = $assetManager
             ->withConverter($container->get(AssetConverterInterface::class))
-            ->withPublisher($container->get(AssetPublisherInterface::class))
         ;
 
+        if ($params['yiisoft/assets']['assetManager']['publisher'] !== null) {
+            $assetManager = $assetManager->withPublisher(
+                $container->get($params['yiisoft/assets']['assetManager']['publisher'])
+            );
+        };
+
         $assetManager->registerMany($params['yiisoft/assets']['assetManager']['register']);
         return $assetManager;
     },

diff --git a/config/params.php b/config/params.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Yiisoft\Assets\AssetLoaderInterface;
+use Yiisoft\Assets\AssetPublisherInterface;
 use Yiisoft\Assets\Debug\AssetCollector;
 use Yiisoft\Assets\Debug\AssetLoaderInterfaceProxy;
 
@@ -28,6 +29,7 @@
             'allowedBundleNames' => [],
             'customizedBundles' => [],
             'register' => [],
+            'publisher' => AssetPublisherInterface::class,
         ],
     ],
 

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -50,7 +50,7 @@ private function getDiConfig(?array $params = null): array
         if ($params === null) {
             $params = $this->getParams();
         }
-        return require dirname(__DIR__) . '/config/di-web.php';
+        return require dirname(__DIR__) . '/config/di.php';
     }
 
     private function getParams(): array