mambax7 / nusoap

src/nusoap.php

Spacing +62 added lines, -64 removed lines

@@ -946,12 +946,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:
+            '([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
             '/';
@@ -975,12 +975,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:
+        '([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
         '/';
@@ -1018,7 +1018,7 @@ 
 
     do {
         $stop = gettimeofday();
-        $timePassed = 1000000 * ($stop['sec'] - $start['sec'])
+        $timePassed = 1000000*($stop['sec'] - $start['sec'])
             + $stop['usec'] - $start['usec'];
     } while ($timePassed < $usec);
 }
@@ -2232,18 +2232,18 @@ 
     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 = '';
     public $digestRequest = [];
-    public $certRequest = [];    // keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
+    public $certRequest = []; // keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
     // cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'
     // sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'
     // sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'
@@ -3099,7 +3099,7 @@ 
 
             // loop until msg has been received
             if (isset($this->incoming_headers['transfer-encoding']) && 'chunked' === 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'])) {
@@ -3279,7 +3279,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
@@ -4190,7 +4190,7 @@ 
         } else {
             if ('' == $class) {
                 $this->debug('in invoke_method, calling function using call_user_func_array()');
-                $call_arg = $this->methodname;    // straight assignment changes $this->methodname to lower case after call_user_func_array()
+                $call_arg = $this->methodname; // straight assignment changes $this->methodname to lower case after call_user_func_array()
             } elseif ('..' === $delim) {
                 $this->debug('in invoke_method, calling class method using call_user_func_array()');
                 $call_arg = [$class, $method];
@@ -4757,13 +4757,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
@@ -4819,7 +4819,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']) {
@@ -4845,7 +4845,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']) {
@@ -4876,12 +4876,10 @@ 
                     $this->debug('post-parse data gathering for ' . $operation);
                     $this->bindings[$binding]['operations'][$operation]['input'] =
                         isset($this->bindings[$binding]['operations'][$operation]['input']) ?
-                            array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) :
-                            $this->portTypes[$bindingData['portType']][$operation]['input'];
+                            array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) : $this->portTypes[$bindingData['portType']][$operation]['input'];
                     $this->bindings[$binding]['operations'][$operation]['output'] =
                         isset($this->bindings[$binding]['operations'][$operation]['output']) ?
-                            array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) :
-                            $this->portTypes[$bindingData['portType']][$operation]['output'];
+                            array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) : $this->portTypes[$bindingData['portType']][$operation]['output'];
                     if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {
                         $this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];
                     }
@@ -6693,7 +6691,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;
@@ -6708,9 +6706,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
@@ -7005,7 +7003,7 @@ 
                 // add placeholder to href array
                 $this->multirefs[$id][$pos] = 'placeholder';
                 // add set a reference to it as the result value
-                $this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
+                $this->message[$pos]['result'] = & $this->multirefs[$id][$pos];
             // build complexType values
             } elseif ('' != $this->message[$pos]['children']) {
                 // if result has already been generated (struct/array)
@@ -7352,37 +7350,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
@@ -7758,7 +7756,7 @@ 
             case preg_match('/^http/', $this->endpoint):
                 $this->debug('transporting via HTTP');
                 if (true == $this->persistentConnection && is_object($this->persistentConnection)) {
-                    $http =& $this->persistentConnection;
+                    $http = & $this->persistentConnection;
                 } else {
                     $http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);
                     if ($this->persistentConnection) {