gggeek / phpxmlrpc

tests/2InvalidHostTest.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';
 
 /**
  * Tests involving requests sent to non-existing servers
@@ -57,7 +57,7 @@ 
         // make sure there's no freaking catchall DNS in effect
         $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 {
             $this->assertEquals(5, $r->faultCode());
         }
@@ -82,7 +82,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

@@ -22,14 +22,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 == PHPUnit_Runner_BaseTestRunner::STATUS_ERROR

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/7ExtraTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LocalFileTestCase.php';
+include_once __DIR__.'/LocalFileTestCase.php';
 
 /**
  * Tests for php files in the 'extras' directory
@@ -11,9 +11,9 @@ 
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/', $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 testVerifyCompat()

tests/6DebuggerTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LocalFileTestCase.php';
+include_once __DIR__.'/LocalFileTestCase.php';
 
 class DebuggerTest extends PhpXmlRpc_LocalFileTestCase
 {
@@ -8,9 +8,9 @@ 
     {
         $this->args = argParser::getArgs();
 
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/debugger/', $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()

tests/5DemofilesTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LocalFileTestCase.php';
+include_once __DIR__.'/LocalFileTestCase.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', '/demo/', $this->args['HTTPURI'] );
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/demo/', $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/3LocalhostTest.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\Framework\TestResult;
 
@@ -36,7 +36,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;
@@ -57,7 +57,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();
@@ -88,7 +88,7 @@ 
         $this->args = argParser::getArgs();
 
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
         } else {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
@@ -98,7 +98,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();
@@ -134,9 +134,9 @@ 
             return $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) {
@@ -158,20 +158,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'),
         ));
@@ -192,7 +192,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>';
@@ -296,7 +296,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);
@@ -318,7 +318,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -330,7 +330,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -364,7 +364,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';
@@ -427,7 +427,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'];
             }
@@ -856,7 +856,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 {
@@ -895,9 +895,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));
@@ -945,10 +945,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

@@ -100,14 +100,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 == PHPUnit_Runner_BaseTestRunner::STATUS_ERROR

tests/benchmark.php

Spacing +34 added lines, -34 removed lines

@@ -19,9 +19,9 @@ 
 use PhpXmlRpc\Response;
 use PhpXmlRpc\Encoder;
 
-include_once __DIR__ . '/../vendor/autoload.php';
+include_once __DIR__.'/../vendor/autoload.php';
 
-include __DIR__ . '/parse_args.php';
+include __DIR__.'/parse_args.php';
 $args = argParser::getArgs();
 
 function begin_test($test_name, $test_case)
@@ -41,7 +41,7 @@ 
     if (!isset($test_results[$test_name][$test_case])) {
         trigger_error('ending test that was not started');
     }
-    $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time'];
+    $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time'];
     $test_results[$test_name][$test_case]['result'] = $test_result;
     echo '.';
     flush();
@@ -75,24 +75,24 @@ 
 }
 
 if ($is_web) {
-    echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n";
+    echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n";
     if ($xd) {
-        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n";
+        echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n";
     }
     flush();
     ob_flush();
 } else {
-    echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n";
+    echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n";
     if ($xd) {
-        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n";
+        echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n";
     }
 }
 
 // test 'manual style' data encoding vs. 'automatic style' encoding
 begin_test('Data encoding (large array)', 'manual encoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $vals = array();
-    for ($j = 0; $j < 10; $j++) {
+    for ($j = 0; $j<10; $j++) {
         $valarray = array();
         foreach ($data[$j] as $key => $val) {
             $values = array();
@@ -117,7 +117,7 @@ 
 
 begin_test('Data encoding (large array)', 'automatic encoding');
 $encoder = new Encoder();
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $value = $encoder->encode($data, array('auto_dates'));
     $out = $value->serialize();
 }
@@ -125,8 +125,8 @@ 
 
 if (function_exists('xmlrpc_set_type')) {
     begin_test('Data encoding (large array)', 'xmlrpc-epi encoding');
-    for ($i = 0; $i < $num_tests; $i++) {
-        for ($j = 0; $j < 10; $j++) {
+    for ($i = 0; $i<$num_tests; $i++) {
+        for ($j = 0; $j<10; $j++) {
             foreach ($keys as $k) {
                 xmlrpc_set_type($data[$j][$k][4], 'datetime');
                 xmlrpc_set_type($data[$j][$k][8], 'datetime');
@@ -140,18 +140,18 @@ 
 // test 'old style' data decoding vs. 'automatic style' decoding
 $dummy = new Request('');
 $out = new Response($value);
-$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize();
+$in = '<?xml version="1.0" ?>'."\n".$out->serialize();
 
 begin_test('Data decoding (large array)', 'manual decoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true);
     $value = $response->value();
     $result = array();
-    foreach($value as $val1) {
+    foreach ($value as $val1) {
         $out = array();
-        foreach($val1 as $name => $val) {
+        foreach ($val1 as $name => $val) {
             $out[$name] = array();
-            foreach($val as $data) {
+            foreach ($val as $data) {
                 $out[$name][] = $data->scalarval();
             }
         }
@@ -161,18 +161,18 @@ 
 end_test('Data decoding (large array)', 'manual decoding', $result);
 
 begin_test('Data decoding (large array)', 'manual decoding deprecated');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true);
     $value = $response->value();
     $result = array();
     $l = $value->arraysize();
-    for ($k = 0; $k < $l; $k++) {
+    for ($k = 0; $k<$l; $k++) {
         $val1 = $value->arraymem($k);
         $out = array();
-        foreach($val1 as $name => $val) {
+        foreach ($val1 as $name => $val) {
             $out[$name] = array();
             $m = $val->arraysize();
-            for ($j = 0; $j < $m; $j++) {
+            for ($j = 0; $j<$m; $j++) {
                 $data = $val->arraymem($j);
                 $out[$name][] = $data->scalarval();
             }
@@ -183,7 +183,7 @@ 
 end_test('Data decoding (large array)', 'manual decoding deprecated', $result);
 
 begin_test('Data decoding (large array)', 'automatic decoding');
-for ($i = 0; $i < $num_tests; $i++) {
+for ($i = 0; $i<$num_tests; $i++) {
     $response = $dummy->ParseResponse($in, true, 'phpvals');
     $value = $response->value();
 }
@@ -191,7 +191,7 @@ 
 
 if (function_exists('xmlrpc_decode')) {
     begin_test('Data decoding (large array)', 'xmlrpc-epi decoding');
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $response = $dummy->ParseResponse($in, true, 'xml');
         $value = xmlrpc_decode($response->value());
     }
@@ -207,15 +207,15 @@ 
     $value = $encoder->encode($data1, array('auto_dates'));
     $req = new Request('interopEchoTests.echoValue', array($value));
     $reqs = array();
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $reqs[] = $req;
     }
     $server = explode(':', $args['HTTPSERVER']);
-    if (count($server) > 1) {
-        $srv = $server[1] . '://' . $server[0] . $args['HTTPURI'];
+    if (count($server)>1) {
+        $srv = $server[1].'://'.$server[0].$args['HTTPURI'];
         $c = new Client($args['HTTPURI'], $server[0], $server[1]);
     } else {
-        $srv = $args['HTTPSERVER'] . $args['HTTPURI'];
+        $srv = $args['HTTPSERVER'].$args['HTTPURI'];
         $c = new Client($args['HTTPURI'], $args['HTTPSERVER']);
     }
     // do not interfere with http compression
@@ -229,7 +229,7 @@ 
     }
     begin_test($testName, 'http 10');
     $response = array();
-    for ($i = 0; $i < $num_tests; $i++) {
+    for ($i = 0; $i<$num_tests; $i++) {
         $resp = $c->send($req);
         $response[] = $resp->value();
     }
@@ -238,7 +238,7 @@ 
     if (function_exists('curl_init')) {
         begin_test($testName, 'http 11 w. keep-alive');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -247,7 +247,7 @@ 
         $c->keepalive = false;
         begin_test($testName, 'http 11');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -267,7 +267,7 @@ 
 
         begin_test($testName, 'http 10 w. compression');
         $response = array();
-        for ($i = 0; $i < $num_tests; $i++) {
+        for ($i = 0; $i<$num_tests; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -276,7 +276,7 @@ 
         if (function_exists('curl_init')) {
             begin_test($testName, 'http 11 w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -285,7 +285,7 @@ 
             $c->keepalive = false;
             begin_test($testName, 'http 11 w. compression');
             $response = array();
-            for ($i = 0; $i < $num_tests; $i++) {
+            for ($i = 0; $i<$num_tests; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -306,7 +306,7 @@ 
 foreach ($test_results as $test => $results) {
     echo "\nTEST: $test\n";
     foreach ($results as $case => $data) {
-        echo "  $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n";
+        echo "  $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n";
     }
 }
 

demo/server/discuss.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Value;
 
@@ -31,8 +31,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);
@@ -65,7 +65,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
@@ -101,4 +101,4 @@ 
     ),
 ));
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";

demo/server/server.php

Spacing +27 added lines, -27 removed lines

@@ -9,7 +9,7 @@ 
  * Please do not copy this file verbatim into your production server.
  **/
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\Value;
 
