From 5379aa034b26ff7949dc80be261b31ec368b0385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Mart=C3=ADn?= Date: Mon, 30 Dec 2019 19:41:28 +0100 Subject: [PATCH] Updates for twig 3.0 --- composer.json | 2 +- .../ReactRenderer/Twig/ReactRenderExtension.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 2de31b1..5d258a9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": ">=5.5.0", "nacmartin/phpexecjs": "^3.0", - "twig/twig": "^1.20|^2.0|^3.0" + "twig/twig": "^3.0" }, "require-dev": { "squizlabs/php_codesniffer": "^2.5", diff --git a/src/Limenius/ReactRenderer/Twig/ReactRenderExtension.php b/src/Limenius/ReactRenderer/Twig/ReactRenderExtension.php index 39ef53c..6cc910d 100644 --- a/src/Limenius/ReactRenderer/Twig/ReactRenderExtension.php +++ b/src/Limenius/ReactRenderer/Twig/ReactRenderExtension.php @@ -3,10 +3,12 @@ namespace Limenius\ReactRenderer\Twig; use Psr\Cache\CacheItemPoolInterface; +use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; use Limenius\ReactRenderer\Renderer\AbstractReactRenderer; use Limenius\ReactRenderer\Context\ContextProviderInterface; -class ReactRenderExtension extends \Twig_Extension +class ReactRenderExtension extends AbstractExtension { protected $renderServerSide = false; protected $renderClientSide = false; @@ -51,10 +53,10 @@ public function setCache(CacheItemPoolInterface $cache) public function getFunctions(): array { return array( - new \Twig_SimpleFunction('react_component', array($this, 'reactRenderComponent'), array('is_safe' => array('html'))), - new \Twig_SimpleFunction('react_component_array', array($this, 'reactRenderComponentArray'), array('is_safe' => array('html'))), - new \Twig_SimpleFunction('redux_store', array($this, 'reactReduxStore'), array('is_safe' => array('html'))), - new \Twig_SimpleFunction('react_flush_buffer', array($this, 'reactFlushBuffer'), array('is_safe' => array('html'))), + new TwigFunction('react_component', array($this, 'reactRenderComponent'), array('is_safe' => array('html'))), + new TwigFunction('react_component_array', array($this, 'reactRenderComponentArray'), array('is_safe' => array('html'))), + new TwigFunction('redux_store', array($this, 'reactReduxStore'), array('is_safe' => array('html'))), + new TwigFunction('react_flush_buffer', array($this, 'reactFlushBuffer'), array('is_safe' => array('html'))), ); }