Prefix with bundle name path_package and twig pack_extension aliases to avoid conflict

[packbundle] / Twig / Filter / CPackFilter.php

diff --git a/Twig/Filter/CPackFilter.php b/Twig/Filter/CPackFilter.php
index dff71c972e22ed91dd5c95bd09e8974fd0079638..ca38c3be37033ade64bffe8fb8b0b29e69cf5ddf 100644 (file)
--- a/Twig/Filter/CPackFilter.php
+++ b/Twig/Filter/CPackFilter.php
@@ -1,18 +1,16 @@
 <?php
 
-// src/Rapsys/PackBundle/Twig/Filter/CPackFilter.php
 namespace Rapsys\PackBundle\Twig\Filter;
 
 use Rapsys\PackBundle\Twig\Filter\FilterInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Error\Error;
 
 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,34 +19,30 @@ 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
                        if ($this->compress == 'minify') {
                                $this->bin .= ' --minify';
                        //Unknown compress type
-                       #XXX: default compression is pretty
+                       //XXX: default compression is pretty
                        } elseif ($this->compress !== 'pretty') {
                                //Throw an error on unknown compress
-                               throw new \Twig_Error(sprintf('Got unexpected compress for %s: %s', $this->bin, $this->compress), $this->line, $this->fileName);
+                               throw new Error(sprintf('Got unexpected compress for %s: %s', $this->bin, $this->compress), $this->line, $this->fileName);
                        }
                }
        }
@@ -82,7 +76,7 @@ class CPackFilter implements FilterInterface {
 
                        //Read content from stderr
                        if (($stderr = stream_get_contents($pipes[2]))) {
-                               throw new \Twig_Error(sprintf('Got unexpected strerr for %s: %s', $this->bin, $stderr), $this->line, $this->fileName);
+                               throw new Error(sprintf('Got unexpected strerr for %s: %s', $this->bin, $stderr), $this->line, $this->fileName);
                        }
 
                        //Close stderr
@@ -90,7 +84,7 @@ class CPackFilter implements FilterInterface {
 
                        //Close process
                        if (($ret = proc_close($proc))) {
-                               throw new \Twig_Error(sprintf('Got unexpected non zero return code %s: %d', $this->bin, $ret), $this->line, $this->fileName);
+                               throw new Error(sprintf('Got unexpected non zero return code %s: %d', $this->bin, $ret), $this->line, $this->fileName);
                        }
                }