Merge cd783a0 into 07d7ded

liip · Apr 15, 2017 · f85150f · f85150f
2 parents 07d7ded + cd783a0
commit f85150f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -119,6 +119,11 @@ public function getConfigTreeBuilder()
                 ->scalarNode('cache_base_path')->defaultValue('')->end()
                 ->scalarNode('data_loader')->defaultValue('default')->end()
                 ->scalarNode('default_image')->defaultNull()->end()
+                ->arrayNode('default_filter_settings')
+                    ->children()
+                        ->scalarNode('jpeg_quality')->defaultNull()->end()
+                    ->end()
+                ->end()
                 ->arrayNode('controller')
                     ->addDefaultsIfNotSet()
                     ->children()

diff --git a/DependencyInjection/LiipImagineExtension.php b/DependencyInjection/LiipImagineExtension.php
@@ -86,6 +86,8 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('liip_imagine.default_image', $config['default_image']);
 
+        $container->setParameter('liip_imagine.default_filter_settings', $config['default_filter_settings']);
+
         $container->setParameter('liip_imagine.filter_sets', $config['filter_sets']);
         $container->setParameter('liip_imagine.binary.loader.default', $config['data_loader']);
 

diff --git a/Imagine/Filter/FilterManager.php b/Imagine/Filter/FilterManager.php
@@ -55,11 +55,13 @@ class FilterManager
     public function __construct(
         FilterConfiguration $filterConfig,
         ImagineInterface $imagine,
-        MimeTypeGuesserInterface $mimeTypeGuesser
+        MimeTypeGuesserInterface $mimeTypeGuesser,
+        $defaultFilterSettings
     ) {
         $this->filterConfig = $filterConfig;
         $this->imagine = $imagine;
         $this->mimeTypeGuesser = $mimeTypeGuesser;
+        $this->defaultFilterSettings = $defaultFilterSettings;
     }
 
     /**
@@ -141,6 +143,9 @@ public function apply(BinaryInterface $binary, array $config)
         if (isset($config['jpeg_quality'])) {
             $options['jpeg_quality'] = $config['jpeg_quality'];
         }
+        elseif (isset($this->defaultFilterSettings['jpeg_quality'])) {
+            $options['jpeg_quality'] = $this->defaultFilterSettings['jpeg_quality'];
+        }
         if (isset($config['png_compression_level'])) {
             $options['png_compression_level'] = $config['png_compression_level'];
         }

diff --git a/Resources/config/imagine.xml b/Resources/config/imagine.xml
@@ -102,6 +102,7 @@
             <argument type="service" id="liip_imagine.filter.configuration" />
             <argument type="service" id="liip_imagine" />
             <argument type="service" id="liip_imagine.binary.mime_type_guesser" />
+            <argument>%liip_imagine.default_filter_settings%</argument>
         </service>
 
         <service id="liip_imagine.data.manager" class="%liip_imagine.data.manager.class%">