From e574f584030a65cb66c7f3ac3a48e6008ff1465c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Mon, 4 Mar 2024 16:38:15 +0100 Subject: [PATCH] Drop getAlias function Remove config array Add token member variable string --- Extension/PackExtension.php | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php index 697f469..bbf166e 100644 --- a/Extension/PackExtension.php +++ b/Extension/PackExtension.php @@ -26,9 +26,9 @@ use Rapsys\PackBundle\Util\SluggerUtil; */ class PackExtension extends AbstractExtension { /** - * The config array + * The filters array */ - protected array $config; + protected array $filters; /** * The output array @@ -36,9 +36,9 @@ class PackExtension extends AbstractExtension { protected array $output; /** - * The filter array + * The token string */ - protected array $filters; + protected string $token; /** * @link https://twig.symfony.com/doc/2.x/advanced.html @@ -47,29 +47,29 @@ class PackExtension extends AbstractExtension { */ 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(self::getAlias())) { - //Set config, output and filters arrays - foreach(['config', 'output', 'filters'] as $k) { + if ($parameters = $container->getParameter(RapsysPackBundle::getAlias())) { + //Set filters, output arrays and token string + foreach(['filters', 'output', 'token'] as $k) { $this->$k = $parameters[$k]; } } } /** - * Returns a list of filters to add to the existing list. + * Returns a filter array to add to the existing list. * * @return \Twig\TwigFilter[] */ public function getTokenParsers(): array { return [ - new TokenParser($this->locator, $this->package, $this->config, 'stylesheet', $this->output['css'], $this->filters['css']), - new TokenParser($this->locator, $this->package, $this->config, 'javascript', $this->output['js'], $this->filters['js']), - new TokenParser($this->locator, $this->package, $this->config, 'image', $this->output['img'], $this->filters['img']) + 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']) ]; } /** - * Returns a list of filters to add to the existing list. + * Returns a filter array to add to the existing list. * * @return \Twig\TwigFilter[] */ @@ -89,11 +89,4 @@ class PackExtension extends AbstractExtension { new \Twig\TwigFilter('base64_decode', 'base64_decode') ]; } - - /** - * {@inheritdoc} - */ - public function getAlias(): string { - return RapsysPackBundle::getAlias(); - } } -- 2.41.1