gggeek / phpxmlrpc

tests/parse_args.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
         // check for command line params (passed as env vars) vs. web page input params (passed as GET/POST)
         // Note that the only use-case for web-page mode is when this is used by benchmark.php
         if (!isset($_SERVER['REQUEST_METHOD'])) {
-            foreach($_SERVER as $key => $val) {
+            foreach ($_SERVER as $key => $val) {
                 if (array_key_exists($key, $args)) {
                     $$key = $val;
                 }
@@ -91,7 +91,7 @@ 
             //}
         }
         if ($HTTPURI[0] != '/') {
-            $HTTPURI = '/' . $HTTPURI;
+            $HTTPURI = '/'.$HTTPURI;
         }
         $args['HTTPURI'] = $HTTPURI;
 
@@ -105,21 +105,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;

demo/server/server.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     }
 }
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\PhpXmlRpc;
 use PhpXmlRpc\Server;

demo/server/legacy.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 // That is generally a good idea security-wise, but you might want to allow it in case of specific needs.
 // Look at the code in demo/server.php for an example of how to enable that.
 
-require_once __DIR__ . "/../../lib/xmlrpc.inc";
-require_once __DIR__ . "/../../lib/xmlrpcs.inc";
+require_once __DIR__."/../../lib/xmlrpc.inc";
+require_once __DIR__."/../../lib/xmlrpcs.inc";
 
 $signatures1 = include(__DIR__.'/methodProviders/functions.php');
 $signatures2 = include(__DIR__.'/methodProviders/interop.php');

demo/server/methodProviders/testsuite.php

Braces +6 added lines, -5 removed lines

@@ -88,11 +88,12 @@
     $a = $req->getParam(0);
     $b = $req->getParam(1);
 
-    if ($a->scalarTyp() == Value::$xmlrpcNull)
-        return new Response(new Value(plain_findstate($b->scalarVal())));
-    else
-        return new Response(new Value(plain_findstate($a->scalarVal())));
-}
+    if ($a->scalarTyp() == Value::$xmlrpcNull) {
+            return new Response(new Value(plain_findstate($b->scalarVal())));
+    } else {
+            return new Response(new Value(plain_findstate($a->scalarVal())));
+    }
+    }
 
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
                 $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
             } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
                 $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
-                $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass);
+                $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.$basic_pass);
             } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
                 $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
             }
