From 867e056f79d3e6a5aa327aa13c730ef9e81ec7a9 Mon Sep 17 00:00:00 2001 From: Jorn Date: Mon, 15 Dec 2025 10:15:38 +0100 Subject: [PATCH 1/3] SPIN-5090 Upgrade to Twig 3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e703a0..fdeb6fa 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "require": { "php": "~7.4|~8.0", - "twig/twig": ">=2.9", + "twig/twig": "^3.0", "doctrine/orm": "~2.3", "doctrine/dbal": ">=2.13", "doctrine/doctrine-bundle": "~1.0|~2.0", From e96cf84f69f9eac7543556edbe169feb81ddd7ab Mon Sep 17 00:00:00 2001 From: Jorn Date: Mon, 15 Dec 2025 10:46:26 +0100 Subject: [PATCH 2/3] SPIN-5090 Upgrade to Twig 3 --- Twig/Extension/AliDatatableExtension.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Twig/Extension/AliDatatableExtension.php b/Twig/Extension/AliDatatableExtension.php index 4116a6a..97835b8 100644 --- a/Twig/Extension/AliDatatableExtension.php +++ b/Twig/Extension/AliDatatableExtension.php @@ -3,11 +3,12 @@ namespace Ali\DatatableBundle\Twig\Extension; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Form\Extension\Core\Type\FormType; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Ali\DatatableBundle\Util\Datatable; +use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; +use Twig\TwigFunction; -class AliDatatableExtension extends \Twig_Extension +class AliDatatableExtension extends AbstractExtension { /** @var \Symfony\Component\DependencyInjection\ContainerInterface */ @@ -29,7 +30,7 @@ public function __construct(ContainerInterface $container) public function getFunctions() { return array( - new \Twig_SimpleFunction('datatable', array($this, 'datatable'), array("is_safe" => array("html"))) + new TwigFunction('datatable', array($this, 'datatable'), array("is_safe" => array("html"))) ); } @@ -39,7 +40,7 @@ public function getFunctions() public function getFilters() { return array( - new \Twig_SimpleFilter('dta_trans', array($this, 'dtatransFilter')) + new TwigFilter('dta_trans', array($this, 'dtatransFilter')) ); } From 87c2ed63e6aa3ad3eccf73420f91409d1babaa6c Mon Sep 17 00:00:00 2001 From: Jorn Date: Mon, 15 Dec 2025 10:54:59 +0100 Subject: [PATCH 3/3] SPIN-5090 Upgrade to Twig 3 --- Twig/Extension/TwigGetClassNameExtension.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Twig/Extension/TwigGetClassNameExtension.php b/Twig/Extension/TwigGetClassNameExtension.php index 1ffcd8d..a929824 100644 --- a/Twig/Extension/TwigGetClassNameExtension.php +++ b/Twig/Extension/TwigGetClassNameExtension.php @@ -8,7 +8,10 @@ namespace Ali\DatatableBundle\Twig\Extension; -class TwigGetClassNameExtension extends \Twig_Extension +use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; + +class TwigGetClassNameExtension extends AbstractExtension { /** * @return array @@ -16,7 +19,7 @@ class TwigGetClassNameExtension extends \Twig_Extension public function getFilters() { return array( - new \Twig_SimpleFilter('get_class_name', array($this, 'getClassNameFilter')), + new TwigFilter('get_class_name', array($this, 'getClassNameFilter')), ); }