From: Raphaƫl Gertz Date: Thu, 7 Mar 2024 16:53:27 +0000 (+0100) Subject: Replace filters, output and token with parameters argument X-Git-Tag: 0.4.0~17 X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/780564d1998c2e41b4f9a145b5191a66dbaf6ed4?ds=sidebyside;hp=b69214e3aa8c18b333a58b160aa22fa2c356065f Replace filters, output and token with parameters argument --- diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php index bbf166e..6b77a49 100644 --- a/Extension/PackExtension.php +++ b/Extension/PackExtension.php @@ -25,34 +25,12 @@ use Rapsys\PackBundle\Util\SluggerUtil; * {@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} */ - 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 ContainerInterface $container, 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']) ]; }