@@ -105,11 +105,11 @@ 
     // extract the value of the state number
     $snv = $sno->scalarval();
     // look it up in our array (zero-based)
-    if (isset($stateNames[$snv - 1])) {
-        $stateName = $stateNames[$snv - 1];
+    if (isset($stateNames[$snv-1])) {
+        $stateName = $stateNames[$snv-1];
     } else {
         // not there, so complain
-        $err = "I don't have a state for the index '" . $snv . "'";
+        $err = "I don't have a state for the index '".$snv."'";
     }
 
     // if we generated an error, create an error return response
@@ -135,11 +135,11 @@ 
 {
     global $stateNames;
 
-    if (isset($stateNames[$stateNo - 1])) {
-        return $stateNames[$stateNo - 1];
+    if (isset($stateNames[$stateNo-1])) {
+        return $stateNames[$stateNo-1];
     } else {
         // not, there so complain
-        throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
+        throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser);
     }
 }
 
@@ -169,17 +169,17 @@ 
 eval($findstate9_sig['source']);
 
 $findstate10_sig = array(
-    "function" => function ($req) { return findState($req); },
+    "function" => function($req) { return findState($req); },
     "signature" => $findstate_sig,
     "docstring" => $findstate_doc,
 );
 
-$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return inner_findstate($stateNo); });
+$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return inner_findstate($stateNo); });
 
 $c = new xmlrpcServerMethodsContainer;
 $moreSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'tests.', 'method_type' => 'all'));
 
