gggeek / phpxmlrpc

src/Helper/XMLParser.php

Spacing +53 added lines, -53 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]);
             }
@@ -257,10 +257,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));
@@ -269,7 +269,7 @@ 
                     $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;
                 }
             }
@@ -307,7 +307,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;
         }
 
@@ -321,7 +321,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)) ||
@@ -331,7 +331,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;
             }
@@ -433,7 +433,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
 
@@ -496,7 +496,7 @@ 
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        if ($this->_xh['isf'] >= 2) {
+        if ($this->_xh['isf']>=2) {
             return;
         }
 
@@ -518,7 +518,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
@@ -526,15 +526,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']
                         );
@@ -549,8 +549,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;
 
@@ -577,7 +577,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;
                         }
@@ -597,7 +597,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;
                     }
@@ -605,7 +605,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;
 
@@ -613,7 +613,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;
                     }
@@ -621,7 +621,7 @@ 
                     $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                 } else {
                     // it's ok, add it on
-                    $this->_xh['value'] = (double)$this->_xh['ac'];
+                    $this->_xh['value'] = (double) $this->_xh['ac'];
                 }
                 break;
 
@@ -629,7 +629,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;
                     }
@@ -640,9 +640,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;
                         }
@@ -659,14 +659,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']));
                     }
                 }
@@ -674,20 +674,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;
@@ -803,7 +803,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;
         }
 
@@ -825,7 +825,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;
         }
 
@@ -901,8 +901,8 @@ 
         // Details:
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-        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));
         }
@@ -920,7 +920,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;
@@ -957,8 +957,8 @@ 
         // Details:
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-        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;
         }
@@ -978,7 +978,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;
         }
     }
@@ -990,8 +990,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;
@@ -1012,7 +1012,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);
     }
@@ -1021,12 +1021,12 @@ 
     {
         switch ($name) {
             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;
         }
@@ -1037,17 +1037,17 @@ 
         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 '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);
         }
     }
 
@@ -1055,10 +1055,10 @@ 
     {
         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 '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;
@@ -1070,17 +1070,17 @@ 
         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 '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);
         }
     }
 }

src/Value.php

Spacing +30 added lines, -30 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";
     }
 
     /**
@@ -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((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}>";
@@ -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";
                 }
@@ -583,7 +583,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']);
     }
@@ -599,7 +599,7 @@ 
      */
     public function structMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['struct'][$key];
     }
@@ -612,7 +612,7 @@ 
      */
     public function structReset()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         reset($this->me['struct']);
     }
@@ -626,7 +626,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']);
@@ -645,7 +645,7 @@ 
      */
     public function arrayMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['array'][$key];
     }
@@ -659,7 +659,7 @@ 
      */
     public function arraySize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['array']);
     }
@@ -673,7 +673,7 @@ 
      */
     public function structSize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['struct']);
     }
@@ -685,12 +685,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;
         }
@@ -702,13 +702,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);
         }
     }
 
@@ -718,7 +718,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;
@@ -731,13 +731,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);
         }
     }
 }

src/Request.php

Spacing +31 added lines, -31 removed lines

@@ -84,7 +84,7 @@ 
 
             return true;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
             return false;
         }
     }
@@ -134,17 +134,17 @@ 
         $this->logDeprecationUnlessCalledBy('serialize');
 
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
 
         $result = $this->xml_header($charsetEncoding);
-        $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-                $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+                $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $result .= "<params>\n";
         foreach ($this->params as $p) {
-            $result .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $result .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $result .= "</params>\n";
@@ -164,9 +164,9 @@ 
         $this->logDeprecationUnlessCalledBy('createPayload');
 
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -228,14 +228,14 @@ 
      */
     public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
     {
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $this->getLogger()->debug("---GOT---\n$data\n---END---");
         }
 
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -243,12 +243,12 @@ 
         if (substr($data, 0, 4) == 'HTTP') {
             $httpParser = new Http();
             try {
-                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
+                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
             } catch (HttpException $e) {
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
             }
         } else {
@@ -264,7 +264,7 @@ 
         // idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib
         $pos = strrpos($data, '</methodResponse>');
         if ($pos !== false) {
-            $data = substr($data, 0, $pos + 17);
+            $data = substr($data, 0, $pos+17);
         }
 
         // try to 'guestimate' the character encoding of the received response
@@ -273,21 +273,21 @@ 
             $data
         );
 
-        if ($this->debug >= 0) {
+        if ($this->debug>=0) {
             $this->httpResponse = $httpResponse;
         } else {
             $httpResponse = null;
         }
 
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 /// @todo what if there is no end tag?
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
             }
         }
 
@@ -309,7 +309,7 @@ 
                     if ($respEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -336,16 +336,16 @@ 
             //    there could be proxies meddling with the request, or network data corruption...
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse);
 
-            if ($this->debug > 0) {
+            if ($this->debug>0) {
                 $this->getLogger()->debug($_xh['isf_reason']);
             }
         }
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse);
 
             /// @todo echo something for the user? check if it was already done by the parser...
             //if ($this->debug > 0) {
@@ -354,7 +354,7 @@ 
         }
         // third error check: parsing of the response has somehow gone boink.
         /// @todo shall we omit this check, since we trust the parsing code?
-        elseif ($_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
+        elseif ($_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value'])) {
             // something odd has happened and it's time to generate a client side error indicating something odd went on
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
                 '', $httpResponse
@@ -362,7 +362,7 @@ 
 
             /// @todo echo something for the user?
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debug(
                     "---PARSED---\n".var_export($_xh['value'], true)."\n---END---"
                 );
@@ -386,7 +386,7 @@ 
                 if ($errNo == 0) {
                     // FAULT returned, errno needs to reflect that
                     /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
                     $errNo = -1;
                 }
 
@@ -432,12 +432,12 @@ 
             case '_php_class':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Getting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Request::'.$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;
         }
@@ -451,13 +451,13 @@ 
             case 'debug':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Setting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Request::'.$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);
         }
     }
 
@@ -469,7 +469,7 @@ 
             case 'debug':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Checking property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Request::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -484,13 +484,13 @@ 
             case 'debug':
             case 'payload':
             case 'content_type':
-                $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Request::'.$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);
         }
     }
 }