diff --git a/composer.json b/composer.json index ae84ce6..586dd28 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "pomm-project/pomm-bundle", "type": "symfony-bundle", - "description": "The Symfony2 bundle for Pomm2", + "description": "The Symfony bundle for Pomm2", "keywords": ["orm", "postgresql", "database", "symfony", "pomm"], "homepage": "http://www.pomm-project.org", "license": "MIT", @@ -21,7 +21,8 @@ "pomm-project/model-manager": "~2.0", "pomm-project/cli": "~2.0", "pomm-project/pomm-symfony-bridge": "~2.5|~3.0", - "symfony/framework-bundle": "^3.4|^4.3|^5.0" + "symfony/framework-bundle": "^3.4|^4.3|^5.0", + "twig/twig": "^3.3" }, "require-dev": { "symfony/console": "^3.4|^4.3|^5.0", @@ -42,4 +43,3 @@ } } } - diff --git a/sources/lib/Twig/Extension/ProfilerExtension.php b/sources/lib/Twig/Extension/ProfilerExtension.php index d46c0eb..d30bc5a 100644 --- a/sources/lib/Twig/Extension/ProfilerExtension.php +++ b/sources/lib/Twig/Extension/ProfilerExtension.php @@ -9,6 +9,11 @@ */ namespace PommProject\PommBundle\Twig\Extension; +use Twig\Error\LoaderError; +use Twig\Extension\AbstractExtension; +use Twig\Loader\FilesystemLoader; +use Twig\TwigFilter; + /** * ProfilerExtension * @@ -18,9 +23,9 @@ * @copyright 2014 Grégoire HUBERT * @author Nicolas JOSEPH * @license X11 {@link http://opensource.org/licenses/mit-license.php} - * @see \Twig_Extension + * @see AbstractExtension */ -class ProfilerExtension extends \Twig_Extension +class ProfilerExtension extends AbstractExtension { /** * __construct @@ -28,9 +33,10 @@ class ProfilerExtension extends \Twig_Extension * Extension constructor. * * @access public - * @param \Twig_Loader_Filesystem $loader + * @param FilesystemLoader $loader + * @throws LoaderError */ - public function __construct(\Twig_Loader_Filesystem $loader) + public function __construct(FilesystemLoader $loader) { $loader->addPath($this->getTemplateDirectory(), 'Pomm'); } @@ -53,12 +59,12 @@ private function getTemplateDirectory() /** * getFilters * - * @see \Twig_Extension + * @see AbstractExtension */ public function getFilters() { return [ - new \Twig_SimpleFilter('sql_format', function ($sql) { + new TwigFilter('sql_format', function ($sql) { return \SqlFormatter::format($sql); }), ]; @@ -67,7 +73,7 @@ public function getFilters() /** * getName * - * @see \Twig_Extension + * @see AbstractExtension */ public function getName() {