-<?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;
+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.<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'),
- 'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.1.3',
+ 'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.2.0',
'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' => [
- 'css' => '@RapsysPackBundle/Resources/public/css/*.pack.css',
- 'js' => '@RapsysPackBundle/Resources/public/js/*.pack.js',
- 'img' => '@RapsysPackBundle/Resources/public/img/*.pack.jpg'
+ 'css' => '@RapsysPack/css/*.pack.css',
+ 'js' => '@RapsysPack/js/*.pack.js',
+ 'img' => '@RapsysPack/img/*.pack.jpg'
],
'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' => [
- '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' => [
- 'class' => 'Rapsys\PackBundle\Twig\Filter\IPackFilter',
- 'args' => []
+ 0 => [
+ '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()
->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()
- ->defaultValue($defaults['filters']['css']['class'])
+ ->defaultValue($defaults['filters']['css'][0]['class'])
->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')
- #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()
- ->defaultValue($defaults['filters']['js']['class'])
+ ->defaultValue($defaults['filters']['js'][0]['class'])
->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')
- #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()
- ->defaultValue($defaults['filters']['img']['class'])
+ ->defaultValue($defaults['filters']['img'][0]['class'])
->end()
->arrayNode('args')
- ->treatNullLike(array())
- ->defaultValue($defaults['filters']['img']['args'])
+ ->treatNullLike([])
+ ->defaultValue($defaults['filters']['img'][0]['args'])
->scalarPrototype()->end()
->end()
->end()
->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();
Rapsys Git / packbundle / blobdiff