X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/e574f584030a65cb66c7f3ac3a48e6008ff1465c..4cbd6aeb6b995561ff19c41f000d29c177ef4a58:/Extension/PackExtension.php diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php index bbf166e..aa11688 100644 --- a/Extension/PackExtension.php +++ b/Extension/PackExtension.php @@ -11,48 +11,26 @@ namespace Rapsys\PackBundle\Extension; -use Symfony\Component\Asset\PackageInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpKernel\Config\FileLocator; -use Twig\Extension\AbstractExtension; - use Rapsys\PackBundle\Parser\TokenParser; use Rapsys\PackBundle\RapsysPackBundle; use Rapsys\PackBundle\Util\IntlUtil; use Rapsys\PackBundle\Util\SluggerUtil; +use Symfony\Component\Asset\PackageInterface; +use Symfony\Component\HttpKernel\Config\FileLocator; + +use Twig\Extension\AbstractExtension; + /** * {@inheritdoc} */ class PackExtension extends AbstractExtension { /** - * The filters array - */ - protected array $filters; - - /** - * The output array - */ - protected array $output; - - /** - * The token string - */ - protected string $token; - - /** - * @link https://twig.symfony.com/doc/2.x/advanced.html - * * {@inheritdoc} + * + * @link https://twig.symfony.com/doc/2.x/advanced.html */ - public function __construct(protected ContainerInterface $container, protected IntlUtil $intl, protected FileLocator $locator, protected PackageInterface $package, protected SluggerUtil $slugger) { - //Retrieve bundle config - if ($parameters = $container->getParameter(RapsysPackBundle::getAlias())) { - //Set filters, output arrays and token string - foreach(['filters', 'output', 'token'] as $k) { - $this->$k = $parameters[$k]; - } - } + public function __construct(protected IntlUtil $intl, protected FileLocator $locator, protected PackageInterface $package, protected SluggerUtil $slugger, protected array $parameters) { } /** @@ -62,9 +40,9 @@ class PackExtension extends AbstractExtension { */ public function getTokenParsers(): array { return [ - new TokenParser($this->locator, $this->package, $this->token, 'stylesheet', $this->output['css'], $this->filters['css']), - new TokenParser($this->locator, $this->package, $this->token, 'javascript', $this->output['js'], $this->filters['js']), - new TokenParser($this->locator, $this->package, $this->token, 'image', $this->output['img'], $this->filters['img']) + new TokenParser($this->locator, $this->package, $this->parameters['token'], 'stylesheet', $this->parameters['output']['css'], $this->parameters['filters']['css']), + new TokenParser($this->locator, $this->package, $this->parameters['token'], 'javascript', $this->parameters['output']['js'], $this->parameters['filters']['js']), + new TokenParser($this->locator, $this->package, $this->parameters['token'], 'image', $this->parameters['output']['img'], $this->parameters['filters']['img']) ]; } @@ -75,18 +53,19 @@ class PackExtension extends AbstractExtension { */ public function getFilters(): array { return [ - new \Twig\TwigFilter('lcfirst', 'lcfirst'), - new \Twig\TwigFilter('ucfirst', 'ucfirst'), + new \Twig\TwigFilter('base64_decode', 'base64_decode'), + new \Twig\TwigFilter('base64_encode', 'base64_encode'), + new \Twig\TwigFilter('download', 'file_get_contents', [false, null]), new \Twig\TwigFilter('hash', [$this->slugger, 'hash']), - new \Twig\TwigFilter('unshort', [$this->slugger, 'unshort']), - new \Twig\TwigFilter('short', [$this->slugger, 'short']), - new \Twig\TwigFilter('slug', [$this->slugger, 'slug']), + new \Twig\TwigFilter('intlcurrency', [$this->intl, 'currency']), new \Twig\TwigFilter('intldate', [$this->intl, 'date'], ['needs_environment' => true]), new \Twig\TwigFilter('intlnumber', [$this->intl, 'number']), - new \Twig\TwigFilter('intlcurrency', [$this->intl, 'currency']), - new \Twig\TwigFilter('download', 'file_get_contents', [false, null]), - new \Twig\TwigFilter('base64_encode', 'base64_encode'), - new \Twig\TwigFilter('base64_decode', 'base64_decode') + new \Twig\TwigFilter('intlsize', [$this->intl, 'size']), + new \Twig\TwigFilter('lcfirst', 'lcfirst'), + new \Twig\TwigFilter('short', [$this->slugger, 'short']), + new \Twig\TwigFilter('slug', [$this->slugger, 'slug']), + new \Twig\TwigFilter('ucfirst', 'ucfirst'), + new \Twig\TwigFilter('unshort', [$this->slugger, 'unshort']) ]; } }