gggeek / phpxmlrpc

demo/server/proxy.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  * @license code licensed under the BSD License: see file license.txt
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE ***
 // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!!
@@ -46,7 +46,7 @@ 
     //            fe. any url using the 'file://' protocol might be considered a hacking attempt
     $client = new Client($url);
 
-    if ($req->getNumParams() > 3) {
+    if ($req->getNumParams()>3) {
         // We have to set some options onto the client.
         // Note that if we do not untaint the received values, warnings might be generated...
         $options = $encoder->decode($req->getParam(3));
@@ -86,7 +86,7 @@ 
                     $client->setSSLVerifyPeer($val);
                     break;
                 case 'Timeout':
-                    $timeout = (integer)$val;
+                    $timeout = (integer) $val;
                     break;
             } // switch
         }
@@ -99,7 +99,7 @@ 
     ///         X-forwarded-for anyway, unless they consider this server as trusted...)
     $reqMethod = $req->getParam(1)->scalarval();
     $req = new Request($reqMethod);
-    if ($req->getNumParams() > 1) {
+    if ($req->getNumParams()>1) {
         $pars = $req->getParam(2);
         foreach ($pars as $par) {
             $req->addParam($par);
@@ -107,7 +107,7 @@ 
     }
 
     // add debug info into response we give back to caller
-    Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize());
+    Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize());
 
     return $client->send($req, $timeout);
 }

demo/server/discuss.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  *   `$functions_parameters_type` and `$exception_handling`
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -19,12 +19,12 @@ 
 
 $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
 
-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
     'and the third is the comment itself. Returns the number of comments against that ID.';
 
 $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
 
-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
     'containing name and comment text.';
 
 $srv = new Server();

demo/client/windowscharset.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set,

src/Value.php

Spacing +16 added lines, -16 removed lines

