Merge pull request zendframework/zendframework#2135 from Thinkscape/h…

…otfix/callable-not-callback

Change all 'callback' typehints to 'callable'

src/EventManager.php

@@ -177,7 +177,7 @@ public function addIdentifiers($identifiers)
      * @param  string $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  null|callback $callback
+     * @param  null|callable $callback
      * @return ResponseCollection All listener return values
      * @throws Exception\InvalidCallbackException
      */
@@ -219,9 +219,9 @@ public function trigger($event, $target = null, $argv = array(), $callback = nul
      * @param  string $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
+     * @param  callable $callback
      * @return ResponseCollection
-     * @throws Exception\InvalidCallbackException if invalid callback provided
+     * @throws Exception\InvalidCallbackException if invalid callable provided
      */
     public function triggerUntil($event, $target, $argv = null, $callback = null)
     {
@@ -266,9 +266,9 @@ public function triggerUntil($event, $target, $argv = null, $callback = null)
      * be triggered for every event.
      *
      * @param  string|array|ListenerAggregateInterface $event An event or array of event names. If a ListenerAggregateInterface, proxies to {@link attachAggregate()}.
-     * @param  callback|int $callback If string $event provided, expects PHP callback; for a ListenerAggregateInterface $event, this will be the priority
-     * @param  int $priority If provided, the priority at which to register the callback
-     * @return CallbackHandler|mixed CallbackHandler if attaching callback (to allow later unsubscribe); mixed if attaching aggregate
+     * @param  callable|int $callback If string $event provided, expects PHP callback; for a ListenerAggregateInterface $event, this will be the priority
+     * @param  int $priority If provided, the priority at which to register the callable
+     * @return CallbackHandler|mixed CallbackHandler if attaching callable (to allow later unsubscribe); mixed if attaching aggregate
      * @throws Exception\InvalidArgumentException
      */
     public function attach($event, $callback = null, $priority = 1)
@@ -433,7 +433,7 @@ public function prepareArgs(array $args)
      *
      * @param  string           $event Event name
      * @param  EventInterface $e
-     * @param  null|callback    $callback
+     * @param  null|callable    $callback
      * @return ResponseCollection
      */
     protected function triggerListeners($event, EventInterface $e, $callback = null)

src/EventManagerInterface.php

@@ -36,7 +36,7 @@ interface EventManagerInterface extends SharedEventManagerAwareInterface
      * @param  string $event
      * @param  object|string $target
      * @param  array|object $argv
-     * @param  null|callback $callback
+     * @param  null|callable $callback
      * @return ResponseCollection
      */
     public function trigger($event, $target = null, $argv = array(), $callback = null);
@@ -53,7 +53,7 @@ public function trigger($event, $target = null, $argv = array(), $callback = nul
      * @param  string $event
      * @param  object|string $target
      * @param  array|object $argv
-     * @param  callback $callback
+     * @param  callable $callback
      * @return ResponseCollection
      */
     public function triggerUntil($event, $target, $argv = null, $callback = null);
@@ -62,7 +62,7 @@ public function triggerUntil($event, $target, $argv = null, $callback = null);
      * Attach a listener to an event
      *
      * @param  string $event
-     * @param  callback $callback
+     * @param  callable $callback
      * @param  int $priority Priority at which to register listener
      * @return CallbackHandler
      */

src/Filter/FilterInterface.php

@@ -33,7 +33,7 @@ public function run($context, array $params = array());
     /**
      * Attach an intercepting filter
      *
-     * @param  callback $callback
+     * @param  callable $callback
      * @return CallbackHandler
      */
     public function attach($callback);

src/FilterChain.php

@@ -63,7 +63,7 @@ public function run($context, array $argv = array())
     /**
      * Connect a filter to the chain
      *
-     * @param  callback $callback PHP Callback
+     * @param  callable $callback PHP Callback
      * @param  int $priority Priority in the queue at which to execute; defaults to 1 (higher numbers == higher priority)
      * @return CallbackHandler (to allow later unsubscribe)
      * @throws Exception\InvalidCallbackException

src/GlobalEventManager.php

@@ -74,7 +74,7 @@ public static function trigger($event, $context, $argv = array())
      * @param  string $event
      * @param  string|object $context
      * @param  array|object $argv
-     * @param  callback $callback
+     * @param  callable $callback
      * @return ResponseCollection
      */
     public static function triggerUntil($event, $context, $argv, $callback)
@@ -86,7 +86,7 @@ public static function triggerUntil($event, $context, $argv, $callback)
      * Attach a listener to an event
      *
      * @param  string $event
-     * @param  callback $callback
+     * @param  callable $callback
      * @param  int $priority
      * @return CallbackHandler
      */

src/SharedEventManager.php

@@ -57,7 +57,7 @@ class SharedEventManager implements SharedEventManagerInterface
      *
      * @param  string|array $id Identifier(s) for event emitting component(s)
      * @param  string $event
-     * @param  callback $callback PHP Callback
+     * @param  callable $callback PHP Callback
      * @param  int $priority Priority at which listener should execute
      * @return CallbackHander|array Either CallbackHandler or array of CallbackHandlers
      */

src/SharedEventManagerInterface.php

@@ -35,7 +35,7 @@ public function getListeners($id, $event);
      *
      * @param  string|array $id Identifier(s) for event emitting component(s)
      * @param  string $event
-     * @param  callback $callback PHP Callback
+     * @param  callable $callback PHP Callback
      * @param  int $priority Priority at which listener should execute
      * @return void
      */

test/TestAsset/StaticEventsMock.php

@@ -31,7 +31,7 @@ public function getListeners($id, $event)
      *
      * @param  string|array $id Identifier(s) for event emitting component(s)
      * @param  string $event
-     * @param  callback $callback PHP Callback
+     * @param  callable $callback PHP Callback
      * @param  int $priority Priority at which listener should execute
      * @return void
      */