gggeek / phpxmlrpc

src/Helper/Date.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                 // of PHP
                 $t = gmstrftime("%Y%m%dT%H:%M:%S", $timet);
             } else {
-                $t = strftime("%Y%m%dT%H:%M:%S", $timet - date('Z'));
+                $t = strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));
             }
         }
 

src/Helper/Logger.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * @param string $message
      * @param string $encoding
      */
-    public function debugMessage($message, $encoding=null)
+    public function debugMessage($message, $encoding = null)
     {
         // US-ASCII is a warning for PHP and a fatal for HHVM
         if ($encoding == 'US-ASCII') {

tests/0CharsetTest.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
     {
         // construct a latin string with all chars (except control ones)
         $this->latinString = "\n\r\t";
-        for($i = 32; $i < 127; $i++) {
+        for ($i = 32; $i<127; $i++) {
             $this->latinString .= chr($i);
         }
-        for($i = 160; $i < 256; $i++) {
+        for ($i = 160; $i<256; $i++) {
             $this->latinString .= chr($i);
         }
     }

src/Helper/Charset.php

Spacing +17 added lines, -17 removed lines

@@ -52,12 +52,12 @@ 
 
     private function __construct()
     {
-        for ($i = 0; $i < 32; $i++) {
+        for ($i = 0; $i<32; $i++) {
             $this->xml_iso88591_Entities["in"][] = chr($i);
             $this->xml_iso88591_Entities["out"][] = "&#{$i};";
         }
 
-        for ($i = 160; $i < 256; $i++) {
+        for ($i = 160; $i<256; $i++) {
             $this->xml_iso88591_Entities["in"][] = chr($i);
             $this->xml_iso88591_Entities["out"][] = "&#{$i};";
         }
@@ -94,7 +94,7 @@ 
             $srcEncoding = PhpXmlRpc::$xmlrpc_internalencoding;
         }
 
-        $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
+        $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
         switch ($conversion) {
             case 'ISO-8859-1_':
             case 'ISO-8859-1_US-ASCII':
@@ -123,13 +123,13 @@ 
                 // NB: this will choke on invalid UTF-8, going most likely beyond EOF
                 $escapedData = '';
                 // be kind to users creating string xmlrpc values out of different php types
-                $data = (string)$data;
+                $data = (string) $data;
                 $ns = strlen($data);
-                for ($nn = 0; $nn < $ns; $nn++) {
+                for ($nn = 0; $nn<$ns; $nn++) {
                     $ch = $data[$nn];
                     $ii = ord($ch);
                     // 7 bits: 0bbbbbbb (127)
-                    if ($ii < 128) {
+                    if ($ii<128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         switch ($ii) {
                             case 34:
@@ -153,33 +153,33 @@ 
                     } // 11 bits: 110bbbbb 10bbbbbb (2047)
                     elseif ($ii >> 5 == 6) {
                         $b1 = ($ii & 31);
-                        $ii = ord($data[$nn + 1]);
+                        $ii = ord($data[$nn+1]);
                         $b2 = ($ii & 63);
-                        $ii = ($b1 * 64) + $b2;
+                        $ii = ($b1 * 64)+$b2;
                         $ent = sprintf('&#%d;', $ii);
                         $escapedData .= $ent;
                         $nn += 1;
                     } // 16 bits: 1110bbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 4 == 14) {
                         $b1 = ($ii & 15);
-                        $ii = ord($data[$nn + 1]);
+                        $ii = ord($data[$nn+1]);
                         $b2 = ($ii & 63);
-                        $ii = ord($data[$nn + 2]);
+                        $ii = ord($data[$nn+2]);
                         $b3 = ($ii & 63);
-                        $ii = ((($b1 * 64) + $b2) * 64) + $b3;
+                        $ii = ((($b1 * 64)+$b2) * 64)+$b3;
                         $ent = sprintf('&#%d;', $ii);
                         $escapedData .= $ent;
                         $nn += 2;
                     } // 21 bits: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 3 == 30) {
                         $b1 = ($ii & 7);
-                        $ii = ord($data[$nn + 1]);
+                        $ii = ord($data[$nn+1]);
                         $b2 = ($ii & 63);
-                        $ii = ord($data[$nn + 2]);
+                        $ii = ord($data[$nn+2]);
                         $b3 = ($ii & 63);
-                        $ii = ord($data[$nn + 3]);
+                        $ii = ord($data[$nn+3]);
                         $b4 = ($ii & 63);
-                        $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+                        $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
                         $ent = sprintf('&#%d;', $ii);
                         $escapedData .= $ent;
                         $nn += 3;
@@ -214,7 +214,7 @@ 
 
             default:
                 $escapedData = '';
-                error_log('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
+                error_log('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
         }
 
         return $escapedData;
@@ -266,7 +266,7 @@ 
             case 'iso88591':
                 return $this->xml_iso88591_Entities;
             default:
-                throw new \Exception('Unsupported charset: ' . $charset);
+                throw new \Exception('Unsupported charset: '.$charset);
         }
     }
 

lib/xmlrpc_wrappers.inc

Indentation +3 added lines, -3 removed lines

@@ -141,9 +141,9 @@
  * @deprecated
  */
 function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName,
-     $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
-     $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
-     $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
+        $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc',
+        $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false,
+        $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
     if ($clientCopyMode < 2) {

Doc Comments +2 added lines, -1 removed lines

@@ -87,7 +87,7 @@ 
  * @see PhpXmlRpc\Wrapper::wrapXmlrpcMethod
  * @param xmlrpc_client $client
  * @param string $methodName
- * @param int|array $extraOptions the usage of an int as signature number is deprecated, use an option in $extraOptions
+ * @param integer $extraOptions the usage of an int as signature number is deprecated, use an option in $extraOptions
  * @param int $timeout            deprecated, use an option in $extraOptions
  * @param string $protocol        deprecated, use an option in $extraOptions
  * @param string $newFuncName     deprecated, use an option in $extraOptions
@@ -217,6 +217,7 @@ 
 
 /**
  * @deprecated
+ * @param integer $verbatim_client_copy
  */
 function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')
 {

Spacing +20 added lines, -20 removed lines

@@ -41,10 +41,10 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_function($funcName, $newFuncName='', $extraOptions=array())
+function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions);
@@ -64,17 +64,17 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_class($className, $extraOptions=array())
+function wrap_php_class($className, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     $fix = false;
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $fix = true;
     }
     $wrapped = $wrapper->wrapPhpClass($className, $extraOptions);
-    foreach($wrapped as $name => $value) {
+    foreach ($wrapped as $name => $value) {
         if ($fix) {
             eval($value['source']);
         }
@@ -93,7 +93,7 @@ 
  * @param string $newFuncName     deprecated, use an option in $extraOptions
  * @return array|callable|false
  */
-function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='')
+function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '')
 {
     if (!is_array($extraOptions))
     {
@@ -108,7 +108,7 @@ 
 
     $wrapper = new PhpXmlRpc\Wrapper();
 
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions);
@@ -126,7 +126,7 @@ 
  * @param array $extraOptions
  * @return mixed
  */
-function wrap_xmlrpc_server($client, $extraOptions=array())
+function wrap_xmlrpc_server($client, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     return $wrapper->wrapXmlrpcServer($client, $extraOptions);
@@ -146,7 +146,7 @@ 
      $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         // client copy mode 0 or 1 == partial / full client copy in emitted code
         $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix, $namespace);
         $innerCode .= "\$client->setDebug(\$debug);\n";
@@ -160,7 +160,7 @@ 
 
     if ($mDesc != '') {
         // take care that PHP comment is not terminated unwillingly by method description
-        $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n";
+        $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n";
     } else {
         $mDesc = "/**\nFunction $xmlrpcFuncName\n";
     }
@@ -169,7 +169,7 @@ 
     $innerCode .= "\$encoder = new {$namespace}Encoder();\n";
     $plist = array();
     $pCount = count($mSig);
-    for ($i = 1; $i < $pCount; $i++) {
+    for ($i = 1; $i<$pCount; $i++) {
         $plist[] = "\$p$i";
         $pType = $mSig[$i];
         if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' ||
@@ -185,19 +185,19 @@ 
             }
         }
         $innerCode .= "\$req->addparam(\$p$i);\n";
-        $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n";
+        $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n";
     }
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         $plist[] = '$debug=0';
         $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n";
     }
     $plist = implode(', ', $plist);
-    $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n";
+    $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n";
 
     $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n";
     if ($decodeFault) {
         if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) {
-            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')";
+            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')";
         } else {
             $respCode = var_export($faultResponse, true);
         }
@@ -210,7 +210,7 @@ 
         $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());";
     }
 
-    $code = $code . $plist . ") {\n" . $innerCode . "\n}\n";
+    $code = $code.$plist.") {\n".$innerCode."\n}\n";
 
     return array('source' => $code, 'docstring' => $mDesc);
 }
@@ -218,18 +218,18 @@ 
 /**
  * @deprecated
  */
-function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')
+function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc')
 {
     $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).
-        "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";
+        "', '".str_replace("'", "\'", $client->server)."', $client->port);\n";
 
     // copy all client fields to the client that will be generated runtime
     // (this provides for future expansion or subclassing of client obj)
     if ($verbatim_client_copy)
     {
-        foreach($client as $fld => $val)
+        foreach ($client as $fld => $val)
         {
-            if($fld != 'debug' && $fld != 'return_type')
+            if ($fld != 'debug' && $fld != 'return_type')
             {
                 $val = var_export($val, true);
                 $code .= "\$client->$fld = $val;\n";

lib/xmlrpc.inc

Doc Comments +6 added lines

@@ -168,6 +168,9 @@ 
     return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding);
 }
 
+/**
+ * @param integer $timeT
+ */
 function iso8601_encode($timeT, $utc=0)
 {
     return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc);
@@ -195,6 +198,9 @@ 
     return $encoder->encode($phpVal, $options);
 }
 
+/**
+ * @param string $xmlVal
+ */
 function php_xmlrpc_decode_xml($xmlVal, $options=array())
 {
     $encoder = new PhpXmlRpc\Encoder();

Spacing +11 added lines, -11 removed lines

@@ -95,7 +95,7 @@ 
         $val = reset($ar);
         $typ = key($ar);
 
-        return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val)."</value>\n";
         //}
     }
 
@@ -114,7 +114,7 @@ 
         // preserve back compatibility
 
         if (is_array($b)) {
-            foreach($b as $id => $cont) {
+            foreach ($b as $id => $cont) {
                 $b[$id] = $cont->scalarval();
             }
         }
@@ -122,10 +122,10 @@ 
         // add support for structures directly encoding php objects
         if (is_object($b)) {
             $t = get_object_vars($b);
-            foreach($t as $id => $cont) {
+            foreach ($t as $id => $cont) {
                 $t[$id] = $cont->scalarval();
             }
-            foreach($t as $id => $cont) {
+            foreach ($t as $id => $cont) {
                 @$b->$id = $cont;
             }
         }
@@ -160,17 +160,17 @@ 
 /* Expose as global functions the ones which are now class methods */
 
 /// Wrong speling, but we are adamant on backwards compatibility!
-function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
+function xmlrpc_encode_entitites($data, $srcEncoding = '', $destEncoding = '')
 {
     return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding);
 }
 
-function iso8601_encode($timeT, $utc=0)
+function iso8601_encode($timeT, $utc = 0)
 {
     return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc);
 }
 
-function iso8601_decode($iDate, $utc=0)
+function iso8601_decode($iDate, $utc = 0)
 {
     return PhpXmlRpc\Helper\Date::iso8601Decode($iDate, $utc);
 }
@@ -180,25 +180,25 @@ 
     return PhpXmlRpc\Helper\Http::decodeChunked($buffer);
 }
 
-function php_xmlrpc_decode($xmlrpcVal, $options=array())
+function php_xmlrpc_decode($xmlrpcVal, $options = array())
 {
     $encoder = new PhpXmlRpc\Encoder();
     return $encoder->decode($xmlrpcVal, $options);
 }
 
-function php_xmlrpc_encode($phpVal, $options=array())
+function php_xmlrpc_encode($phpVal, $options = array())
 {
     $encoder = new PhpXmlRpc\Encoder();
     return $encoder->encode($phpVal, $options);
 }
 
-function php_xmlrpc_decode_xml($xmlVal, $options=array())
+function php_xmlrpc_decode_xml($xmlVal, $options = array())
 {
     $encoder = new PhpXmlRpc\Encoder();
     return $encoder->decodeXml($xmlVal, $options);
 }
 
-function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
+function guess_encoding($httpHeader = '', $xmlChunk = '', $encodingPrefs = null)
 {
     return PhpXmlRpc\Helper\XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
 }

src/Value.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
      *
      * When no value or type is passed in, the value is left uninitialized, and the value can be added later.
      *
-     * @param mixed $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves
+     * @param integer $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves
      * @param string $type any valid xmlrpc type name (lowercase): i4, int, boolean, string, double, dateTime.iso8601,
      *                     base64, array, struct, null.
      *                     If null, 'string' is assumed.
@@ -95,7 +95,7 @@ 
      * If the xmlrpc value is empty (uninitialized), this method makes it a scalar value, and sets that value.
      * Fails if the xmlrpc value is not an array and already initialized.
      *
-     * @param mixed $val
+     * @param string $val
      * @param string $type allowed values: i4, i8, int, boolean, string, double, dateTime.iso8601, base64, null.
      *
      * @return int 1 or 0 on failure

Spacing +16 added lines, -16 removed lines

@@ -83,7 +83,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    error_log("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    error_log("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -108,7 +108,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            error_log("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -125,10 +125,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                error_log('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                error_log('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                error_log('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                error_log('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
@@ -170,7 +170,7 @@ 
 
             return 1;
         } else {
-            error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -201,7 +201,7 @@ 
 
             return 1;
         } else {
-            error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -240,20 +240,20 @@ 
             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:
                         // G. Giunta 2005/2/13: do NOT use htmlentities, since
                         // it will produce named html entities, which are invalid xml
-                        $rs .= "<${typ}>" . Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>";
+                        $rs .= "<${typ}>".Charset::instance()->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,
@@ -261,15 +261,15 @@ 
                         // sprintf('%F') could be most likely ok but it fails eg. 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, 128, '.', '')) . "</${typ}>";
+                        $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, 128, '.', ''))."</${typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs .= "<${typ}>${val}</${typ}>";
                         } elseif (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}>" . strftime("%Y%m%dT%H:%M:%S", $val) . "</${typ}>";
+                            $rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";
                         } else {
                             // not really a good idea here: but what shall we output anyway? left for backward compat...
                             $rs .= "<${typ}>${val}</${typ}>";
@@ -291,13 +291,13 @@ 
             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 = Charset::instance();
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     //$rs.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -332,7 +332,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";
     }
 
     /**

demo/vardemo.php

Spacing +12 added lines, -12 removed lines

@@ -3,16 +3,16 @@ 
 <body>
 <?php
 
-include_once __DIR__ . "/../vendor/autoload.php";
+include_once __DIR__."/../vendor/autoload.php";
 
 $req = new PhpXmlRpc\Request('examples.getStateName');
 
 print "<h3>Testing value serialization</h3>\n";
 
 $v = new PhpXmlRpc\Value(23, "int");
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 $v = new PhpXmlRpc\Value("What are you saying? >> << &&");
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -23,7 +23,7 @@ 
     "array"
 );
 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -51,11 +51,11 @@ 
     "struct"
 );
 
-print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array");
 
-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
+print "<PRE>".htmlentities($w->serialize())."</PRE>";
 
 $w = new PhpXmlRpc\Value("Mary had a little lamb,
 Whose fleece was white as snow,
@@ -67,26 +67,26 @@ 
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
 );
-print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
-print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
+print "<PRE>".htmlentities($w->serialize())."</PRE>";
+print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>";
 
 $req->method('');
 $req->addParam(new PhpXmlRpc\Value("41", "int"));
 
 print "<h3>Testing request serialization</h3>\n";
 $op = $req->serialize();
-print "<PRE>" . htmlentities($op) . "</PRE>";
+print "<PRE>".htmlentities($op)."</PRE>";
 
 print "<h3>Testing ISO date format</h3><pre>\n";
 
 $t = time();
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
 print "Now is $t --> $date\n";
-print "Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n";
+print "Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n";
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
 print "That is to say $date --> $tb\n";
-print "Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n";
-print "Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($date, 1) . "\n";
+print "Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n";
+print "Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($date, 1)."\n";
 
 print "</pre>\n";
 

src/Helper/XMLParser.php

Spacing +24 added lines, -24 removed lines

@@ -66,7 +66,7 @@ 
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
     {
         // if invalid xmlrpc already detected, skip all processing
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // check for correct element nesting
             // top level element can only be of 2 types
             /// @todo optimization creep: save this check into a bool variable, instead of using count() every time:
@@ -171,7 +171,7 @@ 
                     $this->_xh['isf'] = 1;
                     break;
                 case 'MEMBER':
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; // 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'] = ''; // set member name to null, in case we do not find in the xml later on
                     //$this->_xh['ac']='';
                 // Drop trough intentionally
                 case 'PARAM':
@@ -223,7 +223,7 @@ 
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = true)
     {
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // push this element name from stack
             // NB: if XML validates, correct opening/closing is guaranteed and
             // we do not have to check for $name == $currElem.
@@ -249,8 +249,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'][] = $temp;
+                        if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
+                            $this->_xh['valuestack'][$vscount-1]['values'][] = $temp;
                         } else {
                             $this->_xh['value'] = $temp;
                         }
@@ -264,8 +264,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;
@@ -285,7 +285,7 @@ 
                         $this->_xh['value'] = $this->_xh['ac'];
                     } elseif ($name == 'DATETIME.ISO8601') {
                         if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
-                            error_log('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
+                            error_log('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
                         }
                         $this->_xh['vt'] = Value::$xmlrpcDateTime;
                         $this->_xh['value'] = $this->_xh['ac'];
@@ -304,7 +304,7 @@ 
                         } else {
                             // log if receiving something strange, even though we set the value to false anyway
                             if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
-                                error_log('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
+                                error_log('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
                             }
                             $this->_xh['value'] = false;
                         }
@@ -314,37 +314,37 @@ 
                         // NOTE: regexp could be much stricter than this...
                         if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
                             /// @todo: find a better way of throwing an error than this!
-                            error_log('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
+                            error_log('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
                             $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'];
                         }
                     } else {
                         // we have an I4/I8/INT
                         // we must check that only 0123456789-<space> are characters here
                         if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
                             /// @todo find a better way of throwing an error than this!
-                            error_log('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
+                            error_log('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
                             $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'];
                         }
                     }
                     $this->_xh['lv'] = 3; // indicate we've found a value
                     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 was found
                     if ($this->_xh['vt']) {
                         $vscount = count($this->_xh['valuestack']);
-                        $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 {
-                        error_log('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
+                        error_log('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
                     }
                     break;
                 case 'DATA':
@@ -367,7 +367,7 @@ 
                         $this->_xh['params'][] = $this->_xh['value'];
                         $this->_xh['pt'][] = $this->_xh['vt'];
                     } else {
-                        error_log('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
+                        error_log('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
                     }
                     break;
                 case 'METHODNAME':
@@ -409,7 +409,7 @@ 
     public function xmlrpc_cd($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // "lookforvalue==3" means that we've found an entire value
             // and should discard any further character data
             if ($this->_xh['lv'] != 3) {
@@ -425,7 +425,7 @@ 
     public function xmlrpc_dh($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
                 $this->_xh['ac'] .= $data;
             }
@@ -496,8 +496,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));
         }
@@ -515,7 +515,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;
@@ -550,8 +550,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 true;
         }