[AssetMapper] Allowing for files to be written to some non-local location

Author: weaverryan

DependencyInjection/FrameworkExtension.php

@@ -1353,13 +1353,17 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->setArgument(0, $paths)
             ->setArgument(2, $excludedPathPatterns);
 
-        $publicDirName = $this->getPublicDirectoryName($container);
         $container->getDefinition('asset_mapper.public_assets_path_resolver')
-            ->setArgument(1, $config['public_prefix'])
-            ->setArgument(2, $publicDirName);
+            ->setArgument(0, $config['public_prefix']);
 
-        $container->getDefinition('asset_mapper.command.compile')
-            ->setArgument(5, $publicDirName);
+        $publicDirectory = $this->getPublicDirectory($container);
+        $publicAssetsDirectory = rtrim($publicDirectory.'/'.ltrim($config['public_prefix'], '/'), '/');
+        $container->getDefinition('asset_mapper.local_public_assets_filesystem')
+            ->setArgument(0, $publicDirectory)
+        ;
+
+        $container->getDefinition('asset_mapper.compiled_asset_mapper_config_reader')
+            ->setArgument(0, $publicAssetsDirectory);
 
         if (!$config['server']) {
             $container->removeDefinition('asset_mapper.dev_server_subscriber');
@@ -3163,11 +3167,12 @@ private function writeConfigEnabled(string $path, bool $value, array &$config):
         $config['enabled'] = $value;
     }
 
-    private function getPublicDirectoryName(ContainerBuilder $container): string
+    private function getPublicDirectory(ContainerBuilder $container): string
     {
-        $defaultPublicDir = 'public';
+        $projectDir = $container->getParameter('kernel.project_dir');
+        $defaultPublicDir = $projectDir.'/public';
 
-        $composerFilePath = $container->getParameter('kernel.project_dir').'/composer.json';
+        $composerFilePath = $projectDir.'/composer.json';
 
         if (!file_exists($composerFilePath)) {
             return $defaultPublicDir;
@@ -3176,6 +3181,6 @@ private function getPublicDirectoryName(ContainerBuilder $container): string
         $container->addResource(new FileResource($composerFilePath));
         $composerConfig = json_decode(file_get_contents($composerFilePath), true);
 
-        return $composerConfig['extra']['public-dir'] ?? $defaultPublicDir;
+        return isset($composerConfig['extra']['public-dir']) ? $projectDir.'/'.$composerConfig['extra']['public-dir'] : $defaultPublicDir;
     }
 }

Resources/config/asset_mapper.php

@@ -24,6 +24,7 @@
 use Symfony\Component\AssetMapper\Command\ImportMapRemoveCommand;
 use Symfony\Component\AssetMapper\Command\ImportMapRequireCommand;
 use Symfony\Component\AssetMapper\Command\ImportMapUpdateCommand;
+use Symfony\Component\AssetMapper\CompiledAssetMapperConfigReader;
 use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
 use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
 use Symfony\Component\AssetMapper\Compiler\SourceMappingUrlsCompiler;
@@ -40,6 +41,7 @@
 use Symfony\Component\AssetMapper\ImportMap\RemotePackageStorage;
 use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
 use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
+use Symfony\Component\AssetMapper\Path\LocalPublicAssetsFilesystem;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
 
 return static function (ContainerConfigurator $container) {
@@ -48,7 +50,7 @@
             ->args([
                 service('asset_mapper.repository'),
                 service('asset_mapper.mapped_asset_factory'),
-                service('asset_mapper.public_assets_path_resolver'),
+                service('asset_mapper.compiled_asset_mapper_config_reader'),
             ])
         ->alias(AssetMapperInterface::class, 'asset_mapper')
 
@@ -76,9 +78,17 @@
 
         ->set('asset_mapper.public_assets_path_resolver', PublicAssetsPathResolver::class)
             ->args([
-                param('kernel.project_dir'),
                 abstract_arg('asset public prefix'),
-                abstract_arg('public directory name'),
+            ])
+
+        ->set('asset_mapper.local_public_assets_filesystem', LocalPublicAssetsFilesystem::class)
+            ->args([
+                abstract_arg('public directory'),
+            ])
+
+        ->set('asset_mapper.compiled_asset_mapper_config_reader', CompiledAssetMapperConfigReader::class)
+            ->args([
+                abstract_arg('public assets directory'),
             ])
 
         ->set('asset_mapper.asset_package', MapperAwareAssetPackage::class)
@@ -100,12 +110,11 @@
 
         ->set('asset_mapper.command.compile', AssetMapperCompileCommand::class)
             ->args([
-                service('asset_mapper.public_assets_path_resolver'),
+                service('asset_mapper.compiled_asset_mapper_config_reader'),
                 service('asset_mapper'),
                 service('asset_mapper.importmap.generator'),
-                service('filesystem'),
+                service('asset_mapper.local_public_assets_filesystem'),
                 param('kernel.project_dir'),
-                abstract_arg('public directory name'),
                 param('kernel.debug'),
                 service('event_dispatcher')->nullOnInvalid(),
             ])
@@ -163,7 +172,7 @@
         ->set('asset_mapper.importmap.generator', ImportMapGenerator::class)
             ->args([
                 service('asset_mapper'),
-                service('asset_mapper.public_assets_path_resolver'),
+                service('asset_mapper.compiled_asset_mapper_config_reader'),
                 service('asset_mapper.importmap.config_reader'),
             ])
 

Tests/DependencyInjection/XmlFrameworkExtensionTest.php

@@ -79,7 +79,7 @@ public function testAssetMapper()
         $container = $this->createContainerFromFile('asset_mapper');
 
         $definition = $container->getDefinition('asset_mapper.public_assets_path_resolver');
-        $this->assertSame('/assets_path/', $definition->getArgument(1));
+        $this->assertSame('/assets_path/', $definition->getArgument(0));
 
         $definition = $container->getDefinition('asset_mapper.dev_server_subscriber');
         $this->assertSame(['zip' => 'application/zip'], $definition->getArgument(2));