X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/packbundle/blobdiff_plain/b583e14e403e9e9e0ff1b318128be0991073a4cb..f414da492f983455e1db3f9e89f8cb12a8a1ed8b:/DependencyInjection/Configuration.php?ds=sidebyside diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index b0de9a4..4856910 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -1,50 +1,48 @@ - + * + * 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; +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. * - * 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} */ - public function getConfigTreeBuilder() { + public function getConfigTreeBuilder(): TreeBuilder { //Get TreeBuilder object - $treeBuilder = new TreeBuilder('rapsys_pack'); + $treeBuilder = new TreeBuilder($alias = RapsysPackBundle::getAlias()); //Get ExecutableFinder object $finder = new ExecutableFinder(); - /** - * XXX: Note about the output schemes - * - * The output files are written based on the output. 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'), - 'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.1.8', + 'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.2.0', 'redirect' => 5 ], 'output' => [ @@ -55,7 +53,7 @@ class Configuration implements ConfigurationInterface { 'filters' => [ 'css' => [ 0 => [ - 'class' => 'Rapsys\PackBundle\Twig\Filter\CPackFilter', + 'class' => 'Rapsys\PackBundle\Filter\CPackFilter', 'args' => [ $finder->find('cpack', '/usr/local/bin/cpack'), 'minify' @@ -64,7 +62,7 @@ class Configuration implements ConfigurationInterface { ], 'js' => [ 0 => [ - 'class' => 'Rapsys\PackBundle\Twig\Filter\JPackFilter', + 'class' => 'Rapsys\PackBundle\Filter\JPackFilter', 'args' => [ $finder->find('jpack', '/usr/local/bin/jpack'), 'best' @@ -73,19 +71,27 @@ class Configuration implements ConfigurationInterface { ], 'img' => [ 0 => [ - 'class' => 'Rapsys\PackBundle\Twig\Filter\IPackFilter', + 'class' => 'Rapsys\PackBundle\Filter\IPackFilter', 'args' => [] ] ], + ], + 'public' => [ + 'path' => dirname(__DIR__).'/Resources/public', + 'url' => '/bundles/'.str_replace('_', '', $alias) ] ]; - //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() @@ -113,7 +119,11 @@ class Configuration implements ConfigurationInterface { ->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() @@ -123,8 +133,8 @@ class Configuration implements ConfigurationInterface { ->defaultValue($defaults['filters']['css'][0]['class']) ->end() ->arrayNode('args') - /*->isRequired()*/ - ->treatNullLike(array()) + //->isRequired() + ->treatNullLike([]) ->defaultValue($defaults['filters']['css'][0]['args']) ->scalarPrototype()->end() ->end() @@ -132,7 +142,11 @@ class Configuration implements ConfigurationInterface { ->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() @@ -142,7 +156,7 @@ class Configuration implements ConfigurationInterface { ->defaultValue($defaults['filters']['js'][0]['class']) ->end() ->arrayNode('args') - ->treatNullLike(array()) + ->treatNullLike([]) ->defaultValue($defaults['filters']['js'][0]['args']) ->scalarPrototype()->end() ->end() @@ -150,7 +164,11 @@ class Configuration implements ConfigurationInterface { ->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() @@ -160,7 +178,7 @@ class Configuration implements ConfigurationInterface { ->defaultValue($defaults['filters']['img'][0]['class']) ->end() ->arrayNode('args') - ->treatNullLike(array()) + ->treatNullLike([]) ->defaultValue($defaults['filters']['img'][0]['args']) ->scalarPrototype()->end() ->end() @@ -169,6 +187,13 @@ class Configuration implements ConfigurationInterface { ->end() ->end() ->end() + ->arrayNode('public') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('path')->cannotBeEmpty()->defaultValue($defaults['public']['path'])->end() + ->scalarNode('url')->cannotBeEmpty()->defaultValue($defaults['public']['url'])->end() + ->end() + ->end() ->end() ->end();