gggeek / phpxmlrpc

src/Value.php

Spacing +31 added lines, -31 removed lines

@@ -98,7 +98,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -128,7 +128,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -145,10 +145,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->error('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
@@ -192,7 +192,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -223,7 +223,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -288,7 +288,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";
     }
 
     /**
@@ -303,7 +303,7 @@ 
     {
         $this->logDeprecationUnlessCalledBy('serialize');
 
-        if (!isset(static::$xmlrpcTypes[(string)$typ])) {
+        if (!isset(static::$xmlrpcTypes[(string) $typ])) {
             return '';
         }
 
@@ -311,19 +311,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,
@@ -331,16 +331,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((float)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs = "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((float) $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}>";
@@ -362,14 +362,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 .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
                 }
@@ -581,7 +581,7 @@ 
      */
     public function structMemExists($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return array_key_exists($key, $this->me['struct']);
     }
@@ -597,7 +597,7 @@ 
      */
     public function structMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['struct'][$key];
     }
@@ -610,7 +610,7 @@ 
      */
     public function structReset()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         reset($this->me['struct']);
     }
@@ -624,7 +624,7 @@ 
      */
     public function structEach()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $key = key($this->me['struct']);
         $value = current($this->me['struct']);
@@ -643,7 +643,7 @@ 
      */
     public function arrayMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['array'][$key];
     }
@@ -657,7 +657,7 @@ 
      */
     public function arraySize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['array']);
     }
@@ -671,7 +671,7 @@ 
      */
     public function structSize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['struct']);
     }
@@ -683,12 +683,12 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Getting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Value::'.$name.' is deprecated');
                 return $this->$name;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -700,13 +700,13 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Setting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Value::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -716,7 +716,7 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Checking property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Value::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -729,13 +729,13 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Unsetting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Value::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

demo/client/getstatename.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>phpxmlrpc - Getstatename demo</title></head>
@@ -17,13 +17,13 @@ 
 $stateNo = "";
 
 if (isset($_POST['stateno']) && $_POST['stateno'] != "") {
-    $stateNo = (int)$_POST['stateno'];
+    $stateNo = (int) $_POST['stateno'];
     $method = 'examples.getStateName';
     $arguments = array(
         new Value($stateNo, Value::$xmlrpcInt),
     );
     $req = new Request($method, $arguments);
-    output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) .
+    output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()).
         "\n\n</pre>Debug info of server data follows...\n\n");
     $client = new Client(XMLRPCSERVER);
     $client->setOption(Client::OPT_DEBUG, 1);
@@ -32,12 +32,12 @@ 
         $val = $resp->value();
         // NB: we are _assuming_ that the server did return a scalar xml-rpc value here.
         // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'`
-        output('<br/>State number <b>' . $stateNo . '</b> is <b>'
-            . htmlspecialchars($val->scalarVal()) . '</b><br/><br/>');
+        output('<br/>State number <b>'.$stateNo.'</b> is <b>'
+            . htmlspecialchars($val->scalarVal()).'</b><br/><br/>');
     } else {
         output('An error occurred: ');
-        output('<pre>Code: ' . htmlspecialchars($resp->faultCode())
-            . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>");
+        output('<pre>Code: '.htmlspecialchars($resp->faultCode())
+            . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>");
     }
 }
 

demo/server/proxy.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,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 !!!
@@ -47,7 +47,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));
@@ -87,7 +87,7 @@ 
                     $client->setOption(Client::OPT_VERIFY_PEER, $val);
                     break;
                 case 'Timeout':
-                    $timeout = (int)$val;
+                    $timeout = (int) $val;
                     break;
             } // switch
         }
@@ -100,7 +100,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);
@@ -108,7 +108,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);
 }

src/Helper/XMLParser.php

Spacing +56 added lines, -56 removed lines

