Move interface to symfony contract

jderusse · jderusse · commit d24ac0251c6d · 2019-04-02T00:27:02.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -53,7 +53,6 @@
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Component\EventDispatcher\EventListenerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Finder\Finder;
@@ -118,6 +117,7 @@
 use Symfony\Component\Yaml\Command\LintCommand as BaseYamlLintCommand;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\EventDispatcher\EventListenerInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\Service\ResetInterface;
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -18,8 +18,8 @@
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\EventListenerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Contracts\EventDispatcher\EventListenerInterface;
 
 /**
  * Compiler pass to register tagged services for an event dispatcher.
@@ -90,7 +90,7 @@ public function process(ContainerBuilder $container)
                     $event['method'] = 'on'.preg_replace_callback([
                         '/(?<=\b)[a-z]/i',
                         '/[^a-z0-9]/i',
-                    ], function ($matches) { return strtoupper($matches[0]); }, (false === $p = \strrpos($event['event'], '\\')) ? $event['event'] : \substr($event['event'], $p + 1));
+                    ], function ($matches) { return strtoupper($matches[0]); }, (false === $p = strrpos($event['event'], '\\')) ? $event['event'] : substr($event['event'], $p + 1));
                     $event['method'] = preg_replace('/[^a-z0-9]/i', '', $event['method']);
 
                     if (null === $reflection) {
diff --git a/src/Symfony/Component/EventDispatcher/EventListenerInterface.php b/src/Symfony/Component/EventDispatcher/EventListenerInterface.php
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -16,8 +16,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
-use Symfony\Component\EventDispatcher\EventListenerInterface;
 use Symfony\Component\HttpKernel\Event\KernelEvent;
+use Symfony\Contracts\EventDispatcher\EventListenerInterface;
 
 class RegisterListenersPassTest extends TestCase
 {
diff --git a/src/Symfony/Contracts/EventDispatcher/EventListenerInterface.php b/src/Symfony/Contracts/EventDispatcher/EventListenerInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\EventDispatcher;
+
+/**
+ * Marker interface for event listeners.
+ *
+ * @author Jérémy Derussé <jeremy@derusse.com>
+ *
+ * The `__invoke` method is required and the `$event` argument have to be Type-Hinted with the listened event's class
+ * in order to be auto-configured.
+ *
+ * @method void __invoke(Object $event, string $eventName, EventDispatcherInterface $dispatcher)
+ */
+interface EventListenerInterface
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`17`	`17`	`use Symfony\Component\DependencyInjection\Reference;`
`18`	`18`	`use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;`
`19`		`-use Symfony\Component\EventDispatcher\EventListenerInterface;`
`20`	`19`	`use Symfony\Component\HttpKernel\Event\KernelEvent;`
	`20`	`+use Symfony\Contracts\EventDispatcher\EventListenerInterface;`
`21`	`21`
`22`	`22`	`class RegisterListenersPassTest extends TestCase`
`23`	`23`	`{`