Cleanup

[packbundle] / Twig / PackExtension.php

diff --git a/Twig/PackExtension.php b/Twig/PackExtension.php
index 4baba52f0193355f8decba71546fe705fdff66ea..23cceb67ab84d70466a55d1a85890764a1e5a96c 100644 (file)
--- a/Twig/PackExtension.php
+++ b/Twig/PackExtension.php
@@ -4,51 +4,46 @@ namespace Rapsys\PackBundle\Twig;
 
 use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;

+use Symfony\Component\Asset\Packages;

 
 class PackExtension extends \Twig_Extension {
 
 class PackExtension extends \Twig_Extension {

-       public function __construct(FileLocator $fileLocator, ContainerInterface $containerInterface) {
+       //The config
+       private $config;
+
+       //The output
+       private $output;
+
+       //The filter
+       private $filters;
+
+       public function __construct(FileLocator $fileLocator, ContainerInterface $containerInterface, Packages $assetsPackages) {

                //Set file locator
                $this->fileLocator = $fileLocator;
                //Set container interface
                $this->containerInterface = $containerInterface;
                //Set file locator
                $this->fileLocator = $fileLocator;
                //Set container interface
                $this->containerInterface = $containerInterface;

+               //Set assets packages
+               $this->assetsPackages = $assetsPackages;

 
 

-               //Set default prefix
-               $this->prefix = '@RapsysPackBundle/Resources/public/';
-
-               //Set default coutput
-               $this->coutput = 'css/*.pack.css';
-               //Set default joutput
-               $this->joutput = 'js/*.pack.js';
-               //Set default ioutput
-               $this->ioutput = 'img/*.pack.jpg';
-
-               //Set default cfilter
-               $this->cfilter = array('CPackFilter');
-               //Set default jfilter
-               $this->jfilter = array('JPackFilter');
-               //Set default ifilter
-               $this->ifilter = array('IPackFilter');
-
-               //Load configuration
-               if ($containerInterface->hasParameter('rapsys_pack')) {
-                       if ($parameters = $containerInterface->getParameter('rapsys_pack')) {
-                               foreach($parameters as $k => $v) {
-                                       if (isset($this->$k) && !empty($v)) {
-                                               $this->$k = $v;
-                                       }
-                               }
+               //Retrieve bundle config
+               if ($parameters = $containerInterface->getParameter($this->getAlias())) {
+                       foreach($parameters as $k => $v) {
+                               $this->$k = $v;

                        }
                }
                        }
                }

-
-               //Fix prefix
-               $this->prefix = $this->fileLocator->locate($this->prefix);

        }
 
        public function getTokenParsers() {
                return array(
        }
 
        public function getTokenParsers() {
                return array(

-                       new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'stylesheet', $this->coutput, $this->cfilter),
-                       new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'javascript', $this->joutput, $this->jfilter),
-                       new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'image', $this->ioutput, $this->ifilter),
+                       new PackTokenParser($this->fileLocator, $this->assetsPackages, $this->config, 'stylesheet', $this->output['css'], $this->filters['css']),
+                       new PackTokenParser($this->fileLocator, $this->assetsPackages, $this->config, 'javascript', $this->output['js'], $this->filters['js']),
+                       new PackTokenParser($this->fileLocator, $this->assetsPackages, $this->config, 'image', $this->output['img'], $this->filters['img'])

                );
        }
                );
        }

+
+       /**
+        * {@inheritdoc}
+        */
+       public function getAlias() {
+               return 'rapsys_pack';
+       }

 }
 }