@@ -62,12 +62,12 @@ 
     foreach ($cookies as $name => $cookieDesc) {
         if (is_array($cookieDesc)) {
             setcookie($name,
-                isset($cookieDesc['value']) ? (string)$cookieDesc['value'] : '',
+                isset($cookieDesc['value']) ? (string) $cookieDesc['value'] : '',
                 isset($cookieDesc['expires']) ? $cookieDesc['expires'] : 0,
-                isset($cookieDesc['path']) ? (string)$cookieDesc['path'] : '',
-                isset($cookieDesc['domain']) ? (string)$cookieDesc['domain'] : '',
-                isset($cookieDesc['secure']) ? (bool)$cookieDesc['secure'] : false,
-                isset($cookieDesc['httponly']) ? (bool)$cookieDesc['httponly'] : false
+                isset($cookieDesc['path']) ? (string) $cookieDesc['path'] : '',
+                isset($cookieDesc['domain']) ? (string) $cookieDesc['domain'] : '',
+                isset($cookieDesc['secure']) ? (bool) $cookieDesc['secure'] : false,
+                isset($cookieDesc['httponly']) ? (bool) $cookieDesc['httponly'] : false
             );
         } else {
             /// @todo what to do?
@@ -104,7 +104,7 @@ 
 $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt));
 $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response';
 function sleepSeconds($secs) {
-    if ($secs > 0 && $secs < 61) {
+    if ($secs>0 && $secs<61) {
         sleep($secs);
     }
     return $secs;
@@ -137,7 +137,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" => "exampleMethods::stringEcho",
         "signature" => exampleMethods::$stringecho_sig,
         "docstring" => exampleMethods::$stringecho_doc,

tests/08ServerTest.php

Spacing +27 added lines, -27 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 /**
  * Tests which involve interaction with the server - carried out via the client.
@@ -30,7 +30,7 @@ 
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'servertest') {
             $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;
@@ -79,9 +79,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) {
@@ -108,20 +108,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'),
         ));
@@ -142,7 +142,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>';
@@ -251,7 +251,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);
@@ -272,7 +272,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -284,7 +284,7 @@ 
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -323,7 +323,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';
@@ -370,7 +370,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->scalarVal();
             }
@@ -873,7 +873,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 {
@@ -912,9 +912,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('tests.setcookies', array($cookiesval));
@@ -962,10 +962,10 @@ 
         $m = new xmlrpcmsg('tests.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);

tests/index.php

Spacing +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
 // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also
 // write a specific file to disk.
 // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file
-$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt';
+$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt';
 $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : '';
 $fileId = file_exists($idFile) ? file_get_contents($idFile) : '';
 if ($randId == '' || $fileId == '' || $fileId !== $randId) {
@@ -31,7 +31,7 @@ 
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }
 
 $targetFile = null;
@@ -54,7 +54,7 @@ 
 }
 
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }
 
 /**
@@ -87,7 +87,7 @@ 
         } elseif ($_GET['FORCE_AUTH'] == 'Digest') {
             if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
                 header('HTTP/1.1 401 Unauthorized');
-                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
+                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
                 die('Text visible if user hits Cancel button');
             }
         }
@@ -95,11 +95,11 @@ 
     if (isset($_GET['FORCE_REDIRECT'])) {
         header('HTTP/1.0 302 Found');
         unset($_GET['FORCE_REDIRECT']);
-        header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : ''));
+        header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : ''));
         die();
     }
-    if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS'] > 0) {
-        slowLoris((int)$_GET['SLOW_LORIS'], $s);
+    if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS']>0) {
+        slowLoris((int) $_GET['SLOW_LORIS'], $s);
         die();
     }
 }
@@ -113,13 +113,13 @@ 
 {
     /// @todo as is, this method can not be used by eg. jsonrpc servers. We could look at the value $s::$responseClass
     ///       to improve that
-    $strings = array('<?xml version="1.0"?>','<methodResponse>','<params>','<param>','<value>','<string></string>','</value>','</param>','</params>','</methodResponse>');
+    $strings = array('<?xml version="1.0"?>', '<methodResponse>', '<params>', '<param>', '<value>', '<string></string>', '</value>', '</param>', '</params>', '</methodResponse>');
 
     header('Content-type: xml; charset=utf-8');
-    foreach($strings as $i => $string) {
+    foreach ($strings as $i => $string) {
         echo $string;
         flush();
-        if ($i < count($strings) && $secs > 0 && $secs <= 60) {
+        if ($i<count($strings) && $secs>0 && $secs<=60) {
             sleep($secs);
         }
     }

tests/legacy_loader_test.php

Spacing +7 added lines, -7 removed lines

@@ -6,15 +6,15 @@ 
 
 echo "Legacy Loader Test\n\n";
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
 $args = argParser::getArgs();
-$baseurl = 'http://' . $args['HTTPSERVER'] . str_replace('/server.php', '/legacy.php', $args['HTTPURI']);
+$baseurl = 'http://'.$args['HTTPSERVER'].str_replace('/server.php', '/legacy.php', $args['HTTPURI']);
 
 $randId = uniqid();
-file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', $randId);
+file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', $randId);
 
 $client = new xmlrpc_client($baseurl);
 $client->setCookie('PHPUNIT_RANDOM_TEST_ID', $randId);
@@ -22,11 +22,11 @@ 
 $req = new xmlrpcmsg('system.listMethods', array());
 $resp = $client->send($req);
 if ($resp->faultCode() !== 0) {
-    unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt');
-    throw new \Exception("system.listMethods returned fault " . $resp->faultCode());
+    unlink(sys_get_temp_dir().'/phpunit_rand_id.txt');
+    throw new \Exception("system.listMethods returned fault ".$resp->faultCode());
 }
 echo ". 1/1 (100%)\n\n";
 
 echo "OK (1 test, 1 assertion)\n";
 
-unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt');
+unlink(sys_get_temp_dir().'/phpunit_rand_id.txt');

tests/13LegacyAPITest.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/ServerAwareTestCase.php';
+include_once __DIR__.'/ServerAwareTestCase.php';
 
 /**
  * @todo Long-term, this should replace all testing of the legacy API done via the main test-suite...
@@ -14,7 +14,7 @@ 
     {
         /// @todo pass on as cli args for the executed script all the args that are already parsed by now, plus $this->testId
 
-        exec('php ' . __DIR__ . '/legacy_loader_test.php', $out, $result);
+        exec('php '.__DIR__.'/legacy_loader_test.php', $out, $result);
 
         /// @todo dump output if in debug mode or if test fails
 

tests/ServerAwareTestCase.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestResult;
@@ -30,7 +30,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();
@@ -62,13 +62,13 @@ 
 
         // Set up a database connection or other fixture which needs to be available.
         self::$randId = uniqid();
-        file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', self::$randId);
+        file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', self::$randId);
     }
 
     public static function tear_down_after_class()
     {
-        if (is_file(sys_get_temp_dir() . '/phpunit_rand_id.txt')) {
-            unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt');
+        if (is_file(sys_get_temp_dir().'/phpunit_rand_id.txt')) {
+            unlink(sys_get_temp_dir().'/phpunit_rand_id.txt');
         }
 
         parent::tear_down_after_class();
@@ -79,15 +79,15 @@ 
         parent::set_up();
 
         // assumes HTTPURI to be in the form /tests/index.php?etc...
-        $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']);
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
+        $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']);
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     protected function getClient()
     {
         $server = explode(':', $this->args['HTTPSERVER']);
         /// @todo use the non-legacy API calling convention, except in a dedicated test
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
         } else {
             $client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);