Cleanup

[packbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 4856910886b68a5b4913bb2d6cd2cda7306c8d49..60b68b6ecee1cb99749c3d7559db583bf49966e3 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,19 +11,19 @@
 
 namespace Rapsys\PackBundle\DependencyInjection;
 
 
 namespace Rapsys\PackBundle\DependencyInjection;
 

+use Rapsys\PackBundle\RapsysPackBundle;
+

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Process\ExecutableFinder;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Process\ExecutableFinder;
 

-use Rapsys\PackBundle\RapsysPackBundle;
-

 /**
 /**

- * This is the class that validates and merges configuration from your app/config files.
+ * {@inheritdoc}

  *
  *

- * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
+ * This is the class that validates and merges configuration from your app/config files.

  *
  *

- * {@inheritdoc}
+ * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html

  */
 class Configuration implements ConfigurationInterface {
        /**
  */
 class Configuration implements ConfigurationInterface {
        /**


@@ -38,18 +38,6 @@ class Configuration implements ConfigurationInterface {
 
                //The bundle default values
                $defaults = [
 
                //The bundle default values
                $defaults = [

-                       'config' => [
-                               'name' => 'asset_url',
-                               'scheme' => 'https://',
-                               'timeout' => (int)ini_get('default_socket_timeout'),
-                               'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.2.0',
-                               'redirect' => 5
-                       ],
-                       'output' => [
-                               'css' => '@RapsysPack/css/*.pack.css',
-                               'js' =>  '@RapsysPack/js/*.pack.js',
-                               'img' => '@RapsysPack/img/*.pack.jpg'
-                       ],

                        'filters' => [
                                'css' => [
                                        0 => [
                        'filters' => [
                                'css' => [
                                        0 => [


@@ -60,6 +48,12 @@ class Configuration implements ConfigurationInterface {
                                                ]
                                        ]
                                ],
                                                ]
                                        ]
                                ],

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

                                'js' => [
                                        0 => [
                                                'class' => 'Rapsys\PackBundle\Filter\JPackFilter',
                                'js' => [
                                        0 => [
                                                'class' => 'Rapsys\PackBundle\Filter\JPackFilter',


@@ -68,18 +62,17 @@ class Configuration implements ConfigurationInterface {
                                                        'best'
                                                ]
                                        ]
                                                        'best'
                                                ]
                                        ]

-                               ],
-                               'img' => [
-                                       0 => [
-                                               'class' => 'Rapsys\PackBundle\Filter\IPackFilter',
-                                               'args' => []
-                                       ]
-                               ],
+                               ]
+                       ],
+                       #TODO: migrate to public.path, public.url and router->generateUrl ?
+                       #XXX: that would means dropping the PathPackage stuff and use static route like rapsyspack_facebook
+                       'output' => [
+                               'css' => '@RapsysPack/css/*.pack.css',
+                               'img' => '@RapsysPack/img/*.pack.jpg',
+                               'js' =>  '@RapsysPack/js/*.pack.js'

                        ],
                        ],

-                       'public' => [
-                               'path' => dirname(__DIR__).'/Resources/public',
-                               'url' => '/bundles/'.str_replace('_', '', $alias)
-                       ]
+                       'path' => dirname(__DIR__).'/Resources/public',
+                       'token' => 'asset_url'

                ];
 
                /**
                ];
 
                /**


@@ -89,32 +82,14 @@ class Configuration implements ConfigurationInterface {
                 * @link http://symfony.com/doc/current/components/config/definition.html
                 * @link https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
                 *
                 * @link http://symfony.com/doc/current/components/config/definition.html
                 * @link https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
                 *

-                * @see php bin/console config:dump-reference rapsys_pack to dump default config
-                * @see php bin/console debug:config rapsys_pack to dump config
+                * @see bin/console config:dump-reference rapsyspack to dump default config
+                * @see bin/console debug:config rapsyspack to dump config

                 */
                $treeBuilder
                        //Parameters
                        ->getRootNode()
                                ->addDefaultsIfNotSet()
                                ->children()
                 */
                $treeBuilder
                        //Parameters
                        ->getRootNode()
                                ->addDefaultsIfNotSet()
                                ->children()

-                                       ->arrayNode('config')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['config']['name'])->end()
-                                                       ->scalarNode('scheme')->cannotBeEmpty()->defaultValue($defaults['config']['scheme'])->end()
-                                                       ->integerNode('timeout')->min(0)->max(300)->defaultValue($defaults['config']['timeout'])->end()
-                                                       ->scalarNode('agent')->cannotBeEmpty()->defaultValue($defaults['config']['agent'])->end()
-                                                       ->integerNode('redirect')->min(1)->max(30)->defaultValue($defaults['config']['redirect'])->end()
-                                               ->end()
-                                       ->end()
-                                       ->arrayNode('output')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('css')->cannotBeEmpty()->defaultValue($defaults['output']['css'])->end()
-                                                       ->scalarNode('js')->cannotBeEmpty()->defaultValue($defaults['output']['js'])->end()
-                                                       ->scalarNode('img')->cannotBeEmpty()->defaultValue($defaults['output']['img'])->end()
-                                               ->end()
-                                       ->end()

                                        ->arrayNode('filters')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('filters')
                                                ->addDefaultsIfNotSet()
                                                ->children()


@@ -141,7 +116,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()

-                                                       ->arrayNode('js')
+                                                       ->arrayNode('img')

                                                                /**
                                                                 * Undocumented
                                                                 *
                                                                /**
                                                                 * Undocumented
                                                                 *


@@ -153,17 +128,17 @@ class Configuration implements ConfigurationInterface {
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

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

                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike([])
                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike([])

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

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

-                                                       ->arrayNode('img')
+                                                       ->arrayNode('js')

                                                                /**
                                                                 * Undocumented
                                                                 *
                                                                /**
                                                                 * Undocumented
                                                                 *


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

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

                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike([])
                                                                                ->end()
                                                                                ->arrayNode('args')
                                                                                        ->treatNullLike([])

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

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


@@ -187,13 +162,16 @@ class Configuration implements ConfigurationInterface {
                                                        ->end()
                                                ->end()
                                        ->end()
                                                        ->end()
                                                ->end()
                                        ->end()

-                                       ->arrayNode('public')
+                                       ->arrayNode('output')

                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                ->addDefaultsIfNotSet()
                                                ->children()

-                                                       ->scalarNode('path')->cannotBeEmpty()->defaultValue($defaults['public']['path'])->end()
-                                                       ->scalarNode('url')->cannotBeEmpty()->defaultValue($defaults['public']['url'])->end()
+                                                       ->scalarNode('css')->cannotBeEmpty()->defaultValue($defaults['output']['css'])->end()
+                                                       ->scalarNode('img')->cannotBeEmpty()->defaultValue($defaults['output']['img'])->end()
+                                                       ->scalarNode('js')->cannotBeEmpty()->defaultValue($defaults['output']['js'])->end()

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

+                                       ->scalarNode('path')->cannotBeEmpty()->defaultValue($defaults['path'])->end()
+                                       ->scalarNode('token')->cannotBeEmpty()->defaultValue($defaults['token'])->end()

                                ->end()
                        ->end();
 
                                ->end()
                        ->end();