Incorporate feedback

- Per @akrabat, the "3.0.0" verbiage needed to be on the same line as the
  annotation.

Author: weierophinney

src/EventManager.php

@@ -62,8 +62,8 @@ public function __construct($identifiers = null)
     /**
      * Set the event class to utilize
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  string $class
      * @return EventManager
@@ -77,8 +77,8 @@ public function setEventClass($class)
     /**
      * Set shared event manager
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param SharedEventManagerInterface $sharedEventManager
      * @return EventManager
@@ -93,8 +93,8 @@ public function setSharedManager(SharedEventManagerInterface $sharedEventManager
     /**
      * Remove any shared event manager currently attached
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @return void
      */
@@ -221,12 +221,14 @@ public function trigger($event, $target = null, $argv = [], $callback = null)
      * Triggers listeners until the provided callback evaluates the return
      * value of one as true, or until all listeners have been executed.
      *
+     * @deprecated The signature of this method will change in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/changed.md}
+     *     for details.
      * @param  string|EventInterface $event
      * @param  string|object $target Object calling emit, or symbol describing target (such as static method name)
      * @param  array|ArrayAccess $argv Array of arguments; typically, should be associative
      * @param  callable $callback
      * @return ResponseCollection
-     * @deprecated Please use trigger()
      * @throws Exception\InvalidCallbackException if invalid callable provided
      */
     public function triggerUntil($event, $target, $argv = null, $callback = null)
@@ -325,8 +327,8 @@ public function attach($event, $callback = null, $priority = 1)
      * one or more times, typically to attach to multiple events using local
      * methods.
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  ListenerAggregateInterface $aggregate
      * @param  int $priority If provided, a suggested priority for the aggregate to use
@@ -378,8 +380,8 @@ public function detach($listener)
      * Listener aggregates accept an EventManagerInterface instance, and call detach()
      * of all previously attached listeners.
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  ListenerAggregateInterface $aggregate
      * @return mixed return value of {@link ListenerAggregateInterface::detach()}
@@ -392,8 +394,8 @@ public function detachAggregate(ListenerAggregateInterface $aggregate)
     /**
      * Retrieve all registered events
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @return array
      */
@@ -405,8 +407,8 @@ public function getEvents()
     /**
      * Retrieve all listeners for a given event
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  string $event
      * @return PriorityQueue

src/EventManagerInterface.php

@@ -44,12 +44,14 @@ public function trigger($event, $target = null, $argv = [], $callback = null);
      * - Passing event name, target, Event object, and callback
      * - Passing event name, target, array|ArrayAccess of arguments, and callback
      *
+     * @deprecated The signature of this method will change in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/changed.md}
+     *     for details.
      * @param  string|EventInterface $event
      * @param  object|string $target
      * @param  array|object $argv
      * @param  callable $callback
      * @return ResponseCollection
-     * @deprecated Please use trigger()
      */
     public function triggerUntil($event, $target, $argv = null, $callback = null);
 
@@ -74,8 +76,8 @@ public function detach($listener);
     /**
      * Get a list of events for which this collection has listeners
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @return array
      */
@@ -84,8 +86,8 @@ public function getEvents();
     /**
      * Retrieve a list of listeners registered to a given event
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  string $event
      * @return array|object
@@ -103,8 +105,8 @@ public function clearListeners($event);
     /**
      * Set the event class to utilize
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  string $class
      * @return EventManagerInterface
@@ -137,8 +139,8 @@ public function addIdentifiers($identifiers);
     /**
      * Attach a listener aggregate
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  ListenerAggregateInterface $aggregate
      * @param  int $priority If provided, a suggested priority for the aggregate to use
@@ -149,8 +151,8 @@ public function attachAggregate(ListenerAggregateInterface $aggregate, $priority
     /**
      * Detach a listener aggregate
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  ListenerAggregateInterface $aggregate
      * @return mixed return value of {@link ListenerAggregateInterface::detach()}

src/GlobalEventManager.php

@@ -18,8 +18,8 @@
  * Use the EventManager when you want to create a per-instance notification
  * system for your objects.
  *
- * @deprecated This class is deprecated with 2.6.0, and will be removed in
- *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+ * @deprecated This class is deprecated with 2.6.0, and will be removed in 3.0.0.
+ *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
  *     for details.
  */
 class GlobalEventManager

src/SharedEventAggregateAwareInterface.php

@@ -12,8 +12,8 @@
 /**
  * Interface for allowing attachment of shared aggregate listeners.
  *
- * @deprecated This interface is deprecated with 2.6.0, and will be removed in
- *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+ * @deprecated This interface is deprecated with 2.6.0, and will be removed in 3.0.0.
+ *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
  *     for details.
  */
 interface SharedEventAggregateAwareInterface

src/SharedEventManager.php

@@ -123,8 +123,8 @@ public function detachAggregate(SharedListenerAggregateInterface $aggregate)
     /**
      * Retrieve all registered events for a given resource
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  string|int $id
      * @return array

src/SharedEventManagerAwareInterface.php

@@ -12,8 +12,8 @@
 /**
  * Interface to automate setter injection for a SharedEventManagerInterface instance
  *
- * @deprecated This interface is deprecated with 2.6.0, and will be removed in
- *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+ * @deprecated This interface is deprecated with 2.6.0, and will be removed in 3.0.0.
+ *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
  *     for details.
  */
 interface SharedEventManagerAwareInterface extends SharedEventsCapableInterface

src/SharedEventManagerInterface.php

@@ -49,8 +49,8 @@ public function detach($id, CallbackHandler $listener);
     /**
      * Retrieve all registered events for a given resource
      *
-     * @deprecated This method is deprecated with 2.6.0, and will be removed in
-     *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+     * @deprecated This method is deprecated with 2.6.0, and will be removed in 3.0.0.
+     *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
      *     for details.
      * @param  string|int $id
      * @return array

src/SharedListenerAggregateInterface.php

@@ -17,8 +17,8 @@
  * then be called with the current SharedEventManager instance, allowing the class to
  * wire up one or more listeners.
  *
- * @deprecated This interface is deprecated with 2.6.0, and will be removed in
- *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+ * @deprecated This interface is deprecated with 2.6.0, and will be removed in 3.0.0.
+ *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
  *     for details.
  */
 interface SharedListenerAggregateInterface

src/StaticEventManager.php

@@ -12,8 +12,8 @@
 /**
  * Static version of EventManager
  *
- * @deprecated This class is deprecated with 2.6.0, and will be removed in
- *     3.0.0. See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
+ * @deprecated This class is deprecated with 2.6.0, and will be removed in 3.0.0.
+ *     See {@link https://github.com/zendframework/zend-eventmanager/blob/develop/doc/book/migration/removed.md}
  *     for details.
  */
 class StaticEventManager extends SharedEventManager