Updated to support Symfony 5.0 & Twig 3.0

Author: Victor Macko

Datatable/AbstractDatatable.php

@@ -20,7 +20,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Twig_Environment;
+use Twig\Environment;
 
 abstract class AbstractDatatable implements DatatableInterface
 {
@@ -62,7 +62,7 @@ abstract class AbstractDatatable implements DatatableInterface
     /**
      * The Twig Environment.
      *
-     * @var Twig_Environment
+     * @var Environment
      */
     protected $twig;
 
@@ -154,7 +154,7 @@ public function __construct(
         TranslatorInterface $translator,
         RouterInterface $router,
         EntityManagerInterface $em,
-        Twig_Environment $twig
+        Environment $twig
     ) {
         $this->validateName();
 

Datatable/Column/AbstractColumn.php

@@ -19,7 +19,7 @@
 use Sg\DatatablesBundle\Datatable\OptionsTrait;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\RouterInterface;
-use Twig_Environment;
+use Twig\Environment;
 
 abstract class AbstractColumn implements ColumnInterface
 {
@@ -915,7 +915,7 @@ public function getTwig()
     /**
      * @return $this
      */
-    public function setTwig(Twig_Environment $twig)
+    public function setTwig(Environment $twig)
     {
         $this->twig = $twig;
 

Datatable/Column/ColumnBuilder.php

@@ -17,7 +17,7 @@
 use Exception;
 use Sg\DatatablesBundle\Datatable\Factory;
 use Symfony\Component\Routing\RouterInterface;
-use Twig_Environment;
+use Twig\Environment;
 
 class ColumnBuilder
 {
@@ -88,7 +88,7 @@ class ColumnBuilder
     /**
      * @param string $datatableName
      */
-    public function __construct(ClassMetadata $metadata, Twig_Environment $twig, RouterInterface $router, $datatableName, EntityManagerInterface $em)
+    public function __construct(ClassMetadata $metadata, Environment $twig, RouterInterface $router, $datatableName, EntityManagerInterface $em)
     {
         $this->metadata = $metadata;
         $this->twig = $twig;

Datatable/DatatableFactory.php

@@ -17,7 +17,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Twig_Environment;
+use Twig\Environment;
 
 class DatatableFactory
 {
@@ -69,7 +69,7 @@ public function __construct(
         TranslatorInterface $translator,
         RouterInterface $router,
         EntityManagerInterface $em,
-        Twig_Environment $twig
+        Environment $twig
     ) {
         $this->authorizationChecker = $authorizationChecker;
         $this->securityToken = $securityToken;

Tests/DatatableTest.php

@@ -17,7 +17,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Twig_Environment;
+use Twig\Environment;
 
 /**
  * @internal
@@ -38,7 +38,7 @@ public function testCreate()
         /** @noinspection PhpUndefinedMethodInspection */
         $router = $this->createMock(RouterInterface::class);
         /** @noinspection PhpUndefinedMethodInspection */
-        $twig = $this->createMock(Twig_Environment::class);
+        $twig = $this->createMock(Environment::class);
 
         /** @noinspection PhpUndefinedMethodInspection */
         $em = $this->getMockBuilder(EntityManager::class)

Twig/DatatableTwigExtension.php

@@ -18,12 +18,12 @@
 use Sg\DatatablesBundle\Datatable\Filter\FilterInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
-use Twig_Environment;
-use Twig_Extension;
-use Twig_SimpleFilter;
-use Twig_SimpleFunction;
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 
-class DatatableTwigExtension extends Twig_Extension
+class DatatableTwigExtension extends AbstractExtension
 {
     /**
      * The PropertyAccessor.
@@ -55,27 +55,27 @@ public function getName()
     public function getFunctions()
     {
         return [
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'sg_datatables_render',
                 [$this, 'datatablesRender'],
                 ['is_safe' => ['html'], 'needs_environment' => true]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'sg_datatables_render_html',
                 [$this, 'datatablesRenderHtml'],
                 ['is_safe' => ['html'], 'needs_environment' => true]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'sg_datatables_render_js',
                 [$this, 'datatablesRenderJs'],
                 ['is_safe' => ['html'], 'needs_environment' => true]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'sg_datatables_render_filter',
                 [$this, 'datatablesRenderFilter'],
                 ['is_safe' => ['html'], 'needs_environment' => true]
             ),
-            new Twig_SimpleFunction(
+            new TwigFunction(
                 'sg_datatables_render_multiselect_actions',
                 [$this, 'datatablesRenderMultiselectActions'],
                 ['is_safe' => ['html'], 'needs_environment' => true]
@@ -89,7 +89,7 @@ public function getFunctions()
     public function getFilters()
     {
         return [
-            new Twig_SimpleFilter('sg_datatables_bool_var', [$this, 'boolVar']),
+            new TwigFilter('sg_datatables_bool_var', [$this, 'boolVar']),
         ];
     }
 
@@ -102,7 +102,7 @@ public function getFilters()
      *
      * @return string
      */
-    public function datatablesRender(Twig_Environment $twig, DatatableInterface $datatable)
+    public function datatablesRender(Environment $twig, DatatableInterface $datatable)
     {
         return $twig->render(
             '@SgDatatables/datatable/datatable.html.twig',
@@ -117,7 +117,7 @@ public function datatablesRender(Twig_Environment $twig, DatatableInterface $dat
      *
      * @return string
      */
-    public function datatablesRenderHtml(Twig_Environment $twig, DatatableInterface $datatable)
+    public function datatablesRenderHtml(Environment $twig, DatatableInterface $datatable)
     {
         return $twig->render(
             '@SgDatatables/datatable/datatable_html.html.twig',
@@ -132,7 +132,7 @@ public function datatablesRenderHtml(Twig_Environment $twig, DatatableInterface
      *
      * @return string
      */
-    public function datatablesRenderJs(Twig_Environment $twig, DatatableInterface $datatable)
+    public function datatablesRenderJs(Environment $twig, DatatableInterface $datatable)
     {
         return $twig->render(
             '@SgDatatables/datatable/datatable_js.html.twig',
@@ -149,7 +149,7 @@ public function datatablesRenderJs(Twig_Environment $twig, DatatableInterface $d
      *
      * @return string
      */
-    public function datatablesRenderFilter(Twig_Environment $twig, DatatableInterface $datatable, ColumnInterface $column, $position)
+    public function datatablesRenderFilter(Environment $twig, DatatableInterface $datatable, ColumnInterface $column, $position)
     {
         /** @var FilterInterface $filter */
         $filter = $this->accessor->getValue($column, 'filter');
@@ -181,7 +181,7 @@ public function datatablesRenderFilter(Twig_Environment $twig, DatatableInterfac
      *
      * @return string
      */
-    public function datatablesRenderMultiselectActions(Twig_Environment $twig, ColumnInterface $multiselectColumn, $pipeline)
+    public function datatablesRenderMultiselectActions(Environment $twig, ColumnInterface $multiselectColumn, $pipeline)
     {
         $parameters = [];
         $values = [];

composer.json

@@ -21,12 +21,12 @@
         "php": ">=7.1",
         "doctrine/orm": "^2.5",
         "friendsofsymfony/jsrouting-bundle": "^1.6|^2.0",
-        "symfony/framework-bundle": "^3.4|^4.1",
-        "symfony/options-resolver": "^3.4|^4.1",
-        "symfony/property-access": "^3.4|^4.1",
-        "symfony/security": "^3.4|^4.1",
-        "symfony/translation": "^3.4|^4.1",
-        "twig/twig": "^2.9"
+        "symfony/framework-bundle": "^3.4|^4.1|^5.0",
+        "symfony/options-resolver": "^3.4|^4.1|^5.0",
+        "symfony/property-access": "^3.4|^4.1|^5.0",
+        "symfony/security": "^3.4|^4.1|^5.0",
+        "symfony/translation": "^3.4|^4.1|^5.0",
+        "twig/twig": "^2.9|^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "5.7.*",