fix: services

Author: SLRBot

config/services.yaml

@@ -41,7 +41,7 @@ services:
             - []  # allowed_mime_types - set by extension
             - '@NetBull\MediaBundle\Metadata\AmazonMetadataBuilder'
         calls:
-            - setTemplates: [{ helper_thumbnail: '@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@NetBullMedia/Provider/view_image.html.twig' }]
+            - setTemplates: [{ helper_thumbnail: '@@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@@NetBullMedia/Provider/view_image.html.twig' }]
 
     netbull_media.provider.file:
         class: NetBull\MediaBundle\Provider\FileProvider
@@ -59,7 +59,7 @@ services:
             - []  # allowed_mime_types
             - '@NetBull\MediaBundle\Metadata\AmazonMetadataBuilder'
         calls:
-            - setTemplates: [{ helper_thumbnail: '@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@NetBullMedia/Provider/view_file.html.twig' }]
+            - setTemplates: [{ helper_thumbnail: '@@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@@NetBullMedia/Provider/view_file.html.twig' }]
 
     netbull_media.provider.youtube:
         class: NetBull\MediaBundle\Provider\YouTubeProvider
@@ -74,7 +74,7 @@ services:
             - '@NetBull\MediaBundle\Metadata\AmazonMetadataBuilder'
             - true  # html5
         calls:
-            - setTemplates: [{ helper_thumbnail: '@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@NetBullMedia/Provider/view_youtube.html.twig' }]
+            - setTemplates: [{ helper_thumbnail: '@@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@@NetBullMedia/Provider/view_youtube.html.twig' }]
 
     netbull_media.provider.vimeo:
         class: NetBull\MediaBundle\Provider\VimeoProvider
@@ -88,7 +88,7 @@ services:
             - '@NetBull\MediaBundle\Thumbnail\FormatThumbnail'
             - '@NetBull\MediaBundle\Metadata\AmazonMetadataBuilder'
         calls:
-            - setTemplates: [{ helper_thumbnail: '@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@NetBullMedia/Provider/view_vimeo.html.twig' }]
+            - setTemplates: [{ helper_thumbnail: '@@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@@NetBullMedia/Provider/view_vimeo.html.twig' }]
 
     netbull_media.provider.youku:
         class: NetBull\MediaBundle\Provider\YoukuProvider
@@ -102,7 +102,7 @@ services:
             - '@NetBull\MediaBundle\Thumbnail\FormatThumbnail'
             - '@NetBull\MediaBundle\Metadata\AmazonMetadataBuilder'
         calls:
-            - setTemplates: [{ helper_thumbnail: '@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@NetBullMedia/Provider/view_youku.html.twig' }]
+            - setTemplates: [{ helper_thumbnail: '@@NetBullMedia/Provider/thumbnail.html.twig', helper_view: '@@NetBullMedia/Provider/view_youku.html.twig' }]
 
     # Event Listener
     NetBull\MediaBundle\EventListener\MediaListener: ~
@@ -218,13 +218,7 @@ services:
     Gaufrette\Filesystem:
         alias: netbull_media.filesystem.s3
 
-    netbull_media.filesystem.local.server:
-        class: NetBull\MediaBundle\Filesystem\LocalServer
-        autowire: false
-        arguments:
-            - '@netbull_media.adapter.filesystem.local'
-            - '@netbull_media.adapter.filesystem.s3'
-        public: true
+    # netbull_media.filesystem.local.server is created dynamically when S3 is configured
 
     # Metadata
     NetBull\MediaBundle\Metadata\AmazonMetadataBuilder:

src/NetBullMediaBundle.php

@@ -384,6 +384,7 @@ private function configureFilesystemAdapter(ContainerBuilder $container, array $
                 ->addArgument($config['filesystem']['local']['create']);
         } else {
             $container->removeDefinition('netbull_media.adapter.filesystem.local');
+            $container->removeDefinition('netbull_media.filesystem.local');
         }
 
         // Add the default configuration for the S3 filesystem
@@ -414,28 +415,29 @@ private function configureFilesystemAdapter(ContainerBuilder $container, array $
                     'meta' => $config['filesystem']['s3']['options']['meta'],
                     'cache_control' => $config['filesystem']['s3']['options']['cache_control'],
                 ]);
+
+            // Create local.server service only when both local and S3 with credentials are configured
+            if (
+                $container->hasDefinition('netbull_media.adapter.filesystem.local')
+                && !empty($config['filesystem']['s3']['defaults']['credentials'])
+            ) {
+                $container->register('netbull_media.filesystem.local.server', 'NetBull\MediaBundle\Filesystem\LocalServer')
+                    ->setArguments([
+                        new Reference('netbull_media.adapter.filesystem.local'),
+                        new Reference('netbull_media.adapter.filesystem.s3'),
+                    ])
+                    ->setPublic(true);
+            }
         } else {
             $container->removeDefinition('netbull_media.adapter.filesystem.s3');
             $container->removeDefinition('netbull_media.filesystem.s3');
+            $container->removeDefinition('netbull_media.wrapper.s3');
 
             // Update the Gaufrette\Filesystem alias to point to local when S3 is not configured
             if ($container->hasAlias('Gaufrette\Filesystem') && $container->hasDefinition('netbull_media.filesystem.local')) {
                 $container->setAlias('Gaufrette\Filesystem', 'netbull_media.filesystem.local');
             }
         }
-
-        // If there is no local or s3 filesystem then remove the local.server service
-        if (
-            (!$container->hasDefinition('netbull_media.adapter.filesystem.local') || !$container->hasDefinition('netbull_media.adapter.filesystem.s3'))
-            && $container->hasDefinition('netbull_media.adapter.filesystem.local.server')
-        ) {
-            $container->removeDefinition('netbull_media.adapter.filesystem.local.server');
-        }
-
-        // Remove the local.server definition if the S3 does not use credentials for authentication
-        if ($container->hasDefinition('netbull_media.adapter.filesystem.local.server') && empty($config['filesystem']['s3']['defaults']['credentials'])) {
-            $container->removeDefinition('netbull_media.adapter.filesystem.local.server');
-        }
     }
 
     private function configureCdnAdapter(ContainerBuilder $container, array $config): void