X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/cbc7e3aeaa0a626e14dab855eb12da175e091ba4..b97d9b2ac779103239b4ec1bec9dc1399b5ad9e8:/Extension/PackExtension.php

diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php
index d32f5bf..bbf166e 100644
--- a/Extension/PackExtension.php
+++ b/Extension/PackExtension.php
@@ -25,69 +25,51 @@ use Rapsys\PackBundle\Util\SluggerUtil;
  * {@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 filters array
+	 */
+	protected array $filters;
 
-	//The assets package
-	protected $package;
+	/**
+	 * The output array
+	 */
+	protected array $output;
 
-	//The slugger util
-	protected $slugger;
+	/**
+	 * The token string
+	 */
+	protected string $token;
 
 	/**
 	 * @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;
-
+	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[]
 	 */
@@ -107,11 +89,4 @@ class PackExtension extends AbstractExtension {
 			new \Twig\TwigFilter('base64_decode', 'base64_decode')
 		];
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAlias(): string {
-		return RapsysPackBundle::getAlias();
-	}
 }