Merge branch '3.x' into 4.x

* 3.x: Remove the templateClassPrefix property on Environment
twigphp · Jul 31, 2024 · 01a3831 · 01a3831
2 parents 96b11f7 + 205ea9e
commit 01a3831
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/Environment.php b/src/Environment.php
@@ -68,7 +68,6 @@ class Environment
      */
     private array $loadedTemplates;
     private bool $strictVariables;
-    private string $templateClassPrefix = '__TwigTemplate_';
     private CacheInterface|string|false $originalCache;
     private ExtensionSet $extensionSet;
     /**
@@ -280,7 +279,7 @@ public function getTemplateClass(string $name, ?int $index = null): string
     {
         $key = $this->getLoader()->getCacheKey($name).$this->optionsHash;
 
-        return $this->templateClassPrefix.hash('xxh128', $key).(null === $index ? '' : '___'.$index);
+        return '__TwigTemplate_'.hash('xxh128', $key).(null === $index ? '' : '___'.$index);
     }
 
     /**

diff --git a/src/Test/IntegrationTestCase.php b/src/Test/IntegrationTestCase.php
@@ -186,10 +186,6 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
                 $twig->addFunction($function);
             }
 
-            // avoid using the same PHP class name for different cases
-            $p = new \ReflectionProperty($twig, 'templateClassPrefix');
-            $p->setValue($twig, '__TwigTemplate_'.hash('xxh128', random_bytes(32), false).'_');
-
             $deprecations = [];
             try {
                 $prevHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$prevHandler) {