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

…otfix/callable-not-callback

Change all 'callback' typehints to 'callable'

src/Pattern/CallbackCache.php

@@ -40,7 +40,7 @@ public function setOptions(PatternOptions $options)
     /**
      * Call the specified callback or get the result from cache
      *
-     * @param  callback   $callback  A valid callback
+     * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return mixed Result
      * @throws Exception
@@ -110,7 +110,7 @@ public function __call($function, array $args)
      * Generate a unique key in base of a key representing the callback part
      * and a key representing the arguments part.
      *
-     * @param  callback   $callback  A valid callback
+     * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
      * @throws Exception
@@ -124,7 +124,7 @@ public function generateKey($callback, array $args = array())
      * Generate a unique key in base of a key representing the callback part
      * and a key representing the arguments part.
      *
-     * @param  callback   $callback  A valid callback
+     * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
      * @throws Exception

src/Pattern/ClassCache.php

@@ -91,7 +91,7 @@ public function generateKey($method, array $args = array())
      * Generate a unique key in base of a key representing the callback part
      * and a key representing the arguments part.
      *
-     * @param  callback   $callback  A valid callback
+     * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
      * @throws Exception

src/Pattern/ObjectCache.php

@@ -171,7 +171,7 @@ public function generateKey($method, array $args = array())
      * Generate a unique key in base of a key representing the callback part
      * and a key representing the arguments part.
      *
-     * @param  callback   $callback  A valid callback
+     * @param  callable   $callback  A valid callback
      * @param  array      $args      Callback arguments
      * @return string
      * @throws Exception