@@ -187,12 +187,12 @@ 
             // q: can php be built without ctype? should we use a regexp?
             if (is_string($key) && !ctype_digit($key)) {
                 /// @todo on invalid options, throw/error-out instead of logging an error message?
-                switch($key) {
+                switch ($key) {
                     case 'target_charset':
                         if (function_exists('mb_convert_encoding')) {
                             $this->current_parsing_options['target_charset'] = $val;
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring");
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring");
                         }
                         break;
 
@@ -200,7 +200,7 @@ 
                         if (is_callable($val)) {
                             $this->current_parsing_options['methodname_callback'] = $val;
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable");
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable");
                         }
                         break;
 
@@ -211,7 +211,7 @@ 
                         break;
 
                     default:
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key");
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key");
                 }
                 unset($mergedOptions[$key]);
             }
@@ -255,10 +255,10 @@ 
 
         try {
             // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors
-            for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
+            for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
                 $chunk = substr($data, $offset, $this->maxChunkLength);
                 // error handling: xml not well formed
-                if (!@xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
+                if (!@xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
                     $errCode = xml_get_error_code($parser);
                     $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
                         xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -266,25 +266,25 @@ 
                     $this->_xh['isf_reason'] = $errStr;
                 }
                 // no need to parse further if we already have a fatal error
-                if ($this->_xh['isf'] >= 2) {
+                if ($this->_xh['isf']>=2) {
                     break;
                 }
             }
         /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times
         } catch (\Exception $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         } catch (\Error $e) {
-            if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+            if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
             $this->current_parsing_options = array();
             //$this->accept = $prevAccept;
             /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ?
             throw $e;
         }
 
-        if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser);
+        if (PHP_MAJOR_VERSION<8) xml_parser_free($parser);
         $this->current_parsing_options = array();
 
         // BC
@@ -311,7 +311,7 @@ 
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
     {
         // if invalid xml-rpc already detected, skip all processing
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -325,7 +325,7 @@ 
             if ($acceptSingleVals === false) {
                 $accept = $this->current_parsing_options['accept'];
             } else {
-                $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated');
+                $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated');
                 $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE;
             }
             if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) ||
@@ -335,7 +335,7 @@ 
                 $this->_xh['rt'] = strtolower($name);
             } else {
                 $this->_xh['isf'] = 2;
-                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
+                $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
 
                 return;
             }
@@ -440,7 +440,7 @@ 
 
             case 'MEMBER':
                 // set member name to null, in case we do not find in the xml later on
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null;
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null;
                 //$this->_xh['ac']='';
                 // Drop trough intentionally
 
@@ -503,7 +503,7 @@ 
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -525,7 +525,7 @@ 
                     $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8');
                 }
 
