Remove service container argument

[packbundle] / Extension / PackExtension.php

diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php
index 697f4696afc64a3c6c306f132fba94411a84531c..6b77a491470c686b3b06b8aa830da4b06bf2fdb6 100644 (file)
--- a/Extension/PackExtension.php
+++ b/Extension/PackExtension.php
@@ -25,51 +25,29 @@ use Rapsys\PackBundle\Util\SluggerUtil;
  * {@inheritdoc}
  */
 class PackExtension extends AbstractExtension {
-       /**
-        * The config array
-        */
-       protected array $config;
-
-       /**
-        * The output array
-        */
-       protected array $output;
-
-       /**
-        * The filter array
-        */
-       protected array $filters;
-
        /**
         * @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(self::getAlias())) {
-                       //Set config, output and filters arrays
-                       foreach(['config', 'output', 'filters'] 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) {
        }
 
        /**
-        * 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->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'])
                ];
        }
 
        /**
-        * 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 +67,4 @@ class PackExtension extends AbstractExtension {
                        new \Twig\TwigFilter('base64_decode', 'base64_decode')
                ];
        }
-
-       /**
-        * {@inheritdoc}
-        */
-       public function getAlias(): string {
-               return RapsysPackBundle::getAlias();
-       }
 }