minor symfony#52741 [TwigBridge][TwigBundle][VarDumper] Remove legacy Twig_ namespace support (GromNaN)

fabpot · fabpot · commit ec77d941c0c0 · 2023-11-26T18:05:49.000+01:00
This PR was merged into the 7.0 branch. Discussion ---------- [TwigBridge][TwigBundle][VarDumper] Remove legacy Twig_ namespace support | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Twig 3.0 is required by Symfony 7.0+, support for legacy class names is not necessary. Nothing added to TwigBundle changelog as "Drop support for Twig 2" is already mentionned. For VarDumper, since there is no version constraint for `twig/twig`, I added a line to the changelog. Commits ------- 6b8fad9 Remove legacy Twig_ namespace support
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`	`}`