-                if ($rebuildXmlrpcvals > 0) {
+                if ($rebuildXmlrpcvals>0) {
                     // build the xml-rpc val out of the data received, and substitute it
                     $temp = new Value($this->_xh['value'], $this->_xh['vt']);
                     // in case we got info about underlying php class, save it in the object we're rebuilding
@@ -533,15 +533,15 @@ 
                         $temp->_php_class = $this->_xh['php_class'];
                     }
                     $this->_xh['value'] = $temp;
-                } elseif ($rebuildXmlrpcvals < 0) {
+                } elseif ($rebuildXmlrpcvals<0) {
                     if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
-                        $this->_xh['value'] = (object)array(
+                        $this->_xh['value'] = (object) array(
                             'xmlrpc_type' => 'datetime',
                             'scalar' => $this->_xh['value'],
                             'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
                         );
                     } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
-                        $this->_xh['value'] = (object)array(
+                        $this->_xh['value'] = (object) array(
                             'xmlrpc_type' => 'base64',
                             'scalar' => $this->_xh['value']
                         );
@@ -556,8 +556,8 @@ 
                 // check if we are inside an array or struct:
                 // if value just built is inside an array, let's move it into array on the stack
                 $vscount = count($this->_xh['valuestack']);
-                if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
-                    $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
+                if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
+                    $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
                 }
                 break;
 
@@ -584,7 +584,7 @@ 
                     // log if receiving something strange, even though we set the value to false anyway
                     /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL
                     if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) {
-                        if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' .
+                        if (!$this->handleParsingError('invalid data received in BOOLEAN value: '.
                             $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                             return;
                         }
@@ -604,7 +604,7 @@ 
                 $this->_xh['vt'] = strtolower($name);
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('non numeric data received in INT value: ' .
+                    if (!$this->handleParsingError('non numeric data received in INT value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -612,7 +612,7 @@ 
                     $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                 } else {
                     // it's ok, add it on
-                    $this->_xh['value'] = (int)$this->_xh['ac'];
+                    $this->_xh['value'] = (int) $this->_xh['ac'];
                 }
                 break;
 
@@ -620,7 +620,7 @@ 
                 $this->_xh['vt'] = Value::$xmlrpcDouble;
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' .
+                    if (!$this->handleParsingError('non numeric data received in DOUBLE value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -628,7 +628,7 @@ 
                     $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                 } else {
                     // it's ok, add it on
-                    $this->_xh['value'] = (float)$this->_xh['ac'];
+                    $this->_xh['value'] = (float) $this->_xh['ac'];
                 }
                 break;
 
@@ -636,7 +636,7 @@ 
                 $this->_xh['vt'] = Value::$xmlrpcDateTime;
                 $this->_xh['lv'] = 3; // indicate we've found a value
                 if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) {
-                    if (!$this->handleParsingError('invalid data received in DATETIME value: ' .
+                    if (!$this->handleParsingError('invalid data received in DATETIME value: '.
                         $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) {
                         return;
                     }
@@ -647,9 +647,9 @@ 
 
                     // the default regex used to validate the date string a few lines above should make this case impossible,
                     // but one never knows...
-                    } catch(\Exception $e) {
+                    } catch (\Exception $e) {
                         // what to do? We can not guarantee that a valid date can be created. We return null...
-                        if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' .
+                        if (!$this->handleParsingError('invalid data received in DATETIME value. Error '.
                             $e->getMessage(), __METHOD__)) {
                             return;
                         }
@@ -666,14 +666,14 @@ 
                     $v = base64_decode($this->_xh['ac'], true);
                     if ($v === false) {
                         $this->_xh['isf'] = 2;
-                        $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']);
+                        $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']);
                         return;
                     }
                 } else {
                     $v = base64_decode($this->_xh['ac']);
                     if ($v === '' && $this->_xh['ac'] !== '') {
                         // only the empty string should decode to the empty string
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' .
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '.
                             $this->truncateValueForLog($this->_xh['ac']));
                     }
                 }
@@ -681,20 +681,20 @@ 
                 break;
 
             case 'NAME':
-                $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
+                $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
                 break;
 
             case 'MEMBER':
                 // add to array in the stack the last element built, unless no VALUE or no NAME were found
                 if ($this->_xh['vt']) {
                     $vscount = count($this->_xh['valuestack']);
-                    if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) {
+                    if ($this->_xh['valuestack'][$vscount-1]['name'] === null) {
                         if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) {
                             return;
                         }
-                        $this->_xh['valuestack'][$vscount - 1]['name'] = '';
+                        $this->_xh['valuestack'][$vscount-1]['name'] = '';
                     }
-                    $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
+                    $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
                 } else {
                     if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) {
                         return;
@@ -828,7 +828,7 @@ 
     public function xmlrpc_cd($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -850,7 +850,7 @@ 
     public function xmlrpc_dh($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -930,8 +930,8 @@ 
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
         // We could be stricter on version number: VersionNum ::= '1.' [0-9]+
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk, $matches)) {
             return strtoupper(substr($matches[2], 1, -1));
         }
@@ -949,7 +949,7 @@ 
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
             // IANA also likes better US-ASCII, so go with it
             if ($enc == 'ASCII') {
-                $enc = 'US-' . $enc;
+                $enc = 'US-'.$enc;
             }
 
             return $enc;
@@ -990,8 +990,8 @@ 
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
         // We could be stricter on version number: VersionNum ::= '1.' [0-9]+
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk)) {
             return true;
         }
@@ -1011,7 +1011,7 @@ 
             $this->_xh['isf_reason'] = ucfirst($message);
             return false;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message);
+            $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message);
             return true;
         }
     }
