Remove legacy Twig_ namespace support

GromNaN · GromNaN · commit 6b8fad9280d8 · 2023-11-26T16:16:53.000+01:00
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -131,7 +131,7 @@ public function getHtmlCallGraph(): Markup
 
     public function getProfile(): Profile
     {
-        return $this->profile ??= unserialize($this->data['profile'], ['allowed_classes' => ['Twig_Profiler_Profile', Profile::class]]);
+        return $this->profile ??= unserialize($this->data['profile'], ['allowed_classes' => [Profile::class]]);
     }
 
     private function getComputedData(string $index): mixed
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -50,10 +50,6 @@ protected function getVariableGetterWithoutStrictCheck($name)
 
     protected function getVariableGetterWithStrictCheck($name)
     {
-        if (Environment::MAJOR_VERSION >= 2) {
-            return sprintf('(isset($context["%1$s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new %2$s(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name, Environment::VERSION_ID >= 20700 ? 'RuntimeError' : 'Twig_Error_Runtime');
-        }
-
-        return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);
+        return sprintf('(isset($context["%1$s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new RuntimeError(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -170,8 +170,6 @@ public function load(array $configs, ContainerBuilder $container): void
             'optimizations' => true,
         ]));
 
-        $container->registerForAutoconfiguration(\Twig_ExtensionInterface::class)->addTag('twig.extension');
-        $container->registerForAutoconfiguration(\Twig_LoaderInterface::class)->addTag('twig.loader');
         $container->registerForAutoconfiguration(ExtensionInterface::class)->addTag('twig.extension');
         $container->registerForAutoconfiguration(LoaderInterface::class)->addTag('twig.loader');
         $container->registerForAutoconfiguration(RuntimeExtensionInterface::class)->addTag('twig.runtime');
diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add argument `$label` to `VarDumper::dump()`
  * Require explicit argument when calling `VarDumper::setHandler()`
+ * Remove display of backtrace in `Twig_Template`, only `Twig\Template` are supported
 
 6.4
 ---
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -214,7 +214,7 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, boo
                 $ellipsis = $ellipsis->attr['ellipsis'] ?? 0;
 
                 if (is_file($f['file']) && 0 <= self::$srcContext) {
-                    if (!empty($f['class']) && (is_subclass_of($f['class'], 'Twig\Template') || is_subclass_of($f['class'], 'Twig_Template')) && method_exists($f['class'], 'getDebugInfo')) {
+                    if (!empty($f['class']) && is_subclass_of($f['class'], 'Twig\Template') && method_exists($f['class'], 'getDebugInfo')) {
                         $template = null;
                         if (isset($f['object'])) {
                             $template = $f['object'];

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public function getHtmlCallGraph(): Markup`
`131`	`131`
`132`	`132`	`public function getProfile(): Profile`
`133`	`133`	`{`
`134`		`- return $this->profile ??= unserialize($this->data['profile'], ['allowed_classes' => ['Twig_Profiler_Profile', Profile::class]]);`
	`134`	`+ return $this->profile ??= unserialize($this->data['profile'], ['allowed_classes' => [Profile::class]]);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`private function getComputedData(string $index): mixed`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,6 @@ protected function getVariableGetterWithoutStrictCheck($name)`
`50`	`50`
`51`	`51`	`protected function getVariableGetterWithStrictCheck($name)`
`52`	`52`	`{`
`53`		`- if (Environment::MAJOR_VERSION >= 2) {`
`54`		`- return sprintf('(isset($context["%1$s"]) \|\| array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new %2$s(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name, Environment::VERSION_ID >= 20700 ? 'RuntimeError' : 'Twig_Error_Runtime');`
`55`		`- }`
`56`		`-`
`57`		`- return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);`
	`53`	`+ return sprintf('(isset($context["%1$s"]) \|\| array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new RuntimeError(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);`
`58`	`54`	`}`
`59`	`55`	`}`