-$returnObj_sig =  $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
+$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true));
 
 // used to test signatures with NULL params
 $findstate12_sig = array(
@@ -205,7 +205,7 @@ 
     $s = $req->getParam(0);
     $t = $req->getParam(1);
 
-    return new PhpXmlRpc\Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt));
+    return new PhpXmlRpc\Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt));
 }
 
 $addtwodouble_sig = array(array(Value::$xmlrpcDouble, Value::$xmlrpcDouble, Value::$xmlrpcDouble));
@@ -215,7 +215,7 @@ 
     $s = $req->getParam(0);
     $t = $req->getParam(1);
 
-    return new PhpXmlRpc\Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble));
+    return new PhpXmlRpc\Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble));
 }
 
 $stringecho_sig = array(array(Value::$xmlrpcString, Value::$xmlrpcString));
@@ -231,7 +231,7 @@ 
 function echoBack($req)
 {
     // just sends back a string with what i got sent to me, just escaped, that's all
-    $s = "I got the following message:\n" . $req->serialize();
+    $s = "I got the following message:\n".$req->serialize();
 
     return new PhpXmlRpc\Response(new Value($s));
 }
@@ -288,7 +288,7 @@ 
         return 0;
     }
 
-    return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1;
+    return ($agesorter_arr[$a]>$agesorter_arr[$b]) ? -1 : 1;
 }
 
 $agesorter_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcArray));