@@ -1023,8 +1023,8 @@ 
      */
     protected function truncateValueForLog($data)
     {
-        if (strlen($data) > $this->maxLogValueLength) {
-            return substr($data, 0, $this->maxLogValueLength - 3) . '...';
+        if (strlen($data)>$this->maxLogValueLength) {
+            return substr($data, 0, $this->maxLogValueLength-3).'...';
         }
 
         return $data;
@@ -1045,7 +1045,7 @@ 
     public function xmlrpc_se_any($parser, $name, $attrs)
     {
         // this will be spamming the log if this method is in use...
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $this->xmlrpc_se($parser, $name, $attrs, true);
     }
@@ -1055,12 +1055,12 @@ 
         switch ($name) {
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated');
                 return $this->$name;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -1071,18 +1071,18 @@ 
         switch ($name) {
             // this should only ever be called by subclasses which overtook `parse()`
             case 'accept':
-                $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
                 $this->current_parsing_options['accept'] = $value;
                 break;
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -1090,11 +1090,11 @@ 
     {
         switch ($name) {
             case 'accept':
-                $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
                 return isset($this->current_parsing_options['accept']);
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -1106,18 +1106,18 @@ 
         switch ($name) {
             // q: does this make sense at all?
             case 'accept':
-                $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
                 unset($this->current_parsing_options['accept']);
                 break;
             case '_xh':
             case 'xmlrpc_valid_parents':
-                $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

demo/server/methodProviders/testsuite.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
                 $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
             } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
                 $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
-                $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass);
+                $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.$basic_pass);
             } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
                 $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
             }
@@ -62,12 +62,12 @@ 
     foreach ($cookies as $name => $cookieDesc) {
         if (is_array($cookieDesc)) {
             setcookie($name,
-                isset($cookieDesc['value']) ? (string)$cookieDesc['value'] : '',
+                isset($cookieDesc['value']) ? (string) $cookieDesc['value'] : '',
                 isset($cookieDesc['expires']) ? $cookieDesc['expires'] : 0,
-                isset($cookieDesc['path']) ? (string)$cookieDesc['path'] : '',
-                isset($cookieDesc['domain']) ? (string)$cookieDesc['domain'] : '',
-                isset($cookieDesc['secure']) ? (bool)$cookieDesc['secure'] : false,
-                isset($cookieDesc['httponly']) ? (bool)$cookieDesc['httponly'] : false
+                isset($cookieDesc['path']) ? (string) $cookieDesc['path'] : '',
+                isset($cookieDesc['domain']) ? (string) $cookieDesc['domain'] : '',
+                isset($cookieDesc['secure']) ? (bool) $cookieDesc['secure'] : false,
+                isset($cookieDesc['httponly']) ? (bool) $cookieDesc['httponly'] : false
             );
         } else {
             /// @todo what to do?
@@ -104,7 +104,7 @@ 
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';
 function sleepSeconds($secs) {
-    if ($secs > 0 && $secs < 61) {
+    if ($secs>0 && $secs<61) {
         sleep($secs);
     }
     return $secs;
@@ -137,7 +137,7 @@ 
 
     // Greek word 'kosme'. NB: NOT a valid ISO8859 string!
     // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods
-    "tests.utf8methodname." . 'κόσμε' => array(
+    "tests.utf8methodname.".'κόσμε' => array(
         "function" => "exampleMethods::stringEcho",
         "signature" => exampleMethods::$stringecho_sig,
         "docstring" => exampleMethods::$stringecho_doc,

src/Response.php

Spacing +32 added lines, -32 removed lines

@@ -78,7 +78,7 @@ 
                 // user declares the type of resp value: we "almost" trust it... but log errors just in case
                 if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) ||
                     ($this->valtyp == 'xml' && (!is_string($this->val)))) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType);
                 }
             }
         }
@@ -165,34 +165,34 @@ 
     public function serialize($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
 
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
         } else {
             $result = "<methodResponse>\n";
         }
         if ($this->errno) {
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
-            $result .= "<fault>\n" .
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) .
+            $result .= "<fault>\n".
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+                $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding).
                 "</string></value>\n</member>\n</struct>\n</value>\n</fault>";
         } else {
             if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) {
-                $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>";
+                $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>";
             } else if (is_string($this->val) && $this->valtyp == 'xml') {
-                $result .= "<params>\n<param>\n" .
-                    $this->val .
+                $result .= "<params>\n<param>\n".
+                    $this->val.
                     "</param>\n</params>";
             } else if ($this->valtyp == 'phpvals') {
                     $encoder = new Encoder();
                     $val = $encoder->encode($this->val);
-                    $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>";
+                    $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>";
             } else {
                 throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values');
             }
