symfony · angelov · Jan 5, 2023 · Jan 6, 2023
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -280,6 +280,10 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('argument_resolver.backed_enum_resolver');
         }
 
+        if (!class_exists(ExpressionLanguage::class)) {
+            $container->removeDefinition('exception_listener.expression_language');
+        }
+
         $loader->load('services.php');
         $loader->load('fragment_renderer.php');
         $loader->load('error_renderer.php');

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DateTimeValueResolver;
@@ -118,10 +119,18 @@
                 service('logger')->nullOnInvalid(),
                 param('kernel.debug'),
                 abstract_arg('an exceptions to log & status code mapping'),
+                service('exception_listener.expression_language')->nullOnInvalid(),
             ])
             ->tag('kernel.event_subscriber')
             ->tag('monolog.logger', ['channel' => 'request'])
 
+        ->set('exception_listener.expression_language', ExpressionLanguage::class)
+            ->args([service('cache.exception_listener_expression_language')->nullOnInvalid()])
+
+        ->set('cache.exception_listener_expression_language')
+            ->parent('cache.system')
+            ->tag('cache.pool')
+
         ->set('controller.cache_attribute_listener', CacheAttributeListener::class)
             ->tag('kernel.event_subscriber')
 

diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add `#[WithHttpStatus]` for defining status codes for exceptions
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
  * Add `#[WithLogLevel]` for defining log levels for exceptions
+ * Allow dynamic values for headers specified within `#[WithHttpStatus]`
 
 6.2
 ---

diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -15,6 +15,8 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\ExpressionLanguage\Expression;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
 use Symfony\Component\HttpKernel\Attribute\WithLogLevel;
@@ -39,16 +41,18 @@ class ErrorListener implements EventSubscriberInterface
      * @var array<class-string, array{log_level: string|null, status_code: int<100,599>|null}>
      */
     protected $exceptionsMapping;
+    protected $expressionLanguage;
 
     /**
      * @param array<class-string, array{log_level: string|null, status_code: int<100,599>|null}> $exceptionsMapping
      */
-    public function __construct(string|object|array|null $controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [])
+    public function __construct(string|object|array|null $controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [], ExpressionLanguage $expressionLanguage = null)
     {
         $this->controller = $controller;
         $this->logger = $logger;
         $this->debug = $debug;
         $this->exceptionsMapping = $exceptionsMapping;
+        $this->expressionLanguage = $expressionLanguage;
     }
 
     public function logKernelException(ExceptionEvent $event)
@@ -76,8 +80,13 @@ public function logKernelException(ExceptionEvent $event)
             if ($attributes) {
                 /** @var WithHttpStatus $instance */
                 $instance = $attributes[0]->newInstance();
+                $headers = $instance->headers;
 
-                $throwable = new HttpException($instance->statusCode, $throwable->getMessage(), $throwable, $instance->headers);
+                foreach ($headers as $header => $value) {
+                    $headers[$header] = $value instanceof Expression ? $this->expressionLanguage->evaluate($value, ['this' => $throwable]) : $value;
+                }
+
+                $throwable = new HttpException($instance->statusCode, $throwable->getMessage(), $throwable, $headers);
                 $event->setThrowable($throwable);
             }
         }

diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -16,6 +16,8 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\ExpressionLanguage\Expression;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
@@ -161,7 +163,7 @@ public function testHandleHttpAttribute(\Throwable $exception, int $expectedStat
     {
         $request = new Request();
         $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, $exception);
-        $l = new ErrorListener('not used');
+        $l = new ErrorListener('not used', expressionLanguage: new ExpressionLanguage());
         $l->logKernelException($event);
         $l->onKernelException($event);
 
@@ -288,6 +290,7 @@ public static function exceptionWithAttributeProvider()
     {
         yield [new WithCustomUserProvidedAttribute(), 208, ['name' => 'value']];
         yield [new WithGeneralAttribute(), 412, ['some' => 'thing']];
+        yield [new WithDynamicHeader('Example'), 404, ['name' => 'The name is Example.']];
     }
 }
 
@@ -353,3 +356,16 @@ class WithGeneralAttribute extends \Exception
 class WarningWithLogLevelAttribute extends \Exception
 {
 }
+
+#[WithHttpStatus(
+    statusCode: 404,
+    headers: [
+        'name' => new Expression('"The name is " ~ this.name ~ "."'),
+    ]
+)]
+class WithDynamicHeader extends \Exception
+{
+    public function __construct(public readonly string $name)
+    {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -69,7 +69,8 @@
         "symfony/browser-kit": "",
         "symfony/config": "",
         "symfony/console": "",
-        "symfony/dependency-injection": ""
+        "symfony/dependency-injection": "",
+        "symfony/expression-language": "For setting dynamic header values within the WithHttpStatus attribute"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpKernel\\": "" },