Add context supporting getBaseUrl feature

[packbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 22ae9d9d0126c8843be70de5200ea9b2aeebf1c5..b0de9a4619dc02df54ec864dac52c95d089c9687 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -44,7 +44,7 @@ class Configuration implements ConfigurationInterface {
                                'name' => 'asset_url',
                                'scheme' => 'https://',
                                'timeout' => (int)ini_get('default_socket_timeout'),
                                'name' => 'asset_url',
                                'scheme' => 'https://',
                                'timeout' => (int)ini_get('default_socket_timeout'),

-                               'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.1.3',
+                               'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.1.8',

                                'redirect' => 5
                        ],
                        'output' => [
                                'redirect' => 5
                        ],
                        'output' => [


@@ -54,22 +54,28 @@ class Configuration implements ConfigurationInterface {
                        ],
                        'filters' => [
                                'css' => [
                        ],
                        'filters' => [
                                'css' => [

-                                       'class' => 'Rapsys\PackBundle\Twig\Filter\CPackFilter',
-                                       'args' => [
-                                               $finder->find('cpack', '/usr/local/bin/cpack'),
-                                               'minify'
+                                       0 => [
+                                               'class' => 'Rapsys\PackBundle\Twig\Filter\CPackFilter',
+                                               'args' => [
+                                                       $finder->find('cpack', '/usr/local/bin/cpack'),
+                                                       'minify'
+                                               ]

                                        ]
                                ],
                                'js' => [
                                        ]
                                ],
                                'js' => [

-                                       'class' => 'Rapsys\PackBundle\Twig\Filter\JPackFilter',
-                                       'args' => [
-                                               $finder->find('jpack', '/usr/local/bin/jpack'),
-                                               'best'
+                                       0 => [
+                                               'class' => 'Rapsys\PackBundle\Twig\Filter\JPackFilter',
+                                               'args' => [
+                                                       $finder->find('jpack', '/usr/local/bin/jpack'),
+                                                       'best'
+                                               ]

                                        ]
                                ],
                                'img' => [
                                        ]
                                ],
                                'img' => [

-                                       'class' => 'Rapsys\PackBundle\Twig\Filter\IPackFilter',
-                                       'args' => []
+                                       0 => [
+                                               'class' => 'Rapsys\PackBundle\Twig\Filter\IPackFilter',
+                                               'args' => []
+                                       ]

                                ],
                        ]
                ];
                                ],
                        ]
                ];


@@ -114,12 +120,12 @@ class Configuration implements ConfigurationInterface {
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

-                                                                                       ->defaultValue($defaults['filters']['css']['class'])
+                                                                                       ->defaultValue($defaults['filters']['css'][0]['class'])

                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        /*->isRequired()*/
                                                                                        ->treatNullLike(array())
                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        /*->isRequired()*/
                                                                                        ->treatNullLike(array())

-                                                                                       ->defaultValue($defaults['filters']['css']['args'])
+                                                                                       ->defaultValue($defaults['filters']['css'][0]['args'])

                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()


@@ -133,11 +139,11 @@ class Configuration implements ConfigurationInterface {
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

-                                                                                       ->defaultValue($defaults['filters']['js']['class'])
+                                                                                       ->defaultValue($defaults['filters']['js'][0]['class'])

                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike(array())
                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike(array())

-                                                                                       ->defaultValue($defaults['filters']['js']['args'])
+                                                                                       ->defaultValue($defaults['filters']['js'][0]['args'])

                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()


@@ -151,11 +157,11 @@ class Configuration implements ConfigurationInterface {
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

-                                                                                       ->defaultValue($defaults['filters']['img']['class'])
+                                                                                       ->defaultValue($defaults['filters']['img'][0]['class'])

                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike(array())
                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike(array())

-                                                                                       ->defaultValue($defaults['filters']['img']['args'])
+                                                                                       ->defaultValue($defaults['filters']['img'][0]['args'])

                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()