gggeek / phpxmlrpc

demo/server/_prepend.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 }
 
 // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();
 
 // Out-of-band information: let the client manipulate the server operations.
@@ -26,5 +26,5 @@ 
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }

demo/client/_append.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 // Out-of-band information: let the client manipulate the server operations.
 // We do this to help the testsuite script: do not reproduce in production!
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }

demo/client/_prepend.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 error_reporting(E_ALL);
 
 // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();
 
 // Let unit tests run against localhost, 'plain' demos against a known public server
@@ -33,5 +33,5 @@ 
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }

tests/PolyfillTestCase.php

Spacing +8 added lines, -8 removed lines

@@ -2,20 +2,20 @@
 
 use PHPUnit\Runner\Version as PHPUnit_Version;
 
-if ( class_exists( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage' ) === true
-    && class_exists( 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' ) === false
+if (class_exists('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage') === true
+    && class_exists('PHPUnit\Extensions\SeleniumCommon\RemoteCoverage') === false
 ) {
-    class_alias( 'PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage' );
+    class_alias('PHPUnit_Extensions_SeleniumCommon_RemoteCoverage', 'PHPUnit\Extensions\SeleniumCommon\RemoteCoverage');
 }
 
-if ( class_exists( 'PHPUnit_Runner_BaseTestRunner' ) === true
-    && class_exists( 'PHPUnit\Runner\BaseTestRunner' ) === false
+if (class_exists('PHPUnit_Runner_BaseTestRunner') === true
+    && class_exists('PHPUnit\Runner\BaseTestRunner') === false
 ) {
-    class_alias( 'PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner' );
+    class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner');
 }
 
 if (class_exists(PHPUnit_Version::class) === false || version_compare(PHPUnit_Version::id(), '8.0.0', '<')) {
-    include_once __DIR__ . '/PolyfillTestCase7.php';
+    include_once __DIR__.'/PolyfillTestCase7.php';
 } else {
-    include_once __DIR__ . '/PolyfillTestCase8.php';
+    include_once __DIR__.'/PolyfillTestCase8.php';
 }

src/Value.php

Spacing +16 added lines, -16 removed lines

@@ -87,7 +87,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    Logger::instance()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    Logger::instance()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -112,7 +112,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            Logger::instance()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            Logger::instance()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -129,10 +129,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -174,7 +174,7 @@ 
 
             return 1;
         } else {
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -205,7 +205,7 @@ 
 
             return 1;
         } else {
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -241,19 +241,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}>" . 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, 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}>";
                         } 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,14 +291,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 = Charset::instance();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     //$rs.=$this->serializeval($val2);
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
@@ -334,7 +334,7 @@ 
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**

src/Helper/XMLParser.php

Spacing +30 added lines, -30 removed lines

@@ -123,7 +123,7 @@ 
 
         xml_set_object($parser, $this);
 
-        switch($returnType) {
+        switch ($returnType) {
             case self::RETURN_PHP:
                 xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
                 break;
@@ -140,10 +140,10 @@ 
         $this->accept = $accept;
 
         // @see ticket #70 - we have to parse big xml docks 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));
@@ -167,7 +167,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
             if (count($this->_xh['stack']) == 0) {
@@ -187,7 +187,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;
                 }
@@ -281,7 +281,7 @@ 
                     break;
                 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'] = '';
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
                     //$this->_xh['ac']='';
                 // Drop trough intentionally
                 case 'PARAM':
@@ -341,7 +341,7 @@ 
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        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.
@@ -356,7 +356,7 @@ 
                         $this->_xh['vt'] = Value::$xmlrpcString;
                     }
 
-                    if ($rebuildXmlrpcvals > 0) {
+                    if ($rebuildXmlrpcvals>0) {
                         // build the xmlrpc 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
@@ -365,15 +365,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']
                             );
@@ -389,8 +389,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;
                 case 'BOOLEAN':
@@ -409,7 +409,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'])) {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
                         }
                         $this->_xh['vt'] = Value::$xmlrpcDateTime;
                         $this->_xh['value'] = $this->_xh['ac'];
@@ -428,7 +428,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) {
-                                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
+                                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
                             }
                             $this->_xh['value'] = false;
                         }
@@ -438,37 +438,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!
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('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!
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('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 {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
                     }
                     break;
                 case 'DATA':
@@ -491,7 +491,7 @@ 
                         $this->_xh['params'][] = $this->_xh['value'];
                         $this->_xh['pt'][] = $this->_xh['vt'];
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
                     }
                     break;
                 case 'METHODNAME':
@@ -547,7 +547,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) {
@@ -565,7 +565,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;
             }
