mambax7 / nusoap

samples/wsdlclient12.php

Spacing +5 added lines, -5 removed lines

@@ -44,21 +44,21 @@
 	global $SubscriptionId;
 
 	// create items to be added to the cart
-	$item = array ();
-	$item[0] = array(  "ASIN" => "0596004206",
+	$item = array();
+	$item[0] = array("ASIN" => "0596004206",
 					   "Quantity" => "1"
 					);
-	$item[1] = array(  "ASIN" => "0596003277",
+	$item[1] = array("ASIN" => "0596003277",
 					   "Quantity" => "2"
 					);
 
 	// pack it to <Item> array
-	$items =  array("Item" => $item);
+	$items = array("Item" => $item);
 	// Construct request parameters
 	$request = array("Items" => $items, "ResponseGroup" => "CartSimilarities");
 	
 	// Construct  all parameters
-	$cartCreate = array(	"SubscriptionId"  => $SubscriptionId,
+	$cartCreate = array("SubscriptionId"  => $SubscriptionId,
 							"Request" => $request
 					 	);
 

samples/wsdlclient4.php

Spacing +4 added lines, -4 removed lines

@@ -25,10 +25,10 @@
  */
 if ($method == '') {
 	echo '<form name="MethodForm" method="POST">';
-	echo '<input type="hidden" name="proxyhost" value="' . $proxyhost .'">';
-	echo '<input type="hidden" name="proxyport" value="' . $proxyport .'">';
-	echo '<input type="hidden" name="proxyusername" value="' . $proxyusername .'">';
-	echo '<input type="hidden" name="proxypassword" value="' . $proxypassword .'">';
+	echo '<input type="hidden" name="proxyhost" value="' . $proxyhost . '">';
+	echo '<input type="hidden" name="proxyport" value="' . $proxyport . '">';
+	echo '<input type="hidden" name="proxyusername" value="' . $proxyusername . '">';
+	echo '<input type="hidden" name="proxypassword" value="' . $proxypassword . '">';
 	echo 'Method: <select name="method">';
 	echo '<option>echoString</option>';
 	echo '<option>echoStringArray</option>';

src/nusoap.php

Spacing +75 added lines, -75 removed lines

@@ -472,7 +472,7 @@ 
         if ($name_ns) {
             $prefix = 'nu' . mt_rand(1000, 9999);
             $name   = $prefix . ':' . $name;
-            $xmlns  .= " xmlns:$prefix=\"$name_ns\"";
+            $xmlns .= " xmlns:$prefix=\"$name_ns\"";
         }
         // if type is prefixed, create type prefix
         if ('' !== $type_ns && $type_ns === $this->namespaces['xsd']) {
@@ -481,7 +481,7 @@ 
             $type_prefix = 'xsd';
         } elseif ($type_ns) {
             $type_prefix = 'ns' . mt_rand(1000, 9999);
-            $xmlns       .= " xmlns:$type_prefix=\"$type_ns\"";
+            $xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
         }
         // serialize attributes if present
         $atts = '';
@@ -648,7 +648,7 @@ 
                             } elseif ($tt_ns) {
                                 $tt_prefix      = 'ns' . mt_rand(1000, 9999);
                                 $array_typename = "$tt_prefix:$tt";
-                                $xmlns          .= " xmlns:$tt_prefix=\"$tt_ns\"";
+                                $xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
                             } else {
                                 $array_typename = $tt;
                             }
@@ -964,12 +964,12 @@ 
         }
     }
     if ($utc) {
-        $pattern = '/' . '([0-9]{4})-' .    // centuries & years CCYY-
-                   '([0-9]{2})-' .    // months MM-
-                   '([0-9]{2})' .    // days DD
-                   'T' .            // separator T
-                   '([0-9]{2}):' .    // hours hh:
-                   '([0-9]{2}):' .    // minutes mm:
+        $pattern = '/' . '([0-9]{4})-' . // centuries & years CCYY-
+                   '([0-9]{2})-' . // months MM-
+                   '([0-9]{2})' . // days DD
+                   'T' . // separator T
+                   '([0-9]{2}):' . // hours hh:
+                   '([0-9]{2}):' . // minutes mm:
                    '([0-9]{2})(\.[0-9]*)?' . // seconds ss.ss...
                    '(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
                    '/';
@@ -991,12 +991,12 @@ 
  */
 function iso8601_to_timestamp($datestr)
 {
-    $pattern = '/' . '([0-9]{4})-' .    // centuries & years CCYY-
-               '([0-9]{2})-' .    // months MM-
-               '([0-9]{2})' .    // days DD
-               'T' .            // separator T
-               '([0-9]{2}):' .    // hours hh:
-               '([0-9]{2}):' .    // minutes mm:
+    $pattern = '/' . '([0-9]{4})-' . // centuries & years CCYY-
+               '([0-9]{2})-' . // months MM-
+               '([0-9]{2})' . // days DD
+               'T' . // separator T
+               '([0-9]{2}):' . // hours hh:
+               '([0-9]{2}):' . // minutes mm:
                '([0-9]{2})(\.[0-9]+)?' . // seconds ss.ss...
                '(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
                '/';
@@ -1033,7 +1033,7 @@ 
     $start = gettimeofday();
     do {
         $stop       = gettimeofday();
-        $timePassed = 1000000 * ($stop['sec'] - $start['sec']) + $stop['usec'] - $start['usec'];
+        $timePassed = 1000000*($stop['sec'] - $start['sec']) + $stop['usec'] - $start['usec'];
     } while ($timePassed < $usec);
 }
 
@@ -1677,7 +1677,7 @@ 
      */
     private function schemaCharacterData($parser, $data)
     {
-        $pos                          = $this->depth_array[$this->depth - 1];
+        $pos = $this->depth_array[$this->depth - 1];
         $this->message[$pos]['cdata'] .= $data;
     }
 
@@ -2235,13 +2235,13 @@ 
     public $incoming_cookies     = [];
     public $outgoing_payload     = '';
     public $incoming_payload     = '';
-    public $response_status_line;    // HTTP response status line
+    public $response_status_line; // HTTP response status line
     public $useSOAPAction        = true;
     public $persistentConnection = false;
-    public $ch                   = false;    // cURL handle
-    public $ch_options           = [];    // cURL custom options
-    public $use_curl             = false;        // force cURL use
-    public $proxy;            // proxy information (associative array)
+    public $ch                   = false; // cURL handle
+    public $ch_options           = []; // cURL custom options
+    public $use_curl             = false; // force cURL use
+    public $proxy; // proxy information (associative array)
     public $username             = '';
     public $password             = '';
     public $authtype             = '';
@@ -3039,7 +3039,7 @@ 
                 }
 
                 $data .= $tmp;
-                $pos  = mb_strpos($data, "\r\n\r\n");
+                $pos = mb_strpos($data, "\r\n\r\n");
                 if ($pos > 1) {
                     $lb = "\r\n";
                 } else {
@@ -3085,7 +3085,7 @@ 
 
             // loop until msg has been received
             if (isset($this->incoming_headers['transfer-encoding']) && 'chunked' === mb_strtolower($this->incoming_headers['transfer-encoding'])) {
-                $content_length = 2147483647;    // ignore any content-length header
+                $content_length = 2147483647; // ignore any content-length header
                 $chunked        = true;
                 $this->debug('want to read chunked content');
             } elseif (isset($this->incoming_headers['content-length'])) {
@@ -3265,7 +3265,7 @@ 
         $this->response_status_line = $header_array[0];
         $arr                        = explode(' ', $this->response_status_line, 3);
         $http_version               = $arr[0];
-        $http_status                = (int)$arr[1];
+        $http_status                = (int) $arr[1];
         $http_reason                = count($arr) > 2 ? $arr[2] : '';
         // see if we need to resend the request with http digest authentication
         if (isset($this->incoming_headers['location']) && (301 === $http_status || 302 === $http_status)) {
@@ -3825,7 +3825,7 @@ 
             foreach ($headers as $k => $v) {
                 $k                 = mb_strtolower($k);
                 $this->headers[$k] = $v;
-                $this->request     .= "$k: $v\r\n";
+                $this->request .= "$k: $v\r\n";
                 $this->debug("$k: $v");
             }
             // get SOAPAction header
@@ -3873,7 +3873,7 @@ 
                     }
                 }
                 $this->headers[$k] = $v;
-                $this->request     .= "$k: $v\r\n";
+                $this->request .= "$k: $v\r\n";
                 $this->debug("$k: $v");
             }
         } else {
@@ -3930,7 +3930,7 @@ 
                 }
             }
         }
