Merge branch 'develop'

Prepping for 2.2.0RC1.
zendframework · May 1, 2013 · f31a6f9 · f31a6f9
commit f31a6f9
Show file tree

Hide file tree

Showing 37 changed files with 4,277 additions and 2,286 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
diff --git a/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/src/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
@@ -14,7 +14,8 @@
 use Zend\Server\Reflection\ReflectionParameter;
 
 /**
- * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL.
+ * Describes how types, return values and method details are detected during
+ * AutoDiscovery of a WSDL.
  */
 interface DiscoveryStrategyInterface
 {
@@ -23,7 +24,7 @@ interface DiscoveryStrategyInterface
      *
      * Default implementation assumes the default param doc-block tag.
      *
-     * @param ReflectionParameter $param
+     * @param  ReflectionParameter $param
      * @return string
      */
     public function getFunctionParameterType(ReflectionParameter $param);
@@ -33,8 +34,8 @@ public function getFunctionParameterType(ReflectionParameter $param);
      *
      * Default implementation assumes the value of the return doc-block tag.
      *
-     * @param AbstractFunction $function
-     * @param Prototype $prototype
+     * @param  AbstractFunction $function
+     * @param  Prototype $prototype
      * @return string
      */
     public function getFunctionReturnType(AbstractFunction $function, Prototype $prototype);
@@ -44,8 +45,8 @@ public function getFunctionReturnType(AbstractFunction $function, Prototype $pro
      *
      * Default implementation assumes one-way, when return value is "void".
      *
-     * @param AbstractFunction $function
-     * @param Prototype $prototype
+     * @param  AbstractFunction $function
+     * @param  Prototype $prototype
      * @return bool
      */
     public function isFunctionOneWay(AbstractFunction $function, Prototype $prototype);
@@ -55,7 +56,7 @@ public function isFunctionOneWay(AbstractFunction $function, Prototype $prototyp
      *
      * Default implementation uses docblock description.
      *
-     * @param AbstractFunction $function
+     * @param  AbstractFunction $function
      * @return string
      */
     public function getFunctionDocumentation(AbstractFunction $function);

diff --git a/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
@@ -14,26 +14,52 @@
 use Zend\Server\Reflection\ReflectionParameter;
 
 /**
- * Describes how types, return values and method details are detected during AutoDiscovery of a WSDL.
+ * Describes how types, return values and method details are detected during
+ * AutoDiscovery of a WSDL.
  */
-
 class ReflectionDiscovery implements DiscoveryStrategyInterface
 {
+    /**
+     * Returns description from phpdoc block
+     *
+     * @param  AbstractFunction $function
+     * @return string
+     */
     public function getFunctionDocumentation(AbstractFunction $function)
     {
         return $function->getDescription();
     }
 
+    /**
+     * Return parameter type
+     *
+     * @param  ReflectionParameter $param
+     * @return string
+     */
     public function getFunctionParameterType(ReflectionParameter $param)
     {
         return $param->getType();
     }
 
+    /**
+     * Return function return type
+     *
+     * @param  AbstractFunction $function
+     * @param  Prototype        $prototype
+     * @return string
+     */
     public function getFunctionReturnType(AbstractFunction $function, Prototype $prototype)
     {
         return $prototype->getReturnType();
     }
 
+    /**
+     * Return true if function is one way (return nothing)
+     *
+     * @param  AbstractFunction $function
+     * @param  Prototype        $prototype
+     * @return bool
+     */
     public function isFunctionOneWay(AbstractFunction $function, Prototype $prototype)
     {
         return $prototype->getReturnType() == 'void';