@@ -129,7 +129,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -153,7 +153,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -170,10 +170,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -214,7 +214,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -244,7 +244,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -286,19 +286,19 @@ 
             case 1:
                 switch ($typ) {
                     case static::$xmlrpcBase64:
-                        $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>";
+                        $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>";
                         break;
                     case static::$xmlrpcBoolean:
-                        $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
+                        $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
                         break;
                     case static::$xmlrpcString:
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
-                        $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
+                        $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
                         break;
                     case static::$xmlrpcInt:
                     case static::$xmlrpcI4:
                     case static::$xmlrpcI8:
-                        $rs .= "<{$typ}>" . (int)$val . "</{$typ}>";
+                        $rs .= "<{$typ}>".(int) $val."</{$typ}>";
                         break;
                     case static::$xmlrpcDouble:
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -306,16 +306,16 @@ 
                         // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14.
                         // The code below tries its best at keeping max precision while avoiding exp notation,
                         // but there is of course no limit in the number of decimal places to be used...
-                        $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs .= "<{$typ}>{$val}</{$typ}>";
                         // DateTimeInterface is not present in php 5.4...
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
-                            $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
+                            $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
                         } elseif (is_int($val)) {
-                            $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
+                            $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
                         } else {
                             // not really a good idea here: but what should we output anyway? left for backward compat...
                             $rs .= "<{$typ}>{$val}</{$typ}>";
@@ -337,14 +337,14 @@ 
             case 3:
                 // struct
                 if ($this->_php_class) {
-                    $rs .= '<struct php_class="' . $this->_php_class . "\">\n";
+                    $rs .= '<struct php_class="'.$this->_php_class."\">\n";
                 } else {
                     $rs .= "<struct>\n";
                 }
                 $charsetEncoder = $this->getCharsetEncoder();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     //$rs.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -379,7 +379,7 @@ 
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**

src/Encoder.php

Spacing +7 added lines, -7 removed lines

@@ -90,13 +90,13 @@ 
                                 'scalar' => $val,
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'base64':
                             $xmlrpcVal = array(
                                 'xmlrpc_type' => 'base64',
                                 'scalar' => $val
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'string':
                             if (isset($options['extension_api_encoding'])) {
                                 // if iconv is not available, we use mb_convert_encoding
@@ -165,7 +165,7 @@ 
             case 'msg':
                 $paramCount = $xmlrpcVal->getNumParams();
                 $arr = array();
-                for ($i = 0; $i < $paramCount; $i++) {
+                for ($i = 0; $i<$paramCount; $i++) {
                     $arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
                 }
                 return $arr;
@@ -291,7 +291,7 @@ 
                 break;
             case 'resource':
                 if (in_array('extension_api', $options)) {
-                    $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
+                    $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
                 } else {
                     $xmlrpcVal = new Value();
                 }
@@ -340,7 +340,7 @@ 
                     if ($valEncoding == 'ISO-8859-1') {
                         $xmlVal = utf8_encode($xmlVal);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
                     }
                 }
             }
@@ -362,7 +362,7 @@ 
             $parserOptions
         );
 
-        if ($xmlRpcParser->_xh['isf'] > 1) {
+        if ($xmlRpcParser->_xh['isf']>1) {
             // test that $xmlrpc->_xh['value'] is an obj, too???
 
             $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']);
@@ -386,7 +386,7 @@ 
 
             case 'methodcall':
                 $req = new Request($xmlRpcParser->_xh['method']);
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
                 }
                 return $req;

src/Helper/Http.php

Spacing +25 added lines, -25 removed lines

@@ -45,12 +45,12 @@ 
 
         // read chunk-size, chunk-extension (if any) and crlf
         // get the position of the linebreak
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
+        $chunkEnd = strpos($buffer, "\r\n")+2;
         $temp = substr($buffer, 0, $chunkEnd);
         $chunkSize = hexdec(trim($temp));
         $chunkStart = $chunkEnd;
-        while ($chunkSize > 0) {
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
+        while ($chunkSize>0) {
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
 
             // just in case we got a broken connection
             if ($chunkEnd == false) {
@@ -62,19 +62,19 @@ 
             }
 
             // read chunk-data and crlf
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             // append chunk-data to entity-body
             $new .= $chunk;
             // length := length + chunk-size
             $length += strlen($chunk);
             // read chunk-size and crlf
-            $chunkStart = $chunkEnd + 2;
+            $chunkStart = $chunkEnd+2;
 
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
             if ($chunkEnd == false) {
                 break; // just in case we got a broken connection
             }
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             $chunkSize = hexdec(trim($temp));
             $chunkStart = $chunkEnd;
         }
@@ -103,11 +103,11 @@ 
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
             $pos = strpos($data, "\r\n\r\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 4;
+                $bd = $pos+4;
             } else {
                 $pos = strpos($data, "\n\n");
                 if ($pos || is_int($pos)) {
-                    $bd = $pos + 2;
+                    $bd = $pos+2;
                 } else {
                     // No separation between response headers and body: fault?
                     $bd = 0;
@@ -117,8 +117,8 @@ 
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -151,19 +151,19 @@ 
         }
 
         if ($httpResponse['status_code'] !== '200') {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
         }
 
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
         $pos = strpos($data, "\r\n\r\n");
         if ($pos || is_int($pos)) {
-            $bd = $pos + 4;
+            $bd = $pos+4;
         } else {
             $pos = strpos($data, "\n\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 2;
+                $bd = $pos+2;
             } else {
                 // No separation between response headers and body: fault?
                 // we could take some action here instead of going on...
@@ -177,7 +177,7 @@ 
         foreach ($ar as $line) {
             // take care of multi-line headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $headerName = strtolower(trim($arr[0]));
                 /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be
                 ///       passed using multiple header lines.
@@ -194,7 +194,7 @@ 
                     foreach ($cookies as $cookie) {
                         // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
                         if (isset($httpResponse['headers'][$headerName])) {
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
                         } else {
                             $httpResponse['headers'][$headerName] = trim($cookie);
                         }
@@ -223,7 +223,7 @@ 
                 }
             } elseif (isset($headerName)) {
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -246,7 +246,7 @@ 
             // Decode chunked encoding sent by http 1.1 servers
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
                 if (!$data = static::decodeChunked($data)) {
-                    $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
                 }
             }
@@ -261,19 +261,19 @@ 
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
                         }
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
                     }
                 }
@@ -293,7 +293,7 @@ 
     public function parseAcceptHeader($header)
     {
         $accepted = array();
-        foreach(explode(',', $header) as $c) {
+        foreach (explode(',', $header) as $c) {
             if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) {
                 $c = $matches[1];
                 $w = $matches[2];