Merge remote branch 'upstream/master' into ZF-10246

zendframework · Aug 1, 2010 · 12c90a3 · 12c90a3
7 parents cf3e018 + 490086e + 50418c6 + 0b49cb4 + 325fdd2 + 0c61247 + 6f66646
commit 12c90a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -963,11 +963,10 @@ public function getLastMethod()
     public function _doRequest(Client\Common $client, $request, $location, $action, $version, $one_way = null)
     {
         // Perform request as is
-        if ($one_way == null) {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
-        } else {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version, $one_way);
+        if ($one_way === null) {
+            return $client->__doRequest($request, $location, $action, $version);
         }
+        return $client->__doRequest($request, $location, $action, $version, $one_way);
     }
 
     /**

diff --git a/src/Wsdl/Strategy/DefaultComplexType.php b/src/Wsdl/Strategy/DefaultComplexType.php
@@ -72,6 +72,8 @@ public function addComplexType($type)
         $this->getContext()->addType($type, $soapType);
 
 
+        $defaultProperties = $class->getDefaultProperties();
+
         $defaultProperties = $class->getDefaultProperties();
 
         $complexType = $dom->createElement('xsd:complexType');
@@ -91,7 +93,7 @@ public function addComplexType($type)
                 $element->setAttribute('type', $this->getContext()->getType(trim($matches[1][0])));
 
                 // If the default value is null, then this property is nillable.
-                if (is_null($defaultProperties[$propertyName])) {
+                if ($defaultProperties[$propertyName] === null) {
                     $element->setAttribute('nillable', 'true');
                 }