Add string to latin conversion function

[packbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index a9bff3bfa141e77516d996f1e0d734c67d62821d..c3e62df4110c1615be69ece7164e0164e4ab7ce8 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,85 +1,96 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys PackBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */

 
 namespace Rapsys\PackBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 namespace Rapsys\PackBundle\DependencyInjection;
 
 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\Process\ExecutableFinder;
 

+use Rapsys\PackBundle\RapsysPackBundle;
+

 /**
  * This is the class that validates and merges configuration from your app/config files.
  *
 /**
  * This is the class that validates and merges configuration from your app/config files.
  *

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

  */
 class Configuration implements ConfigurationInterface {
        /**
         * {@inheritdoc}
         */
  */
 class Configuration implements ConfigurationInterface {
        /**
         * {@inheritdoc}
         */

-       public function getConfigTreeBuilder() {
+       public function getConfigTreeBuilder(): TreeBuilder {

                //Get TreeBuilder object
                //Get TreeBuilder object

-               $treeBuilder = new TreeBuilder('rapsys_pack');
+               $treeBuilder = new TreeBuilder($alias = RapsysPackBundle::getAlias());

 
                //Get ExecutableFinder object
                $finder = new ExecutableFinder();
 
 
                //Get ExecutableFinder object
                $finder = new ExecutableFinder();
 

-               /**
-                * XXX: Note about the output schemes
-                *
-                * The output files are written based on the output.<ext> scheme with the * replaced by the hashed path of packed files
-                *
-                * The following service configuration make twig render the output file path with the right '/' basePath prefix:
-                * services:
-                *     assets.pack_package:
-                *         class: Rapsys\PackBundle\Asset\PathPackage
-                *         arguments: [ '/', '@assets.empty_version_strategy', '@assets.context' ]
-                *     rapsys_pack.twig.pack_extension:
-                *         class: Rapsys\PackBundle\Twig\PackExtension
-                *         arguments: [ '@file_locator', '@service_container', '@assets.pack_package' ]
-                *         tags: [ twig.extension ]
-                */
-

                //The bundle default values
                $defaults = [
                        'config' => [
                                'name' => 'asset_url',
                                'scheme' => 'https://',
                                'timeout' => (int)ini_get('default_socket_timeout'),
                //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.1.3',
+                               'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.2.2',

                                'redirect' => 5
                        ],
                                'redirect' => 5
                        ],

+                       #TODO: migrate to public.path, public.url and router->generateUrl ?
+                       #XXX: that would means dropping the PathPackage stuff and use static route like rapsys_pack_facebook

                        'output' => [
                        'output' => [

-                               'css' => 'css/*.pack.css',
-                               'js' => 'js/*.pack.js',
-                               'img' => 'img/*.pack.jpg'
+                               'css' => '@RapsysPack/css/*.pack.css',
+                               'js' =>  '@RapsysPack/js/*.pack.js',
+                               'img' => '@RapsysPack/img/*.pack.jpg'

                        ],
                        'filters' => [
                                'css' => [
                        ],
                        'filters' => [
                                'css' => [

-                                       'class' => 'Rapsys\PackBundle\Twig\Filter\CPackFilter',
-                                       'args' => [
-                                               $finder->find('cpack', '/usr/local/bin/cpack'),
-                                               'minify'
+                                       0 => [
+                                               'class' => 'Rapsys\PackBundle\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\Filter\JPackFilter',
+                                               'args' => [
+                                                       $finder->find('jpack', '/usr/local/bin/jpack'),
+                                                       'best'
+                                               ]

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

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

                                ],
                                ],

-                       ]
+                       ],
+                       'path' => dirname(__DIR__).'/Resources/public',

                ];
 
                ];
 

-               //Here we define the parameters that are allowed to configure the bundle.
-               //XXX: see https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php for default value and description
-               //XXX: see http://symfony.com/doc/current/components/config/definition.html
-               //XXX: see https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
-               //XXX: see php bin/console config:dump-reference rapsys_pack to dump default config
-               //XXX: see php bin/console debug:config rapsys_pack to dump config
+               /**
+                * Defines parameters allowed to configure the bundle
+                *
+                * @link https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+                * @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
+                */

                $treeBuilder
                        //Parameters
                        ->getRootNode()
                $treeBuilder
                        //Parameters
                        ->getRootNode()


@@ -107,55 +118,67 @@ class Configuration implements ConfigurationInterface {
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('css')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('css')

-                                                               #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                               /**
+                                                                * Undocumented
+                                                                *
+                                                                * @see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                                */

                                                                ->addDefaultChildrenIfNoneSet()
                                                                ->arrayPrototype()
                                                                        ->children()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                ->addDefaultChildrenIfNoneSet()
                                                                ->arrayPrototype()
                                                                        ->children()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

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

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

-                                                                                       /*->isRequired()*/
-                                                                                       ->treatNullLike(array())
-                                                                                       ->defaultValue($defaults['filters']['css']['args'])
+                                                                                       //->isRequired()
+                                                                                       ->treatNullLike([])
+                                                                                       ->defaultValue($defaults['filters']['css'][0]['args'])

                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                        ->arrayNode('js')
                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                        ->arrayNode('js')

-                                                               #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                               /**
+                                                                * Undocumented
+                                                                *
+                                                                * @see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                                */

                                                                ->addDefaultChildrenIfNoneSet()
                                                                ->arrayPrototype()
                                                                        ->children()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                ->addDefaultChildrenIfNoneSet()
                                                                ->arrayPrototype()
                                                                        ->children()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

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

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

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

                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                        ->arrayNode('img')
                                                                                        ->scalarPrototype()->end()
                                                                                ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                        ->arrayNode('img')

-                                                               #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                               /**
+                                                                * Undocumented
+                                                                *
+                                                                * @see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                                */

                                                                ->addDefaultChildrenIfNoneSet()
                                                                ->arrayPrototype()
                                                                        ->children()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()
                                                                ->addDefaultChildrenIfNoneSet()
                                                                ->arrayPrototype()
                                                                        ->children()
                                                                                ->scalarNode('class')
                                                                                        ->isRequired()
                                                                                        ->cannotBeEmpty()

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

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

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

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


@@ -163,6 +186,7 @@ class Configuration implements ConfigurationInterface {
                                                        ->end()
                                                ->end()
                                        ->end()
                                                        ->end()
                                                ->end()
                                        ->end()

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

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