@@ -636,8 +636,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));
         }
@@ -655,7 +655,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;
@@ -690,8 +690,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;
         }

src/Helper/Http.php

Spacing +26 added lines, -26 removed lines

@@ -23,12 +23,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) {
@@ -40,19 +40,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;
         }
@@ -69,7 +69,7 @@ 
      * @return array with keys 'headers' and 'cookies'
      * @throws \Exception
      */
-    public function parseResponseHeaders(&$data, $headersProcessed = false, $debug=0)
+    public function parseResponseHeaders(&$data, $headersProcessed = false, $debug = 0)
     {
         $httpResponse = array('raw_data' => $data, 'headers'=> array(), 'cookies' => array());
 
@@ -79,11 +79,11 @@ 
             // (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;
@@ -94,8 +94,8 @@ 
                 // maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -121,20 +121,20 @@ 
         }
 
         if (!preg_match('/^HTTP\/[0-9.]+ 200 /', $data)) {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error']);
         }
 
         // 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...
@@ -145,10 +145,10 @@ 
         // be tolerant to line endings, and extra empty lines
         $ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));
 
-        foreach($ar as $line) {
+        foreach ($ar as $line) {
             // take care of multi-line headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $headerName = strtolower(trim($arr[0]));
                 /// @todo some other headers (the ones that allow a CSV list of values)
                 /// do allow many values to be passed using multiple header lines.
@@ -166,7 +166,7 @@ 
                         // 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);
                         }
@@ -195,7 +195,7 @@ 
                 }
             } elseif (isset($headerName)) {
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -219,7 +219,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)) {
-                    Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new \Exception(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail']);
                 }
             }
@@ -234,19 +234,19 @@ 
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new \Exception(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail']);
                         }
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new \Exception(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress']);
                     }
                 }

debugger/common.php

Spacing +4 added lines, -5 removed lines

@@ -19,7 +19,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();
 }
 
@@ -33,7 +33,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()
@@ -53,8 +53,7 @@ 
     function stripslashes_deep($value)
     {
         $value = is_array($value) ?
-            array_map('stripslashes_deep', $value) :
-            stripslashes($value);
+            array_map('stripslashes_deep', $value) : stripslashes($value);
 
         return $value;
     }
@@ -99,7 +98,7 @@ 
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xmlrpc server path, add it back
     if ($path && ($path[0]) != '/') {
-        $path = '/' . $path;
+        $path = '/'.$path;
     }
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {

debugger/controller.php

Spacing +6 added lines, -6 removed lines

@@ -17,15 +17,15 @@ 
 // Make sure we set the correct charset type for output, so that we can display all characters
 header('Content-Type: text/html; charset=utf-8');
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 if ($action == '') {
     $action = 'list';
 }
 
 // Relative path to the visual xmlrpc editing dialog
 // We allow to easily configure this path via defines
-$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/';
-$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/lib/';
+$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/';
+$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/lib/';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -230,9 +230,9 @@ 
         echo ' document.forms[2].submit();';
     } ?>">
 <h1>XMLRPC
-    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     /
-    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     JSONRPC Debugger (based on the <a href="http://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library)
 </h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
@@ -287,7 +287,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 class="labelcell">Protocol:</td>
             <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
                     <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option>

Braces +6 added lines, -1 removed lines

@@ -31,7 +31,12 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSONRPC';
+} else {
+    echo 'XMLRPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <script type="text/javascript" language="Javascript">
         if (window.name != 'frmcontroller')