Add compatibility with Twig 3 and BC layer for Twig 1 and 2

Author: tobias-93

DependencyInjection/AdmingeneratorFormExtensionsExtension.php

@@ -8,6 +8,8 @@
 use Admingenerator\FormExtensionsBundle\Form\Extension\NoValidateExtension;
 use Admingenerator\FormExtensionsBundle\Form\Extension\SingleUploadExtension;
 use Admingenerator\FormExtensionsBundle\Twig\Extension\ImageAssetsExtension;
+use Admingenerator\FormExtensionsBundle\Twig\Extension\IncludeGlobalsExtension;
+use Admingenerator\FormExtensionsBundle\Twig\Extension\LegacyIncludeGlobalsExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
@@ -16,6 +18,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Twig\Environment;
 
 /**
  * Loads FormExtensions configuration
@@ -46,9 +49,11 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->configureAssetsExtension($container, $config['upload_manager'], $config['image_manipulator']);
 
-        $this->configureExtensions($config['extensions'], $container);
+        $this->configureFormExtensions($config['extensions'], $container);
 
         $this->loadUploadCollectionListener($config['upload_collection'], $container);
+
+        $this->loadGlobalsExtension($container);
     }
 
     /**
@@ -57,7 +62,7 @@ public function load(array $configs, ContainerBuilder $container)
      * @param array            $config
      * @param ContainerBuilder $container
      */
-    private function configureExtensions(array $config, ContainerBuilder $container) {
+    private function configureFormExtensions(array $config, ContainerBuilder $container) {
         if ($config['autocomplete']) {
             $this->registerExtension($container, 'form.type_extension.autocomplete', AutocompleteExtension::class);
         }
@@ -143,4 +148,11 @@ private function configureAssetsExtension(ContainerBuilder $container, string $u
         $assetsExtensionDefinition->addTag('twig.extension');
         $container->setDefinition('admingenerator.twig.extension.image_assets', $assetsExtensionDefinition);
     }
+
+    private function loadGlobalsExtension(ContainerBuilder $container) {
+        $globalsExtensionDefinition = Environment::MAJOR_VERSION > 2 ? new Definition(IncludeGlobalsExtension::class) : new Definition(LegacyIncludeGlobalsExtension::class);
+        $globalsExtensionDefinition->setArgument('$container', new Reference('service_container'));
+        $globalsExtensionDefinition->addTag('twig.extension');
+        $container->setDefinition('admingenerator.twig.extension.include_globals', $globalsExtensionDefinition);
+    }
 }

Resources/config/services.xml

@@ -113,13 +113,6 @@
             <tag name="form.type" />
         </service>
 
-        <!-- Twig extensions -->
-        
-        <service id="admingenerator.twig.extension.include_globals" class="Admingenerator\FormExtensionsBundle\Twig\Extension\IncludeGlobalsExtension">
-            <tag name="twig.extension" />
-            <argument type="service" id="service_container" />
-        </service>
-        
         <!-- Custom services -->
         <service id="admingenerator.form.file_storage.local" class="Admingenerator\FormExtensionsBundle\Storage\LocalFileStorage">
             <argument type="service" id="session" />

Twig/Extension/IncludeGlobalsExtension.php

@@ -7,7 +7,7 @@
 use Twig\Extension\GlobalsInterface;
 
 /**
- * This extension adds global variables based on bundles configuration.
+ * This extension adds global variables based on bundles configuration. For Twig 3 and higher.
  *
  * @author Piotr Gołębiewski <[email protected]>
  */
@@ -23,7 +23,7 @@ public function __construct(ContainerInterface $container)
     /**
      * {@inheritdoc}
      */
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return array(
             's2a_formextensions_include_jquery'     => $this->container->getParameter('admingenerator.form.include_jquery'),

Twig/Extension/LegacyIncludeGlobalsExtension.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Admingenerator\FormExtensionsBundle\Twig\Extension;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
+
+/**
+ * This extension adds global variables based on bundles configuration. Only for Twig 1 and 2.
+ *
+ * @author Piotr Gołębiewski <[email protected]>
+ */
+class LegacyIncludeGlobalsExtension extends AbstractExtension implements GlobalsInterface
+{
+    protected $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGlobals()
+    {
+        return array(
+            's2a_formextensions_include_jquery'     => $this->container->getParameter('admingenerator.form.include_jquery'),
+            's2a_formextensions_include_jqueryui'   => $this->container->getParameter('admingenerator.form.include_jqueryui'),
+            's2a_formextensions_include_momentjs'   => $this->container->getParameter('admingenerator.form.include_momentjs'),
+            's2a_formextensions_include_blueimp'    => $this->container->getParameter('admingenerator.form.include_blueimp'),
+            's2a_formextensions_include_gmaps'      => $this->container->getParameter('admingenerator.form.include_gmaps'),
+        );
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'admingenerator.twig.extension.include_globals';
+    }
+}