Skip to content

Commit 8ed51b3

Browse files
Merge branch '6.0' into 6.1
* 6.0: Fix merge [Mime] Throw exception when body in Email attach method is not ok [VarDumper][VarExporter] Deal with DatePeriod->include_end_date on PHP 8.2 [Cache] Throw when "redis_sentinel" is used with a non-Predis "class" option fix merge Bootstrap 4 fieldset for row errors [Form] Fix same choice loader with different choice values [Filesystem] Safeguard (sym)link calls Fix dumping extension config without bundle [HttpClient] Honor "max_duration" when replacing requests with async decorators [HttpClient] Add missing HttpOptions::setMaxDuration() [HttpKernel] Fix missing null type in `ErrorListener::__construct()` [HttpFoundation] [Session] Overwrite invalid session id
2 parents 4d2459d + f699db1 commit 8ed51b3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

EventListener/ErrorListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ErrorListener implements EventSubscriberInterface
3535
protected $debug;
3636
protected $exceptionsMapping;
3737

38-
public function __construct(string|object|array $controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [])
38+
public function __construct(string|object|array|null $controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [])
3939
{
4040
$this->controller = $controller;
4141
$this->logger = $logger;

0 commit comments

Comments
 (0)