gggeek / phpxmlrpc

tests/phpunit_coverage.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @license code licensed under the BSD License: see file license.txt
  **/
 
-$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
+$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php");
 
 // has to be the same value as used in server.php
 $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage';

src/Autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             return;
         }
 
-        if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
+        if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
             require $file;
         }
     }

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) {

Spacing +18 added lines, -18 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);
@@ -128,7 +128,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);
@@ -148,7 +148,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);
         $innerCode .= "\$client->setDebug(\$debug);\n";
@@ -162,7 +162,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";
     }
@@ -171,7 +171,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' ||
@@ -187,19 +187,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);
         }
@@ -212,7 +212,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);
 }
@@ -220,10 +220,10 @@ 
 /**
  * @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)

src/Helper/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
             $flags = ENT_COMPAT;
             // avoid warnings on php < 5.4...
             if (defined('ENT_HTML401')) {
-                $flags =  $flags | ENT_HTML401;
+                $flags = $flags | ENT_HTML401;
             }
             if (defined('ENT_SUBSTITUTE')) {
-                $flags =  $flags | ENT_SUBSTITUTE;
+                $flags = $flags | ENT_SUBSTITUTE;
             }
             if ($encoding != null) {
                 print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>";

tests/parse_args.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
 
         // check for command line (env vars) vs. web page input params
         if (!isset($_SERVER['REQUEST_METHOD'])) {
-            foreach($_SERVER as $key => $val) {
+            foreach ($_SERVER as $key => $val) {
                 if (array_key_exists($key, $args)) {
                     $$key = $val;
                 }
@@ -87,7 +87,7 @@ 
             }
         }
         if ($HTTPURI[0] != '/') {
-            $HTTPURI = '/' . $HTTPURI;
+            $HTTPURI = '/'.$HTTPURI;
         }
         $args['HTTPURI'] = $HTTPURI;
 
@@ -101,21 +101,21 @@ 
         }
 
         if (isset($HTTPSIGNOREPEER)) {
-            $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER;
+            $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER;
         }
 
         if (isset($HTTPSVERIFYHOST)) {
-            $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST;
+            $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST;
         }
 
         if (isset($SSLVERSION)) {
-            $args['SSLVERSION'] = (int)$SSLVERSION;
+            $args['SSLVERSION'] = (int) $SSLVERSION;
         }
 
         if (isset($PROXYSERVER)) {
             $arr = explode(':', $PROXYSERVER);
             $args['PROXYSERVER'] = $arr[0];
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $args['PROXYPORT'] = $arr[1];
             } else {
                 $args['PROXYPORT'] = 8080;

tests/4ClientTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Runner\BaseTestRunner;
 
@@ -58,7 +58,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
@@ -85,7 +85,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];

Braces +6 added lines, -4 removed lines

@@ -24,14 +24,16 @@
         $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80);
         $this->client->setDebug($this->args['DEBUG']);
 
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR

tests/0CharsetTest.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;
 
@@ -32,10 +32,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);
         }
     }

tests/3EncoderTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpcs.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpcs.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Runner\BaseTestRunner;
 

Braces +6 added lines, -4 removed lines

@@ -21,14 +21,16 @@
     protected function set_up()
     {
         $this->args = argParser::getArgs();
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR

tests/2MessageTest.php

Braces +6 added lines, -4 removed lines

@@ -21,14 +21,16 @@
     protected function set_up()
     {
         $this->args = argParser::getArgs();
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tear_down()
     {
-        if ($this->args['DEBUG'] != 1)
-            return;
+        if ($this->args['DEBUG'] != 1) {
+                    return;
+        }
         $out = ob_get_clean();
         $status = $this->getStatus();
         if ($status == BaseTestRunner::STATUS_ERROR

Spacing +17 added lines, -17 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpcs.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpcs.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PHPUnit\Runner\BaseTestRunner;
 
@@ -103,7 +103,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;
         }
@@ -133,7 +133,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();
@@ -150,7 +150,7 @@ 
             '<?xml version="1.0"?>
 <!-- $Id -->
 <!-- found by G. Giunta, 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>
@@ -161,7 +161,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>
@@ -170,7 +170,7 @@ 
         $m = $this->newMsg('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()
@@ -410,11 +410,11 @@ 
 
     public function testUTF8Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newMsg('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();
@@ -422,7 +422,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();
@@ -438,11 +438,11 @@ 
 
     public function testLatin1Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newMsg('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();
@@ -450,7 +450,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();