Cleanup and fix empty yaml parameter

diff --git a/Twig/PackExtension.php b/Twig/PackExtension.php
index 3b4aa072fa90711abc2114376207ba527e1f0f37..e441a47000e39bc494b57849df911a8b36c31681 100644 (file)
--- a/Twig/PackExtension.php
+++ b/Twig/PackExtension.php
@@ -6,8 +6,6 @@ use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class PackExtension extends \Twig_Extension {
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class PackExtension extends \Twig_Extension {

-       #, $prefix = '@RapsysPackBundle/Resources/public/', $cpack = '/usr/local/bin/cpack', $jpack = '/usr/local/bin/jpack'
-       #$this->kernel = $kernel;

        public function __construct(FileLocator $fileLocator, ContainerInterface $containerInterface) {
                //Set file locator
                $this->fileLocator = $fileLocator;
        public function __construct(FileLocator $fileLocator, ContainerInterface $containerInterface) {
                //Set file locator
                $this->fileLocator = $fileLocator;


@@ -29,9 +27,11 @@ class PackExtension extends \Twig_Extension {
 
                //Load configuration
                if ($containerInterface->hasParameter('rapsys_pack')) {
 
                //Load configuration
                if ($containerInterface->hasParameter('rapsys_pack')) {

-                       foreach($containerInterface->getParameter('rapsys_pack') as $k => $v) {
-                               if (isset($this->$k)) {
-                                       $this->$k = $v;
+                       if ($parameters = $containerInterface->getParameter('rapsys_pack')) {
+                               foreach($parameters as $k => $v) {
+                                       if (isset($this->$k)) {
+                                               $this->$k = $v;
+                                       }

                                }
                        }
                }
                                }
                        }
                }