Skip to content

Commit 9ab309a

Browse files
Merge branch '3.4' into 4.4
* 3.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents 3e8ea5c + 94da160 commit 9ab309a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Debug/TraceableEventDispatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function dispatch($event/*, string $eventName = null*/)
145145
if (\is_object($event)) {
146146
$eventName = $eventName ?? \get_class($event);
147147
} else {
148-
@trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as first argument is deprecated since Symfony 4.3, pass it second and provide the event object first instead.', EventDispatcherInterface::class), E_USER_DEPRECATED);
148+
@trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as first argument is deprecated since Symfony 4.3, pass it second and provide the event object first instead.', EventDispatcherInterface::class), \E_USER_DEPRECATED);
149149
$swap = $event;
150150
$event = $eventName ?? new Event();
151151
$eventName = $swap;

EventDispatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function dispatch($event/*, string $eventName = null*/)
5555
if (\is_object($event)) {
5656
$eventName = $eventName ?? \get_class($event);
5757
} elseif (\is_string($event) && (null === $eventName || $eventName instanceof ContractsEvent || $eventName instanceof Event)) {
58-
@trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.', EventDispatcherInterface::class), E_USER_DEPRECATED);
58+
@trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.', EventDispatcherInterface::class), \E_USER_DEPRECATED);
5959
$swap = $event;
6060
$event = $eventName ?? new Event();
6161
$eventName = $swap;

LegacyEventDispatcherProxy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static function decorate(?ContractsEventDispatcherInterface $dispatcher):
3838
return $dispatcher;
3939
}
4040

41-
@trigger_error(sprintf('The signature of the "%s::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.', $r->class), E_USER_DEPRECATED);
41+
@trigger_error(sprintf('The signature of the "%s::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.', $r->class), \E_USER_DEPRECATED);
4242

4343
$self = new self();
4444
$self->dispatcher = $dispatcher;
@@ -60,7 +60,7 @@ public function dispatch($event/*, string $eventName = null*/)
6060
if (\is_object($event)) {
6161
$eventName = $eventName ?? \get_class($event);
6262
} elseif (\is_string($event) && (null === $eventName || $eventName instanceof ContractsEvent || $eventName instanceof Event)) {
63-
@trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.', ContractsEventDispatcherInterface::class), E_USER_DEPRECATED);
63+
@trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.', ContractsEventDispatcherInterface::class), \E_USER_DEPRECATED);
6464
$swap = $event;
6565
$event = $eventName ?? new Event();
6666
$eventName = $swap;

0 commit comments

Comments
 (0)