From: Raphaël Gertz <git@rapsys.eu>
Date: Sun, 8 Aug 2021 12:29:27 +0000 (+0200)
Subject: Add hash, short and unshort twig filter
X-Git-Tag: 0.2.0~34
X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/0d6adabf6050f4496f683fab894e0da5ac42d57b?ds=sidebyside

Add hash, short and unshort twig filter
New tree layout
Add strict types
Improve documentation
Cleanup
---

diff --git a/Extension/PackExtension.php b/Extension/PackExtension.php
index 91a7a89..118de0c 100644
--- a/Extension/PackExtension.php
+++ b/Extension/PackExtension.php
@@ -1,12 +1,27 @@
-<?php
-// src/Rapsys/PackBundle/Twig/PackExtension.php
-namespace Rapsys\PackBundle\Twig;
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys PackBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Rapsys\PackBundle\Extension;
 
-use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Asset\PackageInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Config\FileLocator;
 use Twig\Extension\AbstractExtension;
 
+use Rapsys\PackBundle\Util\SluggerUtil;
+use Rapsys\PackBundle\Parser\TokenParser;
+
+/**
+ * {@inheritdoc}
+ */
 class PackExtension extends AbstractExtension {
 	//The config
 	private $config;
@@ -20,13 +35,24 @@ class PackExtension extends AbstractExtension {
 	//The file locator
 	protected $locator;
 
+	//The slugger instance
+	protected $slugger;
+
 	//The assets package
 	protected $package;
 
-	public function __construct(FileLocator $locator, ContainerInterface $container, PackageInterface $package) {
+	/**
+	 * @link https://twig.symfony.com/doc/2.x/advanced.html
+	 *
+	 * {@inheritdoc}
+	 */
+	public function __construct(FileLocator $locator, ContainerInterface $container, PackageInterface $package, SluggerUtil $slugger) {
 		//Set file locator
 		$this->locator = $locator;
 
+		//Set slugger
+		$this->slugger = $slugger;
+
 		//Set assets packages
 		$this->package = $package;
 
@@ -39,18 +65,36 @@ class PackExtension extends AbstractExtension {
 		}
 	}
 
-	public function getTokenParsers() {
+	/**
+	 * Returns a list of filters 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'])
+		];
+	}
+
+	/**
+	 * Returns a list of filters to add to the existing list.
+	 *
+	 * @return \Twig\TwigFilter[]
+	 */
+	public function getFilters(): array {
 		return [
-			new PackTokenParser($this->locator, $this->package, $this->config, 'stylesheet', $this->output['css'], $this->filters['css']),
-			new PackTokenParser($this->locator, $this->package, $this->config, 'javascript', $this->output['js'], $this->filters['js']),
-			new PackTokenParser($this->locator, $this->package, $this->config, 'image', $this->output['img'], $this->filters['img'])
+			new \Twig\TwigFilter('hash', [$this->slugger, 'hash']),
+			new \Twig\TwigFilter('unshort', [$this->slugger, 'unshort']),
+			new \Twig\TwigFilter('short', [$this->slugger, 'short'])
 		];
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getAlias() {
+	public function getAlias(): string {
 		return 'rapsys_pack';
 	}
 }