Remove service container argument

[packbundle] / Extension / PackExtension.php

diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php
index d32f5bfcb0af28f3ae7bb75a87e795acb32ee82f..97e346778d832e5eca101d61f73337a6d3f58082 100644 (file)
--- a/Extension/PackExtension.php
+++ b/Extension/PackExtension.php
@@ -12,8 +12,8 @@
 namespace Rapsys\PackBundle\Extension;
 
 use Symfony\Component\Asset\PackageInterface;
 namespace Rapsys\PackBundle\Extension;
 
 use Symfony\Component\Asset\PackageInterface;

-use Symfony\Component\DependencyInjection\ContainerInterface;

 use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\HttpKernel\Config\FileLocator;

+

 use Twig\Extension\AbstractExtension;
 
 use Rapsys\PackBundle\Parser\TokenParser;
 use Twig\Extension\AbstractExtension;
 
 use Rapsys\PackBundle\Parser\TokenParser;


@@ -25,69 +25,29 @@ use Rapsys\PackBundle\Util\SluggerUtil;
  * {@inheritdoc}
  */
 class PackExtension extends AbstractExtension {
  * {@inheritdoc}
  */
 class PackExtension extends AbstractExtension {

-       //The config
-       private $config;
-
-       //The output
-       private $output;
-
-       //The filter
-       private $filters;
-
-       //The intl util
-       protected $intl;
-
-       //The file locator
-       protected $locator;
-
-       //The assets package
-       protected $package;
-
-       //The slugger util
-       protected $slugger;
-

        /**
         * @link https://twig.symfony.com/doc/2.x/advanced.html
         *
         * {@inheritdoc}
         */
        /**
         * @link https://twig.symfony.com/doc/2.x/advanced.html
         *
         * {@inheritdoc}
         */

-       public function __construct(ContainerInterface $container, IntlUtil $intl, FileLocator $locator, PackageInterface $package, SluggerUtil $slugger) {
-               //Set intl util
-               $this->intl = $intl;
-
-               //Set file locator
-               $this->locator = $locator;
-
-               //Set assets packages
-               $this->package = $package;
-
-               //Set slugger util
-               $this->slugger = $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 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 [
         *
         * @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[]
         */
         *
         * @return \Twig\TwigFilter[]
         */


@@ -107,11 +67,4 @@ class PackExtension extends AbstractExtension {
                        new \Twig\TwigFilter('base64_decode', 'base64_decode')
                ];
        }
                        new \Twig\TwigFilter('base64_decode', 'base64_decode')
                ];
        }

-
-       /**
-        * {@inheritdoc}
-        */
-       public function getAlias(): string {
-               return RapsysPackBundle::getAlias();
-       }

 }
 }