-        $this->request     .= "\r\n" . $data;
+        $this->request .= "\r\n" . $data;
         $data              = $this->parseRequest($this->headers, $data);
         $this->requestSOAP = $data;
         $this->debug('leaving parse_request');
@@ -4449,7 +4449,7 @@ 
             if (null !== $_SERVER) {
                 $SERVER_NAME = $_SERVER['SERVER_NAME'];
                 $SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
-                $HTTPS = isset($_SERVER['HTTPS']) ? : 'off';
+                $HTTPS = isset($_SERVER['HTTPS']) ?: 'off';
             } else {
                 $this->setError(' _SERVER  is not available');
             }
@@ -4573,7 +4573,7 @@ 
             'transport' => $transport,
             'portType'  => $serviceName . 'PortType',
         ];
-        $this->wsdl->ports[$serviceName . 'Port']                                                                = [
+        $this->wsdl->ports[$serviceName . 'Port'] = [
             'binding'     => $serviceName . 'Binding',
             'location'    => $endpoint,
             'bindingType' => 'http://schemas.xmlsoap.org/wsdl/soap/',
@@ -4631,13 +4631,13 @@ 
     public $proxypassword    = '';
     public $timeout          = 0;
     public $response_timeout = 30;
-    public $curl_options     = [];    // User-specified cURL options
-    public $use_curl         = false;            // whether to always try to use cURL
+    public $curl_options     = []; // User-specified cURL options
+    public $use_curl         = false; // whether to always try to use cURL
     // for HTTP authentication
-    public $username    = '';                // Username for HTTP authentication
-    public $password    = '';                // Password for HTTP authentication
-    public $authtype    = '';                // Type of HTTP authentication
-    public $certRequest = [];        // Certificate for HTTP SSL authentication
+    public $username    = ''; // Username for HTTP authentication
+    public $password    = ''; // Password for HTTP authentication
+    public $authtype    = ''; // Type of HTTP authentication
+    public $certRequest = []; // Certificate for HTTP SSL authentication
 
     /**
      * Constructor
@@ -4691,7 +4691,7 @@ 
             // Schema imports
             foreach ($this->schemas as $ns => $list) {
                 foreach ($list as $xs) {
-                    $wsdlparts = parse_url($this->wsdl);    // this is bogusly simple!
+                    $wsdlparts = parse_url($this->wsdl); // this is bogusly simple!
                     foreach ($xs->imports as $ns2 => $list2) {
                         for ($ii = 0, $iiMax = count($list2); $ii < $iiMax; ++$ii) {
                             if (!$list2[$ii]['loaded']) {
@@ -4716,7 +4716,7 @@ 
                 }
             }
             // WSDL imports
-            $wsdlparts = parse_url($this->wsdl);    // this is bogusly simple!
+            $wsdlparts = parse_url($this->wsdl); // this is bogusly simple!
             foreach ($this->import as $ns => $list) {
                 for ($ii = 0, $iiMax = count($list); $ii < $iiMax; ++$ii) {
                     if (!$list[$ii]['loaded']) {
@@ -5584,12 +5584,12 @@ 
                 foreach ($attrs['operations'] as $opName => $opParts) {
                     $binding_xml .= "\n" . '  <operation name="' . $opName . '">';
                     $binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="' . $opParts['style'] . '">';
-                    $enc_style   = '';
+                    $enc_style = '';
                     if (isset($opParts['input']['encodingStyle']) && '' !== $opParts['input']['encodingStyle']) {
                         $enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
                     }
                     $binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '></input>';
-                    $enc_style   = '';
+                    $enc_style = '';
                     if (isset($opParts['output']['encodingStyle']) && '' !== $opParts['output']['encodingStyle']) {
                         $enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';
                     }
@@ -6558,7 +6558,7 @@ 
     public $root_struct_name      = '';
     public $root_struct_namespace = '';
     public $root_header           = '';
-    public $document              = '';            // incoming SOAP body (text)
+    public $document              = ''; // incoming SOAP body (text)
     // determines where in the message we are (envelope,header,body,method)
     public $status            = '';
     public $position          = 0;
@@ -6573,9 +6573,9 @@ 
     public $fault_detail    = '';
     public $depth_array     = [];
     public $debug_flag      = true;
-    public $soapresponse;    // parsed SOAP Body
-    public $soapheader;        // parsed SOAP Header
-    public $responseHeaders = '';    // incoming SOAP headers (text)
+    public $soapresponse; // parsed SOAP Body
+    public $soapheader; // parsed SOAP Header
+    public $responseHeaders = ''; // incoming SOAP headers (text)
     public $body_position   = 0;
     // for multiref parsing:
     // array of id => pos
@@ -7017,20 +7017,20 @@ 
     {
         // TODO: use the namespace!
         if (!isset($type) || 'string' === $type || 'long' === $type || 'unsignedLong' === $type) {
-            return (string)$value;
+            return (string) $value;
         }
         if ('int' === $type || 'integer' === $type || 'short' === $type || 'byte' === $type) {
-            return (int)$value;
+            return (int) $value;
         }
         if ('float' === $type || 'double' === $type || 'decimal' === $type) {
-            return (float)$value;
+            return (float) $value;
         }
         if ('boolean' === $type) {
             if ('false' === mb_strtolower($value) || 'f' === mb_strtolower($value)) {
                 return false;
             }
 
-            return (bool)$value;
+            return (bool) $value;
         }
         if ('base64' === $type || 'base64Binary' === $type) {
             $this->debug('Decode base64 value');
@@ -7039,14 +7039,14 @@ 
         }
         // obscure numeric types
         if ('nonPositiveInteger' === $type || 'negativeInteger' === $type || 'nonNegativeInteger' === $type || 'positiveInteger' === $type || 'unsignedInt' === $type || 'unsignedShort' === $type || 'unsignedByte' === $type) {
-            return (int)$value;
+            return (int) $value;
         }
         // bogus: parser treats array with no elements as a simple type
         if ('array' === $type) {
             return [];
         }
         // everything else
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
@@ -7195,37 +7195,37 @@ 
  */
 class Nusoap_client extends Nusoap_base
 {
-    public $username             = '';                // Username for HTTP authentication
-    public $password             = '';                // Password for HTTP authentication
-    public $authtype             = '';                // Type of HTTP authentication
-    public $certRequest          = [];        // Certificate for HTTP SSL authentication
-    public $requestHeaders       = false;    // SOAP headers in request (text)
-    public $responseHeaders      = '';        // SOAP headers from response (incomplete namespace resolution) (text)
-    public $responseHeader;        // SOAP Header from response (parsed)
-    public $document             = '';                // SOAP body response portion (incomplete namespace resolution) (text)
+    public $username             = ''; // Username for HTTP authentication
+    public $password             = ''; // Password for HTTP authentication
+    public $authtype             = ''; // Type of HTTP authentication
+    public $certRequest          = []; // Certificate for HTTP SSL authentication
+    public $requestHeaders       = false; // SOAP headers in request (text)
+    public $responseHeaders      = ''; // SOAP headers from response (incomplete namespace resolution) (text)
+    public $responseHeader; // SOAP Header from response (parsed)
+    public $document             = ''; // SOAP body response portion (incomplete namespace resolution) (text)
     public $endpoint;
-    public $forceEndpoint        = '';        // overrides WSDL endpoint
+    public $forceEndpoint        = ''; // overrides WSDL endpoint
     public $proxyhost            = '';
     public $proxyport            = '';
     public $proxyusername        = '';
     public $proxypassword        = '';
-    public $portName             = '';                // port name to use in WSDL
-    public $xml_encoding         = '';            // character set encoding of incoming (response) messages
+    public $portName             = ''; // port name to use in WSDL
+    public $xml_encoding         = ''; // character set encoding of incoming (response) messages
     public $http_encoding        = false;
-    public $timeout              = 0;                // HTTP connection timeout
-    public $response_timeout     = 30;        // HTTP response timeout
-    public $endpointType         = '';            // soap|wsdl, empty for WSDL initialization error
+    public $timeout              = 0; // HTTP connection timeout
+    public $response_timeout     = 30; // HTTP response timeout
+    public $endpointType         = ''; // soap|wsdl, empty for WSDL initialization error
     public $persistentConnection = false;
-    public $defaultRpcParams     = false;    // This is no longer used
-    public $request              = '';                // HTTP request
-    public $response             = '';                // HTTP response
-    public $responseData         = '';            // SOAP payload of response
-    public $cookies              = [];            // Cookies from response or for request
-    public $decode_utf8          = true;        // toggles whether the parser decodes element content w/ utf8_decode()
-    public $operations           = [];        // WSDL operations, empty for WSDL initialization error
-    public $curl_options         = [];    // User-specified cURL options
-    public $bindingType          = '';            // WSDL operation binding type
-    public $use_curl             = false;            // whether to always try to use cURL
+    public $defaultRpcParams     = false; // This is no longer used
+    public $request              = ''; // HTTP request
+    public $response             = ''; // HTTP response
+    public $responseData         = ''; // SOAP payload of response
+    public $cookies              = []; // Cookies from response or for request
+    public $decode_utf8          = true; // toggles whether the parser decodes element content w/ utf8_decode()
+    public $operations           = []; // WSDL operations, empty for WSDL initialization error
+    public $curl_options         = []; // User-specified cURL options
+    public $bindingType          = ''; // WSDL operation binding type
+    public $use_curl             = false; // whether to always try to use cURL
 
     /*
      * Fault related variables
@@ -7951,7 +7951,7 @@ 
                     $paramCommentStr = 'void';
                 }
                 $opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];
-                $evalStr             .= "// $paramCommentStr
+                $evalStr .= "// $paramCommentStr
 	function " . str_replace('.', '__', $operation) . "($paramStr) {
 		\$params = array($paramArrayStr);
 		return \$this->call('$operation', \$params, '" . $opData['namespace'] . "', '" . (isset($opData['soapAction']) ? $opData['soapAction'] : '') . "');