More hand made fixes to last commits, phpdoc cleanup.

library/Zend/Filter/Callback.php

@@ -93,7 +93,7 @@ public function getCallbackParams()
      * Calls the filter per callback
      *
      * @param  mixed $value Options for the set callable
-     * @return mixed Result from the filter which was callableed
+     * @return mixed Result from the filter which was called
      */
     public function filter($value)
     {

library/Zend/Filter/Compress/Rar.php

@@ -66,7 +66,7 @@ public function getCallback()
      *
      * @param  string $callback
      * @return Rar
-     * @throws Exception\InvalidArgumentException if invalid callable provided
+     * @throws Exception\InvalidArgumentException if invalid callback provided
      */
     public function setCallback($callback)
     {
@@ -157,7 +157,7 @@ public function setTarget($target)
      *
      * @param  string|array $content
      * @return string
-     * @throws Exception\RuntimeException if no callable available, or error during compression
+     * @throws Exception\RuntimeException if no callback available, or error during compression
      */
     public function compress($content)
     {

library/Zend/Json/Server/Server.php

@@ -70,8 +70,8 @@ class Server extends AbstractServer
     /**
      * Attach a function or callback to the server
      *
-     * @param  string|array $function Valid PHP callable
-     * @param  string $namespace  Ignored
+     * @param  string|array|callable $function   Valid PHP callback
+     * @param  string                $namespace  Ignored
      * @return Server
      */
     public function addFunction($function, $namespace = '')

library/Zend/Serializer/Adapter/PhpSerialize.php

@@ -65,7 +65,7 @@ public function serialize($value)
     /**
      * Unserialize
      *
-     * @todo   Allow integration with unserialize_callable_func
+     * @todo   Allow integration with unserialize_callback_func
      * @param  string $serialized
      * @return mixed
      * @throws Exception\RuntimeException on unserialize error

library/Zend/Server/Method/Callback.php

@@ -22,17 +22,17 @@
 class Callback
 {
     /**
-     * @var string Class name for class method callable
+     * @var string Class name for class method callback
      */
     protected $class;
 
     /**
-     * @var string Function name for function callable
+     * @var string Function name for function callback
      */
     protected $function;
 
     /**
-     * @var string Method name for class method callable
+     * @var string Method name for class method callback
      */
     protected $method;
 
@@ -42,7 +42,7 @@ class Callback
     protected $type;
 
     /**
-     * @var array Valid callable types
+     * @var array Valid callback types
      */
     protected $types = array('function', 'static', 'instance');
 

library/Zend/Server/Server.php

@@ -26,7 +26,7 @@ interface Server
      *
      * @param  string $function
      * @param  string $namespace
-     * @param  null|array Optional array of arguments to pass to callables at
+     * @param  null|array Optional array of arguments to pass to callback at
      *                    dispatch.
      * @return void
      */
@@ -47,7 +47,7 @@ public function addFunction($function, $namespace = '');
      * @param  string $namespace Optional namespace with which to prepend method
      *                           names in the dispatch table.
      *                           methods in the class will be valid callbacks.
-     * @param  null|array Optional array of arguments to pass to callables at
+     * @param  null|array Optional array of arguments to pass to callbacks at
      *                    dispatch.
      * @return void
      */

library/Zend/Stdlib/CallbackHandler.php

@@ -27,7 +27,7 @@
 class CallbackHandler
 {
     /**
-     * @var string|array PHP callable to invoke
+     * @var string|array|callable PHP callback to invoke
      */
     protected $callback;
 
@@ -54,7 +54,7 @@ class CallbackHandler
      *
      * @param  string                       $event    Event to which slot is subscribed
      * @param  string|array|object|callable $callback PHP callback
-     * @param  array                        $options  Options used by the callable handler (e.g., priority)
+     * @param  array                        $options  Options used by the callback handler (e.g., priority)
      * @return void
      */
     public function __construct($callback, array $metadata = array())
@@ -160,7 +160,7 @@ public function getCallback()
     /**
      * Invoke handler
      *
-     * @param  array $args Arguments to pass to callable
+     * @param  array $args Arguments to pass to callback
      * @return mixed
      */
     public function call(array $args = array())

library/Zend/Validator/Callback.php

@@ -114,7 +114,7 @@ public function setCallbackOptions($options)
      * for the provided $value
      *
      * @param  mixed $value
-     * @param  mixed $context Additional context to provide to the callable
+     * @param  mixed $context Additional context to provide to the callback
      * @return boolean
      * @throws Exception\InvalidArgumentException
      */

library/Zend/Validator/CreditCard.php

@@ -231,7 +231,7 @@ public function getService()
      *
      * @param  callable $service
      * @return CreditCard
-     * @throws Exception\InvalidArgumentException on invalid service callable
+     * @throws Exception\InvalidArgumentException on invalid service callback
      */
     public function setService($service)
     {

library/Zend/XmlRpc/Server.php

@@ -171,8 +171,8 @@ public function __call($method, $params)
      * any arguments following the namespace will be aggregated and passed at
      * dispatch time.
      *
-     * @param string|array $function Valid callable
-     * @param string $namespace Optional namespace prefix
+     * @param string|array|callable $function  Valid callback
+     * @param string                $namespace Optional namespace prefix
      * @return void
      * @throws Zend\XmlRpc\Server\Exception
      */