@@ -211,9 +211,9 @@ 
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n";
+            return "<?xml version=\"1.0\"?".">\n";
         }
     }
 
@@ -229,21 +229,21 @@ 
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->$name;
             case 'hdrs':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->httpResponse['headers'];
             case '_cookies':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->httpResponse['cookies'];
             case 'raw_data':
-                $this->logDeprecation('Getting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Response::'.$name.' is deprecated');
                 return $this->httpResponse['raw_data'];
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -258,25 +258,25 @@ 
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             case 'hdrs':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->httpResponse['headers'] = $value;
                 break;
             case '_cookies':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->httpResponse['cookies'] = $value;
                 break;
             case 'raw_data':
-                $this->logDeprecation('Setting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Response::'.$name.' is deprecated');
                 $this->httpResponse['raw_data'] = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -289,16 +289,16 @@ 
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->$name);
             case 'hdrs':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->httpResponse['headers']);
             case '_cookies':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->httpResponse['cookies']);
             case 'raw_data':
-                $this->logDeprecation('Checking property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Response::'.$name.' is deprecated');
                 return isset($this->httpResponse['raw_data']);
             default:
                 return false;
@@ -314,25 +314,25 @@ 
             case 'errstr':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             case 'hdrs':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->httpResponse['headers']);
                 break;
             case '_cookies':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->httpResponse['cookies']);
                 break;
             case 'raw_data':
-                $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated');
                 unset($this->httpResponse['raw_data']);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

src/Helper/Http.php

Spacing +25 added lines, -25 removed lines

@@ -28,12 +28,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) {
@@ -45,19 +45,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;
         }
@@ -86,11 +86,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;
@@ -100,8 +100,8 @@ 
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                $this->getLogger()->error('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()->error('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']);
             }
         }
 
@@ -134,19 +134,19 @@ 
         }
 
         if (!in_array($httpResponse['status_code'], $this->acceptedStatusCodes)) {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            $this->getLogger()->error('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()->error('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...
@@ -160,7 +160,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) {
                 /// @todo according to https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should reject with error
                 ///       400 any messages where a space is present between the header name and colon
                 $headerName = strtolower(trim($arr[0]));
@@ -168,7 +168,7 @@ 
                     $cookie = $arr[1];
                     // 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);
                     }
@@ -199,7 +199,7 @@ 
             } elseif (isset($headerName)) {
                 /// @todo improve this: 1. check that the line starts with a space or tab; 2. according to
                 ///       https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should flat out refuse these messages
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -222,7 +222,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()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    $this->getLogger()->error('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']);
                 }
             }
@@ -237,19 +237,19 @@ 
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debug("---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()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            $this->getLogger()->error('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()->error('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        $this->getLogger()->error('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']);
                     }
                 }
@@ -269,7 +269,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];

