gggeek / phpxmlrpc

tests/verify_compat.php

Spacing +7 added lines, -7 removed lines

@@ -17,8 +17,8 @@ 
         // test for php version
         $ver = phpversion();
         $tests['php_version'] = array();
-        $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n";
-        if (version_compare($ver, '5.3.0') < 0) {
+        $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n";
+        if (version_compare($ver, '5.3.0')<0) {
             $tests['php_version']['status'] = 0;
             $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later';
         } else {
@@ -51,8 +51,8 @@ 
         // test for php version
         $ver = phpversion();
         $tests['php_version'] = array();
-        $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n";
-        if (version_compare($ver, '5.3.0') < 0) {
+        $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n";
+        if (version_compare($ver, '5.3.0')<0) {
             $tests['php_version']['status'] = 0;
             $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later';
         } else {
@@ -79,7 +79,7 @@ 
             $info = curl_version();
             $tests['curl']['status'] = 2;
             $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols";
-            if (version_compare($ver, '4.3.8') < 0) {
+            if (version_compare($ver, '4.3.8')<0) {
                 $tests['curl']['status'] = 1;
                 $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives";
             }
@@ -167,7 +167,7 @@ 
     <?php
     $res = phpxmlrpc_verify_compat('server');
     foreach ($res as $test => $result) {
-        echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n";
+        echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n";
     }
     ?>
     </tbody>
@@ -184,7 +184,7 @@ 
     <?php
     $res = phpxmlrpc_verify_compat('client');
     foreach ($res as $test => $result) {
-        echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n";
+        echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n";
     }
     ?>
     </tbody>

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['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/debugger/', $this->args['URI'] );
+        $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/debugger/', $this->args['URI']);
 
-        $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']);
     }
 
     public function testIndex()

tests/4LocalhostMultiTest.php

Spacing +15 added lines, -15 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__ . '/3LocalhostTest.php';
+include_once __DIR__.'/3LocalhostTest.php';
 
 /**
  * Tests which stress http features of the library.
@@ -20,9 +20,9 @@ 
     function _runtests()
     {
         $unsafeMethods = array('testHttps', 'testCatchExceptions', 'testUtf8Method', 'testServerComments', 'testExoticCharsetsRequests', 'testExoticCharsetsRequests2', 'testExoticCharsetsRequests3');
-        foreach(get_class_methods('LocalhostTest') as $method)
+        foreach (get_class_methods('LocalhostTest') as $method)
         {
-            if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
+            if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
             {
                 if (!isset(self::$failed_tests[$method]))
                     $this->$method();
@@ -36,7 +36,7 @@ 
 
     function testDeflate()
     {
-        if(!function_exists('gzdeflate'))
+        if (!function_exists('gzdeflate'))
         {
             $this->markTestSkipped('Zlib missing: cannot test deflate functionality');
             return;
@@ -48,7 +48,7 @@ 
 
     function testGzip()
     {
-        if(!function_exists('gzdeflate'))
+        if (!function_exists('gzdeflate'))
         {
             $this->markTestSkipped('Zlib missing: cannot test gzip functionality');
             return;
@@ -60,7 +60,7 @@ 
 
     function testKeepAlives()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
             return;
@@ -83,7 +83,7 @@ 
 
     function testHttp11()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
             return;
@@ -98,7 +98,7 @@ 
 
     function testHttp11Gzip()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
             return;
@@ -113,7 +113,7 @@ 
 
     function testHttp11Deflate()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1');
             return;
@@ -128,7 +128,7 @@ 
 
     function testHttp11Proxy()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
             return;
@@ -149,7 +149,7 @@ 
 
     function testHttps()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
             return;
@@ -166,7 +166,7 @@ 
 
     function testHttpsProxy()
     {
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
             return;

Braces +7 added lines, -8 removed lines

@@ -24,8 +24,9 @@ 
         {
             if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
             {
-                if (!isset(self::$failed_tests[$method]))
-                    $this->$method();
+                if (!isset(self::$failed_tests[$method])) {
+                                    $this->$method();
+                }
             }
             /*if ($this->_failed)
             {
@@ -76,9 +77,9 @@ 
         {
             $this->client->setProxy($this->args['PROXYSERVER'], $this->args['PROXYPORT']);
             $this->_runtests();
+        } else {
+                    $this->markTestSkipped('PROXY definition missing: cannot test proxy');
         }
-        else
-            $this->markTestSkipped('PROXY definition missing: cannot test proxy');
     }
 
     function testHttp11()
@@ -132,8 +133,7 @@ 
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXY definition missing: cannot test proxy w. http 1.1');
             return;
@@ -170,8 +170,7 @@ 
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXY definition missing: cannot test proxy w. http 1.1');
             return;

tests/benchmark.php

Spacing +33 added lines, -33 removed lines

@@ -17,9 +17,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)
@@ -39,7 +39,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();
@@ -73,24 +73,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();
@@ -115,7 +115,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();
 }
@@ -123,8 +123,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');
@@ -138,18 +138,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();
             }
         }
@@ -159,18 +159,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();
         while (list($name, $val) = $val1->structeach()) {
             $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();
             }
@@ -181,7 +181,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();
 }
@@ -189,7 +189,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());
     }
@@ -203,15 +203,15 @@ 
     $value = $encoder->encode($data1, array('auto_dates'));
     $req = new Request('interopEchoTests.echoValue', array($value));
     $reqs = array();
-    for ($i = 0; $i < 25; $i++) {
+    for ($i = 0; $i<25; $i++) {
         $reqs[] = $req;
     }
     $server = explode(':', $args['LOCALSERVER']);
-    if (count($server) > 1) {
-        $srv = $server[1] . '://' . $server[0] . $args['URI'];
+    if (count($server)>1) {
+        $srv = $server[1].'://'.$server[0].$args['URI'];
         $c = new Client($args['URI'], $server[0], $server[1]);
     } else {
-        $srv = $args['LOCALSERVER'] . $args['URI'];
+        $srv = $args['LOCALSERVER'].$args['URI'];
         $c = new Client($args['URI'], $args['LOCALSERVER']);
     }
     // do not interfere with http compression
@@ -225,7 +225,7 @@ 
     }
     begin_test($testName, 'http 10');
     $response = array();
-    for ($i = 0; $i < 25; $i++) {
+    for ($i = 0; $i<25; $i++) {
         $resp = $c->send($req);
         $response[] = $resp->value();
     }
@@ -234,7 +234,7 @@ 
     if (function_exists('curl_init')) {
         begin_test($testName, 'http 11 w. keep-alive');
         $response = array();
-        for ($i = 0; $i < 25; $i++) {
+        for ($i = 0; $i<25; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -243,7 +243,7 @@ 
         $c->keepalive = false;
         begin_test($testName, 'http 11');
         $response = array();
-        for ($i = 0; $i < 25; $i++) {
+        for ($i = 0; $i<25; $i++) {
             $resp = $c->send($req, 10, 'http11');
             $response[] = $resp->value();
         }
@@ -263,7 +263,7 @@ 
 
         begin_test($testName, 'http 10 w. compression');
         $response = array();
-        for ($i = 0; $i < 25; $i++) {
+        for ($i = 0; $i<25; $i++) {
             $resp = $c->send($req);
             $response[] = $resp->value();
         }
@@ -272,7 +272,7 @@ 
         if (function_exists('curl_init')) {
             begin_test($testName, 'http 11 w. keep-alive and compression');
             $response = array();
-            for ($i = 0; $i < 25; $i++) {
+            for ($i = 0; $i<25; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -281,7 +281,7 @@ 
             $c->keepalive = false;
             begin_test($testName, 'http 11 w. compression');
             $response = array();
-            for ($i = 0; $i < 25; $i++) {
+            for ($i = 0; $i<25; $i++) {
                 $resp = $c->send($req, 10, 'http11');
                 $response[] = $resp->value();
             }
@@ -302,7 +302,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";
     }
 }
 

tests/parse_args.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
             if (isset($argv)) {
                 foreach ($argv as $param) {
                     $param = explode('=', $param);
-                    if (count($param) > 1) {
+                    if (count($param)>1) {
                         $pname = strtoupper(ltrim($param[0], '-'));
                         $$pname = $param[1];
                     }
@@ -72,18 +72,18 @@ 
             $args['HTTPSURI'] = $HTTPSURI;
         }
         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($PROXY)) {
             $arr = explode(':', $PROXY);
             $args['PROXYSERVER'] = $arr[0];
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $args['PROXYPORT'] = $arr[1];
             } else {
                 $args['PROXYPORT'] = 8080;
@@ -112,7 +112,7 @@ 
             }
         }
         if ($URI[0] != '/') {
-            $URI = '/' . $URI;
+            $URI = '/'.$URI;
         }
         $args['URI'] = $URI;
         if (isset($LOCALPATH)) {

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';

tests/2InvalidHostTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?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';
 
 /**
  * Tests involving requests sent to non-existing servers
@@ -55,7 +55,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());
         }
@@ -80,7 +80,7 @@ 
 
         // now test a successful connection
         $server = explode(':', $this->args['LOCALSERVER']);
-        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

@@ -20,14 +20,16 @@
         $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['LOCALSERVER'], 80);
         $this->client->setDebug($this->args['DEBUG']);
 
-        if ($this->args['DEBUG'] == 1)
-            ob_start();
+        if ($this->args['DEBUG'] == 1) {
+                    ob_start();
+        }
     }
 
     protected function tearDown()
     {
-        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/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['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/tests/', $this->args['URI'] );
+        $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/tests/', $this->args['URI']);
 
-        $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']);
     }
 
     public function testVerifyCompat()

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['LOCALSERVER'] . str_replace( '/demo/server/server.php', '/demo/', $this->args['URI'] );
+        $this->baseUrl = $this->args['LOCALSERVER'].str_replace('/demo/server/server.php', '/demo/', $this->args['URI']);
 
-        $this->coverageScriptUrl = 'http://' . $this->args['LOCALSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI'] );
+        $this->coverageScriptUrl = 'http://'.$this->args['LOCALSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['URI']);
     }
 
     public function testAgeSort()