Merge branch 'hotfix/3286'

Close zendframework/zendframework#3286
zendframework · Jan 3, 2013 · becf6c6 · becf6c6
commit becf6c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Client/Common.php b/src/Client/Common.php
@@ -55,9 +55,9 @@ public function __doRequest($request, $location, $action, $version, $one_way = n
     {
         if ($one_way === null) {
             return call_user_func($this->doRequestCallback, $this, $request, $location, $action, $version);
-        } else {
-            return call_user_func($this->doRequestCallback, $this, $request, $location, $action, $version, $one_way);
         }
+
+        return call_user_func($this->doRequestCallback, $this, $request, $location, $action, $version, $one_way);
     }
 
 }

diff --git a/src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php b/src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
@@ -62,9 +62,9 @@ protected function _getTypeBasedOnNestingLevel($singularType, $level)
         if ($level == 0) {
             // This is not an Array anymore, return the xsd simple type
             return $this->getContext()->getType($singularType);
-        } else {
-            return 'tns:' . str_repeat('ArrayOf', $level) . ucfirst($this->getContext()->translateType($singularType));
         }
+
+        return 'tns:' . str_repeat('ArrayOf', $level) . ucfirst($this->getContext()->translateType($singularType));
     }
 
     /**