From 4750e55f2f19cb1663366b70361a80ca66cb7264 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Tue, 3 Apr 2018 16:19:21 +0200
Subject: [PATCH 1/1] Fix pack filter args

---
 Twig/Filter/CPackFilter.php | 26 ++++++++++----------------
 Twig/Filter/JPackFilter.php | 27 +++++++++++----------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/Twig/Filter/CPackFilter.php b/Twig/Filter/CPackFilter.php
index 806385a..2edb1c4 100644
--- a/Twig/Filter/CPackFilter.php
+++ b/Twig/Filter/CPackFilter.php
@@ -4,15 +4,13 @@
 namespace Rapsys\PackBundle\Twig\Filter;
 
 use Rapsys\PackBundle\Twig\Filter\FilterInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class CPackFilter implements FilterInterface {
 	//Default bin
-	private $bin = 'cpack';
+	private $bin;
 
 	//Default compress type
-	//XXX: can be minify or pretty
-	private $compress = 'minify';
+	private $compress;
 
 	//Twig template filename
 	private $fileName;
@@ -21,24 +19,20 @@ class CPackFilter implements FilterInterface {
 	private $line;
 
 	//Configure the object
-	public function __construct(ContainerInterface $containerInterface, $fileName, $line) {
-		//Load configuration
-		if ($containerInterface->hasParameter('rapsys_pack_cpackfilter')) {
-			if ($parameters = $containerInterface->getParameter('rapsys_pack_cpackfilter')) {
-				foreach($parameters as $k => $v) {
-					if (isset($this->$k)) {
-						$this->$k = $v;
-					}
-				}
-			}
-		}
-
+	//XXX: compress can be minify or pretty
+	public function __construct($fileName, $line, $bin = 'cpack', $compress = 'minify') {
 		//Set fileName
 		$this->fileName = $fileName;
 
 		//Set line
 		$this->line = $line;
 
+		//Set bin
+		$this->bin = $bin;
+
+		//Set compress
+		$this->compress = $compress;
+
 		//Deal with compress
 		if (!empty($this->compress)) {
 			//Append minify parameter
diff --git a/Twig/Filter/JPackFilter.php b/Twig/Filter/JPackFilter.php
index 7e1d5c6..199d980 100644
--- a/Twig/Filter/JPackFilter.php
+++ b/Twig/Filter/JPackFilter.php
@@ -4,15 +4,13 @@
 namespace Rapsys\PackBundle\Twig\Filter;
 
 use Rapsys\PackBundle\Twig\Filter\FilterInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class JPackFilter implements FilterInterface {
 	//Default bin
-	private $bin = 'jpack';
+	private $bin;
 
 	//Default compress type
-	//XXX: can be clean, shrink, obfuscate or best
-	private $compress = 'best';
+	private $compress;
 
 	//Twig template filename
 	private $fileName;
@@ -20,24 +18,21 @@ class JPackFilter implements FilterInterface {
 	//Twig template line
 	private $line;
 
-	public function __construct(ContainerInterface $containerInterface, $fileName, $line) {
-		//Load configuration
-		if ($containerInterface->hasParameter('rapsys_pack_jpackfilter')) {
-			if ($parameters = $containerInterface->getParameter('rapsys_pack_jpackfilter')) {
-				foreach($parameters as $k => $v) {
-					if (isset($this->$k)) {
-						$this->$k = $v;
-					}
-				}
-			}
-		}
-
+	//Configure the object
+	//XXX: can be clean, shrink, obfuscate or best
+	public function __construct($fileName, $line, $bin = 'jpack', $compress = 'best') {
 		//Set fileName
 		$this->fileName = $fileName;
 
 		//Set line
 		$this->line = $line;
 
+		//Set bin
+		$this->bin = $bin;
+
+		//Set compress
+		$this->compress = $compress;
+
 		//Deal with compress
 		if (!empty($this->compress)) {
 			//Append clean parameter
-- 
2.41.1