Enable Twig strict variables

Author: trasher

composer-dependency-analyser.php

@@ -61,10 +61,11 @@
     ->ignoreErrorsOnExtension('ext-zend-opcache', [ErrorType::SHADOW_DEPENDENCY])
     ->ignoreErrorsOnPackage('paragonie/sodium_compat', [ErrorType::UNUSED_DEPENDENCY])
 
-    // Bundles are only loaded in a conditional block that checks if the environment is dev
+    // Only loaded in a conditional block that checks if the environment is dev
     ->ignoreErrorsOnPackages([
         'symfony/twig-bundle',
         'symfony/web-profiler-bundle',
+        'alisqi/twigqi',
     ], [ErrorType::DEV_DEPENDENCY_IN_PROD])
 
     ->ignoreErrorsOnExtension('ext-bcmath', [ErrorType::UNUSED_DEPENDENCY]) // Required by tc-lib-barcode

composer.json

@@ -103,6 +103,7 @@
     },
     "require-dev": {
         "ext-xml": "*",
+        "alisqi/twigqi": "^3.0",
         "atoum/atoum": "dev-main#e43a6a84809635cf5dcdf80bf3c773e7cf1d5a04",
         "atoum/stubs": "dev-master#fb8890f347a7ecf1e3cf2b5a139a8b038359a6ab",
         "friendsofphp/php-cs-fixer": "^3.75",

composer.lock

@@ -149,6 +149,7 @@ public function getConstantsOverride(string $root_dir): array
                 ],
             ],
             self::DEVELOPMENT => [
+                'GLPI_STRICT_ENV'                    => true,
                 'GLPI_WEBHOOK_ALLOW_RESPONSE_SAVING' => '1',
             ],
         };

src/Glpi/Application/Environment.php

@@ -34,6 +34,9 @@
 
 namespace Glpi\Application\View;
 
+use AlisQI\TwigQI\Extension as TwigIQExtension;
+use AlisQI\TwigQI\Logger\TriggerErrorLogger;
+use Glpi\Application\Environment as GLPIEnvironment;
 use Glpi\Application\View\Extension\ConfigExtension;
 use Glpi\Application\View\Extension\DataHelpersExtension;
 use Glpi\Application\View\Extension\DocumentExtension;
@@ -52,7 +55,7 @@
 use Glpi\Kernel\Kernel;
 use Plugin;
 use Session;
-use Twig\Environment;
+use Twig\Environment as TwigEnvironment;
 use Twig\Extension\DebugExtension;
 use Twig\Extra\String\StringExtension;
 use Twig\Loader\FilesystemLoader;
@@ -62,7 +65,7 @@
  */
 class TemplateRenderer
 {
-    private Environment $environment;
+    private TwigEnvironment $environment;
 
     public function __construct(string $rootdir = GLPI_ROOT, ?string $cachedir = null)
     {
@@ -80,10 +83,11 @@ public function __construct(string $rootdir = GLPI_ROOT, ?string $cachedir = nul
             $loader->addPath(Plugin::getPhpDir($plugin_key . '/templates'), $plugin_key);
         }
 
-        $glpi_environment = \Glpi\Application\Environment::get();
+        $glpi_environment = GLPIEnvironment::get();
         $env_params = [
             'debug' => $glpi_environment->shouldEnableExtraDevAndDebugTools() || ($_SESSION['glpi_use_mode'] ?? null) === Session::DEBUG_MODE,
             'auto_reload' => $glpi_environment->shouldExpectResourcesToChange(),
+            'strict_variables' => GLPI_STRICT_ENV,
         ];
 
         $tpl_cachedir = $cachedir . '/templates';
@@ -96,7 +100,7 @@ public function __construct(string $rootdir = GLPI_ROOT, ?string $cachedir = nul
             $env_params['cache'] = $tpl_cachedir;
         }
 
-        $this->environment = new Environment(
+        $this->environment = new TwigEnvironment(
             $loader,
             $env_params
         );
@@ -118,6 +122,13 @@ public function __construct(string $rootdir = GLPI_ROOT, ?string $cachedir = nul
         $this->environment->addExtension(new SearchExtension());
         $this->environment->addExtension(new SessionExtension());
         $this->environment->addExtension(new TeamExtension());
+        if (GLPIEnvironment::get()->shouldEnableExtraDevAndDebugTools() || GLPI_STRICT_ENV) {
+            $this->environment->addExtension(
+                new TwigIQExtension(
+                    new TriggerErrorLogger()
+                )
+            );
+        }
 
         // add superglobals
         $this->environment->addGlobal('_post', $_POST);
@@ -144,9 +155,9 @@ public static function getInstance(): TemplateRenderer
     /**
      * Return Twig environment used to handle templates.
      *
-     * @return Environment
+     * @return TwigEnvironment
      */
-    public function getEnvironment(): Environment
+    public function getEnvironment(): TwigEnvironment
     {
         return $this->environment;
     }

src/Glpi/Application/View/TemplateRenderer.php

@@ -34,7 +34,7 @@
 
 {% if get_current_user() is not null %}
     {# @var selected_user \User #}
-    {% if selected_user is empty %}
+    {% if selected_user is not defined or selected_user is empty %}
         {% set selected_user = get_current_user() %}
     {% endif %}
 

templates/components/helpdesk_forms/delegation_alert.html.twig

@@ -54,7 +54,7 @@
                 </div>
             </div>
          {% endif %}
-         {% if entry_i['comment_validation']|length %}
+         {% if entry_i['comment_validation'] is defined and entry_i['comment_validation']|length %}
             <div class='alert alert-info mt-2'>
                 <div class='d-flex'>
                     <div><i class='ti ti-quote me-2'></i></div>