From: Raphaƫl Gertz Date: Tue, 3 Apr 2018 04:33:37 +0000 (+0200) Subject: Fix parameter naming X-Git-Tag: 0.0.2~5 X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/2ea87caa7cfe5a3248be9f47c514e8103dcdf730?ds=sidebyside Fix parameter naming Fix filter class naming Cleanup --- diff --git a/Twig/PackExtension.php b/Twig/PackExtension.php index ee84c47..c6e0d96 100644 --- a/Twig/PackExtension.php +++ b/Twig/PackExtension.php @@ -28,11 +28,11 @@ class PackExtension extends \Twig_Extension { $this->ioutput = 'img/*.pack.jpg'; //Set default cfilter - $this->cfilter = array('CPackFilter'); + $this->cfilter = array('Rapsys\PackBundle\Twig\Filter\CPackFilter'); //Set default jfilter - $this->jfilter = array('JPackFilter'); + $this->jfilter = array('Rapsys\PackBundle\Twig\Filter\JPackFilter'); //Set default ifilter - $this->ifilter = array('IPackFilter'); + $this->ifilter = array('Rapsys\PackBundle\Twig\Filter\IPackFilter'); //Load configuration if ($containerInterface->hasParameter('rapsys_pack')) { diff --git a/Twig/PackTokenParser.php b/Twig/PackTokenParser.php index 64de8e5..409a311 100644 --- a/Twig/PackTokenParser.php +++ b/Twig/PackTokenParser.php @@ -33,8 +33,8 @@ class PackTokenParser extends \Twig_TokenParser { if ($parameters = $this->containerInterface->getParameter('rapsys_pack')) { if (isset($parameters['timeout'])) { $timeout = $parameters['timeout']; - } elseif (isset($parameters['user_agent'])) { - $userAgent = $parameters['user_agent']; + } elseif (isset($parameters['agent'])) { + $userAgent = $parameters['agent']; } elseif (isset($parameters['redirect'])) { $redirect = $parameters['redirect']; } @@ -54,8 +54,8 @@ class PackTokenParser extends \Twig_TokenParser { if (!empty($parameters['timeout'])) { $this->timeout = $parameters['timeout']; } - if (!empty($parameters['user_agent'])) { - $this->userAgent = $parameters['user_agent']; + if (!empty($parameters['agent'])) { + $this->userAgent = $parameters['agent']; } if (!empty($parameters['redirect'])) { $this->redirect = $parameters['redirect']; @@ -201,7 +201,7 @@ class PackTokenParser extends \Twig_TokenParser { //Apply all filters foreach($filters as $filter) { //Prefix with filter - $filter = __NAMESPACE__.'\\Filter\\'.$filter; + #$filter = __NAMESPACE__.'\\Filter\\'.$filter; //Init tool object $tool = new $filter($this->containerInterface, $stream->getSourceContext(), $token->getLine()); //Process content @@ -215,8 +215,8 @@ class PackTokenParser extends \Twig_TokenParser { //Create output dir on demand if (!is_dir($parent = $dir = dirname($this->prefix.$output))) { - //XXX: set as 0777, symfony umask (0022) will reduce rights (0755) try { + //XXX: set as 0777, symfony umask (0022) will reduce rights (0755) mkdir($dir, 0777, true); } catch (\Exception $e) { throw new \Twig_Error_Syntax(sprintf('Unable to create directory: %s', $dir), $token->getLine(), $stream->getSourceContext()); @@ -240,7 +240,9 @@ class PackTokenParser extends \Twig_TokenParser { } //Retrieve asset uri - if (($output = $this->assetsPackages->getUrl($output, 'rapsys_pack')) === false) { + //XXX: was next line to support module specific asset configuration + #if (($output = $this->assetsPackages->getUrl($output, 'rapsys_pack')) === false) { + if (($output = $this->assetsPackages->getUrl($output)) === false) { throw new \Twig_Error_Syntax(sprintf('Unable to get url for asset: %s with package %s', $output, 'rapsys_pack'), $token->getLine(), $stream->getSourceContext()); }