@@ -334,7 +334,7 @@ 
     // hack, must make global as uksort() won't
     // allow us to pass any other auxiliary information
     uksort($agesorter_arr, 'agesorter_compare');
-    foreach($agesorter_arr as $key => $val) {
+    foreach ($agesorter_arr as $key => $val) {
         // recreate each struct element
         $v[] = new Value(
             array(
@@ -389,17 +389,17 @@ 
         $err = "Error, no 'From' field specified";
     }
 
-    $msgHdr = "From: " . $mFrom->scalarval() . "\n";
-    $msgHdr .= "To: " . $mTo->scalarval() . "\n";
+    $msgHdr = "From: ".$mFrom->scalarval()."\n";
+    $msgHdr .= "To: ".$mTo->scalarval()."\n";
 
     if ($mCc->scalarval() != "") {
-        $msgHdr .= "Cc: " . $mCc->scalarval() . "\n";
+        $msgHdr .= "Cc: ".$mCc->scalarval()."\n";
     }
     if ($mBcc->scalarval() != "") {
-        $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n";
+        $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n";
     }
     if ($mMime->scalarval() != "") {
-        $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n";
+        $msgHdr .= "Content-type: ".$mMime->scalarval()."\n";
     }
     $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
 
@@ -489,7 +489,7 @@ 
     $moe = $sno["moe"];
     $larry = $sno["larry"];
     $curly = $sno["curly"];
-    $num = $moe->scalarval() + $larry->scalarval() + $curly->scalarval();
+    $num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval();
 
     return new PhpXmlRpc\Response(new Value($num, Value::$xmlrpcInt));
 }
@@ -531,9 +531,9 @@ 
     $ar = $req->getParam(0);
     $sz = $ar->count();
     $first = $ar[0];
-    $last = $ar[$sz - 1];
+    $last = $ar[$sz-1];
 
-    return new PhpXmlRpc\Response(new Value($first->scalarval() .
+    return new PhpXmlRpc\Response(new Value($first->scalarval().
         $last->scalarval(), Value::$xmlrpcString));
 }
 
@@ -567,7 +567,7 @@ 
     $larry = $fools["larry"];
     $moe = $fools["moe"];
 
-    return new PhpXmlRpc\Response(new Value($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), Value::$xmlrpcInt));
+    return new PhpXmlRpc\Response(new Value($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), Value::$xmlrpcInt));
 }
 
 $v1_countTheEntities_sig = array(array(Value::$xmlrpcStruct, Value::$xmlrpcString));
@@ -581,7 +581,7 @@ 
     $ap = 0;
     $qu = 0;
     $amp = 0;
-    for ($i = 0; $i < strlen($str); $i++) {
+    for ($i = 0; $i<strlen($str); $i++) {
         $c = substr($str, $i, 1);
         switch ($c) {
             case ">":
@@ -783,7 +783,7 @@ 
     ),
     // Greek word 'kosme'. NB: NOT a valid ISO8859 string!
     // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods
-    "tests.utf8methodname." . 'κόσμε' => array(
+    "tests.utf8methodname.".'κόσμε' => array(
         "function" => "stringEcho",
         "signature" => $stringecho_sig,
         "docstring" => $stringecho_doc,
@@ -976,4 +976,4 @@ 
 $s->service();
 // That should do all we need!
 
-require_once __DIR__ . "/_append.php";
+require_once __DIR__."/_append.php";