Add parameter type declarations to contracts.

Author: derrabus

Event.php

@@ -13,84 +13,42 @@
 
 use Psr\EventDispatcher\StoppableEventInterface;
 
-if (interface_exists(StoppableEventInterface::class)) {
+/**
+ * Event is the base class for classes containing event data.
+ *
+ * This class contains no event data. It is used by events that do not pass
+ * state information to an event handler when an event is raised.
+ *
+ * You can call the method stopPropagation() to abort the execution of
+ * further listeners in your event listener.
+ *
+ * @author Guilherme Blanco <[email protected]>
+ * @author Jonathan Wage <[email protected]>
+ * @author Roman Borschel <[email protected]>
+ * @author Bernhard Schussek <[email protected]>
+ * @author Nicolas Grekas <[email protected]>
+ */
+class Event implements StoppableEventInterface
+{
+    private $propagationStopped = false;
+
     /**
-     * Event is the base class for classes containing event data.
-     *
-     * This class contains no event data. It is used by events that do not pass
-     * state information to an event handler when an event is raised.
-     *
-     * You can call the method stopPropagation() to abort the execution of
-     * further listeners in your event listener.
-     *
-     * @author Guilherme Blanco <[email protected]>
-     * @author Jonathan Wage <[email protected]>
-     * @author Roman Borschel <[email protected]>
-     * @author Bernhard Schussek <[email protected]>
-     * @author Nicolas Grekas <[email protected]>
+     * {@inheritdoc}
      */
-    class Event implements StoppableEventInterface
+    public function isPropagationStopped(): bool
     {
-        private $propagationStopped = false;
-
-        /**
-         * Returns whether further event listeners should be triggered.
-         */
-        public function isPropagationStopped(): bool
-        {
-            return $this->propagationStopped;
-        }
-
-        /**
-         * Stops the propagation of the event to further event listeners.
-         *
-         * If multiple event listeners are connected to the same event, no
-         * further event listener will be triggered once any trigger calls
-         * stopPropagation().
-         */
-        public function stopPropagation(): void
-        {
-            $this->propagationStopped = true;
-        }
+        return $this->propagationStopped;
     }
-} else {
+
     /**
-     * Event is the base class for classes containing event data.
-     *
-     * This class contains no event data. It is used by events that do not pass
-     * state information to an event handler when an event is raised.
+     * Stops the propagation of the event to further event listeners.
      *
-     * You can call the method stopPropagation() to abort the execution of
-     * further listeners in your event listener.
-     *
-     * @author Guilherme Blanco <[email protected]>
-     * @author Jonathan Wage <[email protected]>
-     * @author Roman Borschel <[email protected]>
-     * @author Bernhard Schussek <[email protected]>
-     * @author Nicolas Grekas <[email protected]>
+     * If multiple event listeners are connected to the same event, no
+     * further event listener will be triggered once any trigger calls
+     * stopPropagation().
      */
-    class Event
+    public function stopPropagation(): void
     {
-        private $propagationStopped = false;
-
-        /**
-         * Returns whether further event listeners should be triggered.
-         */
-        public function isPropagationStopped(): bool
-        {
-            return $this->propagationStopped;
-        }
-
-        /**
-         * Stops the propagation of the event to further event listeners.
-         *
-         * If multiple event listeners are connected to the same event, no
-         * further event listener will be triggered once any trigger calls
-         * stopPropagation().
-         */
-        public function stopPropagation(): void
-        {
-            $this->propagationStopped = true;
-        }
+        $this->propagationStopped = true;
     }
 }

EventDispatcherInterface.php

@@ -13,46 +13,19 @@
 
 use Psr\EventDispatcher\EventDispatcherInterface as PsrEventDispatcherInterface;
 
-if (interface_exists(PsrEventDispatcherInterface::class)) {
-    /**
-     * Allows providing hooks on domain-specific lifecycles by dispatching events.
-     */
-    interface EventDispatcherInterface extends PsrEventDispatcherInterface
-    {
-        /**
-         * Dispatches an event to all registered listeners.
-         *
-         * For BC with Symfony 4, the $eventName argument is not declared explicitly on the
-         * signature of the method. Implementations that are not bound by this BC constraint
-         * MUST declare it explicitly, as allowed by PHP.
-         *
-         * @param object      $event     The event to pass to the event handlers/listeners
-         * @param string|null $eventName The name of the event to dispatch. If not supplied,
-         *                               the class of $event should be used instead.
-         *
-         * @return object The passed $event MUST be returned
-         */
-        public function dispatch($event/*, string $eventName = null*/);
-    }
-} else {
+/**
+ * Allows providing hooks on domain-specific lifecycles by dispatching events.
+ */
+interface EventDispatcherInterface extends PsrEventDispatcherInterface
+{
     /**
-     * Allows providing hooks on domain-specific lifecycles by dispatching events.
+     * Dispatches an event to all registered listeners.
+     *
+     * @param object      $event     The event to pass to the event handlers/listeners
+     * @param string|null $eventName The name of the event to dispatch. If not supplied,
+     *                               the class of $event should be used instead.
+     *
+     * @return object The passed $event MUST be returned
      */
-    interface EventDispatcherInterface
-    {
-        /**
-         * Dispatches an event to all registered listeners.
-         *
-         * For BC with Symfony 4, the $eventName argument is not declared explicitly on the
-         * signature of the method. Implementations that are not bound by this BC constraint
-         * MUST declare it explicitly, as allowed by PHP.
-         *
-         * @param object      $event     The event to pass to the event handlers/listeners
-         * @param string|null $eventName The name of the event to dispatch. If not supplied,
-         *                               the class of $event should be used instead.
-         *
-         * @return object The passed $event MUST be returned
-         */
-        public function dispatch($event/*, string $eventName = null*/);
-    }
+    public function dispatch(object $event, string $eventName = null): object;
 }

composer.json

@@ -16,10 +16,10 @@
         }
     ],
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.2.9",
+        "psr/event-dispatcher": "^1"
     },
     "suggest": {
-        "psr/event-dispatcher": "",
         "symfony/event-dispatcher-implementation": ""
     },
     "autoload": {
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }