Fix unintended BC break for the exception_controller twig setting

stof · stof · commit 683c79f271b7 · 2025-12-10T09:58:27.000+01:00
Setting this setting to `null` was the opt-in for the Symfony 5.0
behavior in TwigBundle and so was kept supported as a no-op in 5.0+ to
support the migration path, without ever being deprecated.
This setting was removed in 7.4.0 without deprecation, without realizing
that it was part of this compat layer. This replaces this removal with a
deprecation (reported as if it was introduced in 7.4 from the start)
while the removal will be preserved in Symfony 8.0.
diff --git a/UPGRADE-7.4.md b/UPGRADE-7.4.md
@@ -183,6 +183,11 @@ Translation
 
  * Deprecate `TranslatableMessage::__toString`
 
+TwigBundle
+----------
+
+ * Deprecate setting the `exception_controller` config to `null`. This was a legacy opt-out of a deprecation that is a no-op since Symfony 5.0. Remove that setting entirely instead.
+
 Uid
 ---
 
diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.4
+---
+
+* Deprecate setting the `exception_controller` config to `null`. This was a legacy opt-out of a deprecation that is a no-op since Symfony 5.0. Remove that setting entirely instead.
+
 7.3
 ---
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Mime\HtmlToTextConverter\HtmlToTextConverterInterface;
 
 /**
@@ -33,7 +34,23 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         $rootNode
             ->docUrl('https://symfony.com/doc/{version:major}.{version:minor}/reference/configuration/twig.html', 'symfony/twig-bundle')
-        ->end();
+            ->beforeNormalization()
+                ->ifArray()
+                ->then(function ($v) {
+                    if (!\array_key_exists('exception_controller', $v)) {
+                        return $v;
+                    }
+
+                    if (isset($v['exception_controller'])) {
+                        throw new InvalidConfigurationException('Option "exception_controller" under "twig" must be null or unset, use "error_controller" under "framework" instead.');
+                    }
+
+                    unset($v['exception_controller']);
+                    trigger_deprecation('symfony/twig-bundle', '7.4', 'Setting the "exception_controller" option under "twig" to null is deprecated. Omit this legacy no-op option instead.');
+
+                    return $v;
+                })
+            ->end();
 
         $this->addFormThemesSection($rootNode);
         $this->addGlobalsSection($rootNode);
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -20,6 +20,7 @@
         "composer-runtime-api": ">=2.1",
         "symfony/config": "^7.4|^8.0",
         "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/twig-bridge": "^7.3|^8.0",
         "symfony/http-foundation": "^6.4|^7.0|^8.0",
         "symfony/http-kernel": "^6.4.13|^7.1.6|^8.0",