debugger/controller.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
     $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
     $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 
 if ($action == '') {
     $action = 'list';
@@ -38,30 +38,30 @@ 
     /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or
     ///         relative to this debugger's folder.
     if (defined('JSXMLRPC_PATH')) {
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
     } else {
         $editorpaths = array(
-            __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
-            __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
-            __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
-            __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
-            __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
+            __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
+            __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
+            __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
+            __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
+            __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
         );
     }
-    foreach($editorpaths as $editorpath) {
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
+    foreach ($editorpaths as $editorpath) {
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
             $haseditor = true;
             break;
         }
     }
     if ($haseditor) {
-        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH));
-        $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
+        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+        $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
         /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly
         ///       at this folder, as in that case the link to the visualeditor will not
         ///       work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
@@ -275,7 +275,7 @@ 
         }
 
         function activateeditor() {
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>';
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
             if (document.frmaction.wstype.value == "1" || document.frmaction.wstype.value == "2")
                 url += '&type=jsonrpc';
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -313,16 +313,16 @@ 
     } ?>">
 <h1>XML-RPC
 <?php if ($hasjsonrpcclient) {
-    echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"' .
+    echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'.
         // q: does this check make sense at all?
-        (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '') . ' /></form>';
+        (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '').' /></form>';
     if ($hasjsonrpc2) {
         echo ' / <form name="frmjsonrpc2" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(2);"/></form>JSON-RPC 2.0 ';
     }
     echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
 } ?>
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
 
     <table id="serverblock">
@@ -384,7 +384,7 @@ 
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td></td>
             <td></td>
         </tr>

debugger/common.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
     // assume this is either a standalone install, or installed as Composer dependency
     /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
     ///       debugger include this one, taking care of autoloading?
-    include_once __DIR__ . "/../src/Autoloader.php";
+    include_once __DIR__."/../src/Autoloader.php";
     PhpXmlRpc\Autoloader::register();
 }
 
@@ -34,7 +34,7 @@ 
         }
 
         // Variables that shouldn't be unset
-        $noUnset = array('GLOBALS',  '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
+        $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
 
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
@@ -86,8 +86,8 @@ 
 $wstype = defined('DEFAULT_WSTYPE') ? DEFAULT_WSTYPE : 0;
 $id = '';
 if (isset($_GET['action'])) {
-    if (isset($_GET['wstype']) && ($_GET['wstype'] == '2'  || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
-        $wstype = (int)$_GET['wstype'];
+    if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
+        $wstype = (int) $_GET['wstype'];
         if ($wstype === 1 || $wstype === 2) {
             if (!$hasjsonrpcclient) {
                 $wstype = 0;
@@ -102,7 +102,7 @@ 
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error...
     if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3'
         || $_GET['protocol'] == '4')) {
-        $protocol = (int)$_GET['protocol'];
+        $protocol = (int) $_GET['protocol'];
     }
     if (strpos($host, 'http://') === 0) {
         // NB: if protocol is https or h2, it will override http://
@@ -114,18 +114,18 @@ 
             $protocol = 2;
         }
     }
-    $port = isset($_GET['port']) ? (int)$_GET['port'] : '';
+    $port = isset($_GET['port']) ? (int) $_GET['port'] : '';
     if ($port === 0) {
         $port = '';
     }
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xml-rpc server path, add it back
     if ($path && ($path[0]) != '/') {
-        $path = '/' . $path;
+        $path = '/'.$path;
     }
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {
-        $debug = (int)$_GET['debug'];
+        $debug = (int) $_GET['debug'];
     }
 
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
@@ -142,7 +142,7 @@ 
     /// @todo what about an https proxy?
     $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
-    $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0;
+    $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0;
     $action = $_GET['action'];
 
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -157,15 +157,15 @@ 
     $username = isset($_GET['username']) ? $_GET['username'] : '';
     $password = isset($_GET['password']) ? $_GET['password'] : '';
 
-    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1;
+    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1;
 
     if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) {
-        (int)$requestcompression = $_GET['requestcompression'];
+        (int) $requestcompression = $_GET['requestcompression'];
     } else {
         $requestcompression = 0;
     }
     if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) {
-        $responsecompression = (int)$_GET['responsecompression'];
+        $responsecompression = (int) $_GET['responsecompression'];
     } else {
         $responsecompression = 0;
     }