bug #31459 Fix the interface incompatibility of EventDispatchers (keulinho)

fabpot · fabpot · commit 4559a656cc57 · 2019-05-13T10:20:44.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- Fix the interface incompatibility of EventDispatchers The `LegacyEventDispatcherProxy` now implements the full `EventDispatcherInterface` from the `EventDispatcherBundle`. Before it just implemented the Interface from the `Contracts` Bundle, that made it incompatible with the `WrappedListener`. This fixes #31457. | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31457 | License | MIT | Doc PR | / Commits ------- bdeeae1 Fix the interface incompatibility of EventDispatchers
diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php
@@ -13,7 +13,7 @@
 
 use Psr\EventDispatcher\StoppableEventInterface;
 use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;
 
 /**
  * An helper class to provide BC/FC with the legacy signature of EventDispatcherInterface::dispatch().
@@ -26,7 +26,7 @@ final class LegacyEventDispatcherProxy implements EventDispatcherInterface
 {
     private $dispatcher;
 
-    public static function decorate(?EventDispatcherInterface $dispatcher): ?EventDispatcherInterface
+    public static function decorate(?ContractsEventDispatcherInterface $dispatcher): ?ContractsEventDispatcherInterface
     {
         if (null === $dispatcher) {
             return null;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Psr\EventDispatcher\StoppableEventInterface;`
`15`	`15`	`use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;`
`16`		`-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;`
	`16`	`+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* An helper class to provide BC/FC with the legacy signature of EventDispatcherInterface::dispatch().`
`@@ -26,7 +26,7 @@ final class LegacyEventDispatcherProxy implements EventDispatcherInterface`
`26`	`26`	`{`
`27`	`27`	`private $dispatcher;`
`28`	`28`
`29`		`- public static function decorate(?EventDispatcherInterface $dispatcher): ?EventDispatcherInterface`
	`29`	`+ public static function decorate(?ContractsEventDispatcherInterface $dispatcher): ?ContractsEventDispatcherInterface`
`30`	`30`	`{`
`31`	`31`	`if (null === $dispatcher) {`
`32`	`32`	`return null;`