gggeek / phpxmlrpc

tests/7DemofilesTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'demo' directory
@@ -11,9 +11,9 @@ 
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI']);
 
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     public function testAgeSort()

tests/5ServerTest.php

Spacing +32 added lines, -32 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc_wrappers.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\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestResult;
@@ -42,7 +42,7 @@ 
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            for ($i = 0; $i < count($trace); $i++) {
+            for ($i = 0; $i<count($trace); $i++) {
                 if (strpos($trace[$i]['function'], 'test') === 0) {
                     self::$failed_tests[$trace[$i]['function']] = true;
                     break;
@@ -65,7 +65,7 @@ 
      */
     public function _run($result = NULL)
     {
-        $this->testId = get_class($this) . '__' . $this->getName();
+        $this->testId = get_class($this).'__'.$this->getName();
 
         if ($result === NULL) {
             $result = $this->createResult();
@@ -97,7 +97,7 @@ 
 
         $uri = str_replace('/demo/server/server.php', '/tests/index.php?demo=server/server.php', $this->args['HTTPURI']);
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client = new xmlrpc_client($uri, $server[0], $server[1]);
         } else {
             $this->client = new xmlrpc_client($uri, $this->args['HTTPSERVER']);
@@ -107,7 +107,7 @@ 
         $this->client->request_compression = $this->request_compression;
         $this->client->accepted_compression = $this->accepted_compression;
 
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
 
         if ($this->args['DEBUG'] == 1)
             ob_start();
@@ -144,9 +144,9 @@ 
         }
         $this->validateResponse($r);
         if (is_array($errorCode)) {
-            $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         } else {
-            $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+            $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         }
         if (!$r->faultCode()) {
             if ($returnResponse) {
@@ -173,20 +173,20 @@ 
         $query = parse_url($this->client->path, PHP_URL_QUERY);
         parse_str($query, $vars);
         $query = http_build_query(array_merge($vars, $data));
-        $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
+        $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
     }
 
     public function testString()
     {
-        $sendString = "here are 3 \"entities\": < > & " .
-            "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
-            " - isn't that great? \\\"hackery\\\" at it's best " .
-            " also don't want to miss out on \$item[0]. " .
-            "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
-            "a simple CR here" . chr(13) .
-            "a simple LF here" . chr(10) .
-            "and then LFCR" . chr(10) . chr(13) .
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
+        $sendString = "here are 3 \"entities\": < > & ".
+            "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
+            " - isn't that great? \\\"hackery\\\" at it's best ".
+            " also don't want to miss out on \$item[0]. ".
+            "The real weird stuff follows: CRLF here".chr(13).chr(10).
+            "a simple CR here".chr(13).
+            "a simple LF here".chr(10).
+            "and then LFCR".chr(10).chr(13).
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
         $m = new xmlrpcmsg('examples.stringecho', array(
             new xmlrpcval($sendString, 'string'),
         ));
@@ -207,7 +207,7 @@ 
     public function testLatin1String()
     {
         $sendString =
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
         $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
             $sendString.
             '</value></param></params></methodCall>';
@@ -315,7 +315,7 @@ 
     public function testUtf8Method()
     {
         PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
-        $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
+        $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
             new xmlrpcval('hello')
         ));
         $v = $this->send($m);
@@ -337,7 +337,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -349,7 +349,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -383,7 +383,7 @@ 
         if ($v) {
             $sz = $v->arraysize();
             $got = '';
-            for ($i = 0; $i < $sz; $i++) {
+            for ($i = 0; $i<$sz; $i++) {
                 $b = $v->arraymem($i);
                 if ($b->scalarval()) {
                     $got .= '1';
@@ -446,7 +446,7 @@ 
             $got = '';
             $expected = '37210';
             $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
-            foreach($expect_array as $val) {
+            foreach ($expect_array as $val) {
                 $b = $v->structmem($val);
                 $got .= $b->me['int'];
             }
@@ -899,7 +899,7 @@ 
     {
         // make a 'deep client copy' as the original one might have many properties set
         // also for speed only wrap one method of the whole server
-        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
+        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
         if ($class == '') {
             $this->fail('Registration of remote server failed');
         } else {
@@ -938,9 +938,9 @@ 
         $cookies = array(
             //'c1' => array(),
             'c2' => array('value' => 'c2'),
-            'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
-            'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
-            'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
+            'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
+            'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
+            'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
         );
         $cookiesval = php_xmlrpc_encode($cookies);
         $m = new xmlrpcmsg('examples.setcookies', array($cookiesval));
@@ -988,10 +988,10 @@ 
         $m = new xmlrpcmsg('examples.getcookies', array());
         foreach ($cookies as $cookie => $val) {
             $this->client->setCookie($cookie, $val);
-            $cookies[$cookie] = (string)$cookies[$cookie];
+            $cookies[$cookie] = (string) $cookies[$cookie];
         }
         $r = $this->client->send($m, $this->timeout, $this->method);
-        $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
+        $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
         if (!$r->faultCode()) {
             $v = $r->value();
             $v = php_xmlrpc_decode($v);

Braces +6 added lines, -4 removed lines

@@ -109,14 +109,16 @@
 
         $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
 
-        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/9ExtraFilesTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'extras' directory
@@ -12,9 +12,9 @@ 
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI']);
 
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     public function testBenchmark()

tests/8DebuggerTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 class DebuggerTest extends PhpXmlRpc_WebTestCase
 {
@@ -8,9 +8,9 @@ 
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI']);
 
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     public function testIndex()

demo/vardemo.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/client/_prepend.php";
+require_once __DIR__."/client/_prepend.php";
 
 output('html lang="en">
 <head><title>xmlrpc</title></head>
@@ -11,9 +11,9 @@ 
 output("<h3>Testing value serialization</h3>\n");
 
 $v = new PhpXmlRpc\Value(23, "int");
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 $v = new PhpXmlRpc\Value("What are you saying? >> << &&");
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -24,7 +24,7 @@ 
     "array"
 );
 
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -52,11 +52,11 @@ 
     "struct"
 );
 
-output("<PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($v->serialize())."</PRE>");
 
 $w = new PhpXmlRpc\Value(array($v, new PhpXmlRpc\Value("That was the struct!")), "array");
 
-output("<PRE>" . htmlentities($w->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($w->serialize())."</PRE>");
 
 $w = new PhpXmlRpc\Value("Mary had a little lamb,
 Whose fleece was white as snow,
@@ -68,26 +68,26 @@ 
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
 );
-output("<PRE>" . htmlentities($w->serialize()) . "</PRE>");
-output("<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>");
+output("<PRE>".htmlentities($w->serialize())."</PRE>");
+output("<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>");
 
 $req->method('');
 $req->addParam(new PhpXmlRpc\Value("41", "int"));
 
 output("<h3>Testing request serialization</h3>\n");
 $op = $req->serialize();
-output("<PRE>" . htmlentities($op) . "</PRE>");
+output("<PRE>".htmlentities($op)."</PRE>");
 
 output("<h3>Testing ISO date format</h3><pre>\n");
 
 $t = time();
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
 output("Now is $t --> $date\n");
-output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n");
+output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n");
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
 output("That is to say $date --> $tb\n");
-output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n");
-output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n");
+output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n");
+output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n");
 
 output("</pre>\n");
 

demo/server/_prepend.php

Spacing +1 added lines, -1 removed lines

@@ -14,5 +14,5 @@
 }
 
 // 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();

demo/server/proxy.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
  * @license code licensed under the BSD License: see file license.txt
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Forward an xmlrpc request to another server, and return to client the response received.
@@ -31,7 +31,7 @@ 
     // NB: here we should validate the received url, using f.e. a whitelist...
     $client = new PhpXmlRpc\Client($url);
 
-    if ($req->getNumParams() > 3) {
+    if ($req->getNumParams()>3) {
         // we have to set some options onto the client.
         // Note that if we do not untaint the received values, warnings might be generated...
         $options = $encoder->decode($req->getParam(3));
@@ -51,7 +51,7 @@ 
                     $client->setSSLVerifyPeer($val);
                     break;
                 case 'Timeout':
-                    $timeout = (integer)$val;
+                    $timeout = (integer) $val;
                     break;
             } // switch
         }
@@ -69,7 +69,7 @@ 
     }
 
     // add debug info into response we give back to caller
-    PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize());
+    PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize());
 
     return $client->send($req, $timeout);
 }

demo/server/discuss.php

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
  * It uses a Berkeley DB database for storage.
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Value;
 
@@ -35,8 +35,8 @@ 
             $count = 0;
         }
         // add the new comment in
-        dba_insert($msgID . "_comment_${count}", $comment, $dbh);
-        dba_insert($msgID . "_name_${count}", $name, $dbh);
+        dba_insert($msgID."_comment_${count}", $comment, $dbh);
+        dba_insert($msgID."_name_${count}", $name, $dbh);
         $count++;
         dba_replace($countID, $count, $dbh);
         dba_close($dbh);
@@ -69,7 +69,7 @@ 
         $countID = "${msgID}_count";
         if (dba_exists($countID, $dbh)) {
             $count = dba_fetch($countID, $dbh);
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i<$count; $i++) {
                 $name = dba_fetch("${msgID}_name_${i}", $dbh);
                 $comment = dba_fetch("${msgID}_comment_${i}", $dbh);
                 // push a new struct onto the return array

demo/client/getstatename.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 output('<html lang="en">
 <head><title>xmlrpc - Getstatename demo</title></head>
@@ -11,30 +11,30 @@ 
 ');
 
 if (isset($_POST["stateno"]) && $_POST["stateno"] != "") {
-    $stateNo = (integer)$_POST["stateno"];
+    $stateNo = (integer) $_POST["stateno"];
     $encoder = new PhpXmlRpc\Encoder();
     $req = new PhpXmlRpc\Request('examples.getStateName',
         array($encoder->encode($stateNo))
     );
-    output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . "\n\n</pre>Debug info of server data follows...\n\n");
+    output("Sending the following request:<pre>\n\n".htmlentities($req->serialize())."\n\n</pre>Debug info of server data follows...\n\n");
     $client = new PhpXmlRpc\Client(XMLRPCSERVER);
     $client->setDebug(1);
     $r = $client->send($req);
     if (!$r->faultCode()) {
         $v = $r->value();
-        output("<br/>State number <b>" . $stateNo . "</b> is <b>"
-            . htmlspecialchars($encoder->decode($v)) . "</b><br/><br/>");
+        output("<br/>State number <b>".$stateNo."</b> is <b>"
+            . htmlspecialchars($encoder->decode($v))."</b><br/><br/>");
     } else {
         output("An error occurred: ");
-        output("Code: " . htmlspecialchars($r->faultCode())
-            . " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>");
+        output("Code: ".htmlspecialchars($r->faultCode())
+            . " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>");
     }
 } else {
     $stateNo = "";
 }
 
 output("<form action=\"getstatename.php\" method=\"POST\">
-<input name=\"stateno\" value=\"" . $stateNo . "\">
+<input name=\"stateno\" value=\"" . $stateNo."\">
 <input type=\"submit\" value=\"go\" name=\"submit\">
 </form>
 <p>Enter a state number to query its name</p>");