Skip to content

Commit 00790ca

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Security][WIP] Add authenticators info to the profiler [Translation] Use symfony default locale when pulling translations from providers added missing translations for Bosnian (bs) Add the missing greek translations for security core and validator component [HttpKernel] Fix return types in `EventDataCollector` Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 [Security][Validator] Add missing translations for Slovenian (sl) [Messenger] Add worker metadata inside logs [Messenger] Log when worker should stop and when `SIGTERM` is received cs fix [Security][Validator] Add missing translations for Finnish (fi) [VarDumper] returns a 500 when dd() is executed chore(VarDumper): declare that dd() never returns [MonologBridge] Deprecate the Swiftmailer handler [Cache] Commit items implicitly only when deferred keys are requested [MonologBridge] Deprecates ResetLoggersWorkerSubscriber Fix "can not" spelling [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services [Form] Fix ChoiceType Extension to effectively set and use the translator Added new CssColor constraint
2 parents 5647e86 + f055dad commit 00790ca

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

DataCollector/EventDataCollector.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\RequestStack;
1717
use Symfony\Component\HttpFoundation\Response;
18+
use Symfony\Component\VarDumper\Cloner\Data;
1819
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1920
use Symfony\Contracts\Service\ResetInterface;
2021

@@ -80,8 +81,10 @@ public function setCalledListeners(array $listeners)
8081

8182
/**
8283
* @see TraceableEventDispatcher
84+
*
85+
* @return array|Data
8386
*/
84-
public function getCalledListeners(): array
87+
public function getCalledListeners()
8588
{
8689
return $this->data['called_listeners'];
8790
}
@@ -96,8 +99,10 @@ public function setNotCalledListeners(array $listeners)
9699

97100
/**
98101
* @see TraceableEventDispatcher
102+
*
103+
* @return array|Data
99104
*/
100-
public function getNotCalledListeners(): array
105+
public function getNotCalledListeners()
101106
{
102107
return $this->data['not_called_listeners'];
103108
}
@@ -114,8 +119,10 @@ public function setOrphanedEvents(array $events)
114119

115120
/**
116121
* @see TraceableEventDispatcher
122+
*
123+
* @return array|Data
117124
*/
118-
public function getOrphanedEvents(): array
125+
public function getOrphanedEvents()
119126
{
120127
return $this->data['orphaned_events'];
121128
}

0 commit comments

Comments
 (0)