gggeek / phpxmlrpc

tests/WebTestCase.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase
 {
@@ -15,7 +15,7 @@ 
      */
     protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false)
     {
-        $url = $this->baseUrl . $path;
+        $url = $this->baseUrl.$path;
 
         $ch = curl_init($url);
         curl_setopt_array($ch, array(
@@ -33,7 +33,7 @@ 
         {
             curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID='.$this->testId);
         }
-        if ($this->args['DEBUG'] > 0) {
+        if ($this->args['DEBUG']>0) {
             curl_setopt($ch, CURLOPT_VERBOSE, 1);
         }
         $page = curl_exec($ch);
@@ -57,7 +57,7 @@ 
      */
     protected function newClient($path)
     {
-        $client = new \PhpXmlRpc\Client($this->baseUrl . $path);
+        $client = new \PhpXmlRpc\Client($this->baseUrl.$path);
         if ($this->collectCodeCoverageInformation) {
             $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);
         }

tests/11DebuggerTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for the bundled debugger.

tests/01CharsetTest.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
  * @author JoakimLofgren
  */
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PhpXmlRpc\Helper\Charset;
 
@@ -48,10 +48,10 @@ 
     public function testUtf8ToLatin1All()
     {
         $latinString = "\n\r\t";
-        for($i = 32; $i < 127; $i++) {
+        for ($i = 32; $i<127; $i++) {
             $latinString .= chr($i);
         }
-        for($i = 160; $i < 256; $i++) {
+        for ($i = 160; $i<256; $i++) {
             $latinString .= chr($i);
         }
 

src/Helper/Http.php

Spacing +25 added lines, -25 removed lines

@@ -26,12 +26,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) {
@@ -43,19 +43,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;
         }
@@ -84,11 +84,11 @@ 
             // Look for CR/LF or simple LF as line separator (even though it is not valid http)
             $pos = strpos($data, "\r\n\r\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 4;
+                $bd = $pos+4;
             } else {
                 $pos = strpos($data, "\n\n");
                 if ($pos || is_int($pos)) {
-                    $bd = $pos + 2;
+                    $bd = $pos+2;
                 } else {
                     // No separation between response headers and body: fault?
                     $bd = 0;
@@ -98,8 +98,8 @@ 
                 // this filters out all http headers from proxy. maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -132,19 +132,19 @@ 
         }
 
         if ($httpResponse['status_code'] !== '200') {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
         }
 
         // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http)
         $pos = strpos($data, "\r\n\r\n");
         if ($pos || is_int($pos)) {
-            $bd = $pos + 4;
+            $bd = $pos+4;
         } else {
             $pos = strpos($data, "\n\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 2;
+                $bd = $pos+2;
             } else {
                 // No separation between response headers and body: fault?
                 // we could take some action here instead of going on...
@@ -158,7 +158,7 @@ 
         foreach ($ar as $line) {
             // take care of (multi-line) headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 /// @todo according to https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should reject with error
                 ///       400 any messages where a space is present between the header name and colon
                 $headerName = strtolower(trim($arr[0]));
@@ -166,7 +166,7 @@ 
                     $cookie = $arr[1];
                     // glue together all received cookies, using a comma to separate them (same as php does with getallheaders())
                     if (isset($httpResponse['headers'][$headerName])) {
-                        $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
+                        $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
                     } else {
                         $httpResponse['headers'][$headerName] = trim($cookie);
                     }
@@ -197,7 +197,7 @@ 
             } elseif (isset($headerName)) {
                 /// @todo improve this: 1. check that the line starts with a space or tab; 2. according to
                 ///       https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should flat out refuse these messages
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -220,7 +220,7 @@ 
             // Decode chunked encoding sent by http 1.1 servers
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
                 if (!$data = static::decodeChunked($data)) {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
                 }
             }
@@ -235,19 +235,19 @@ 
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
                         }
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
                     }
                 }
@@ -267,7 +267,7 @@ 
     public function parseAcceptHeader($header)
     {
         $accepted = array();
-        foreach(explode(',', $header) as $c) {
+        foreach (explode(',', $header) as $c) {
             if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) {
                 $c = $matches[1];
                 $w = $matches[2];

tests/03MessagesTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 /**
  * Tests involving Requests and Responses, except for the parsing part

tests/06EncoderTest.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 /**
  * Tests involving automatic encoding/decoding of php values into xmlrpc values (the Encoder class).
@@ -75,7 +75,7 @@ 
         /// @todo it seems that old php versions can not automatically transform latin to utf8 upon xml parsing.
         ///       We should fix that, then re-enable this test
         if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
-            $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>' . $string . '</string></value>');
+            $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>'.$string.'</string></value>');
             $this->assertEquals($string, $i->scalarVal());
         }
 

tests/07ClientTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 /**
  * Tests involving the Client class (and no server).
@@ -35,7 +35,7 @@ 
         $this->client->server .= 'XXX';
         $dnsinfo = @dns_get_record($this->client->server);
         if ($dnsinfo) {
-            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found');
+            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found');
         } else {
             $r = $this->client->send($m, 5);
             // make sure there's no freaking catchall DNS in effect
@@ -62,7 +62,7 @@ 
 
         // now test a successful connection
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client->port = $server[1];
         }
         $this->client->server = $server[0];

tests/02ValueTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 /**
  * Tests involving the Value class.
@@ -155,7 +155,7 @@ 
         $this->assertequals(1, count($v1));
         $out = array('me' => array(), 'mytype' => 2, '_php_class' => null);
 
-        foreach($v1 as $key => $val)
+        foreach ($v1 as $key => $val)
         {
             $this->assertArrayHasKey($key, $out);
             $expected = $out[$key];
@@ -170,7 +170,7 @@ 
         $this->assertequals(2, count($v2));
         $out = array(array('key' => 0, 'value'  => 'object'), array('key' => 1, 'value'  => 'object'));
         $i = 0;
-        foreach($v2 as $key => $val)
+        foreach ($v2 as $key => $val)
         {
             $expected = $out[$i];
             $this->assertequals($expected['key'], $key);
@@ -184,7 +184,7 @@ 
     {
         // nb: make sure that  the serialized xml corresponding to this is > 10MB in size
         $data = array();
-        for ($i = 0; $i < 500000; $i++ ) {
+        for ($i = 0; $i<500000; $i++) {
             $data[] = 'hello world';
         }
 

tests/04ParsingTest.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 /**
  * Tests involving xml parsing.
@@ -101,7 +101,7 @@ 
 
     public function testI8()
     {
-        if (PHP_INT_SIZE == 4 ) {
+        if (PHP_INT_SIZE == 4) {
             $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode');
             return;
         }
@@ -176,7 +176,7 @@ 
 
     public function testUnicodeInMemberName()
     {
-        $str = "G" . chr(252) . "nter, El" . chr(232) . "ne";
+        $str = "G".chr(252)."nter, El".chr(232)."ne";
         $v = array($str => new xmlrpcval(1));
         $r = new xmlrpcresp(new xmlrpcval($v, 'struct'));
         $r = $r->serialize();
@@ -192,7 +192,7 @@ 
         $response = @utf8_encode(
             '<?xml version="1.0"?>
 <!-- covers what happens when lib receives UTF8 chars in response text and comments -->
-<!-- ' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232; -->
+<!-- ' . chr(224).chr(252).chr(232).'&#224;&#252;&#232; -->
 <methodResponse>
 <fault>
 <value>
@@ -203,7 +203,7 @@ 
 </member>
 <member>
 <name>faultString</name>
-<value><string>' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232;</string></value>
+<value><string>' . chr(224).chr(252).chr(232).'&#224;&#252;&#232;</string></value>
 </member>
 </struct>
 </value>
@@ -212,7 +212,7 @@ 
         $m = $this->newRequest('dummy');
         $r = $m->parseResponse($response);
         $v = $r->faultString();
-        $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v);
+        $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v);
     }
 
     public function testBrokenRequests()
@@ -419,8 +419,8 @@ 
         $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values;
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true;
 
-        foreach($values as $value) {
-            $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> ';
+        foreach ($values as $value) {
+            $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> ';
             $r = $s->parseResponse($f);
             $v = $r->faultCode();
             $this->assertEquals(2, $v, "Testing $value");
@@ -524,11 +524,11 @@ 
 
     public function testUTF8Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newRequest('dummy');
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -536,7 +536,7 @@ 
         $this->assertEquals($string, $v);
 
         $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -552,11 +552,11 @@ 
 
     public function testLatin1Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newRequest('dummy');
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -564,7 +564,7 @@ 
         $this->assertEquals($string, $v);
 
         $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();