Skip to content

Commit 70547a3

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: fix merge [FrameworkBundle] Allow to specify `null` for exception mapping configuration values Fix BinaryFileResponse content type detection logic [Notifier] [Expo] Throw exception on error-response from expo api Bump Symfony version to 6.0.14 Update VERSION for 6.0.13 Update CHANGELOG for 6.0.13 Bump Symfony version to 5.4.14 Update VERSION for 5.4.13 Update CHANGELOG for 5.4.13 Bump Symfony version to 4.4.47 Update VERSION for 4.4.46 Update CONTRIBUTORS for 4.4.46 Update CHANGELOG for 4.4.46 [Security] Fix login url matching when app is not run with url rewriting or from a sub folder
2 parents 9da43a5 + 29ecbad commit 70547a3

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

EventListener/ErrorListener.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ class ErrorListener implements EventSubscriberInterface
3333
protected $controller;
3434
protected $logger;
3535
protected $debug;
36+
/**
37+
* @var array<class-string, array{log_level: string|null, status_code: int<100,599>|null}>
38+
*/
3639
protected $exceptionsMapping;
3740

41+
/**
42+
* @param array<class-string, array{log_level: string|null, status_code: int<100,599>|null}> $exceptionsMapping
43+
*/
3844
public function __construct(string|object|array|null $controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [])
3945
{
4046
$this->controller = $controller;

0 commit comments

Comments
 (0)