gggeek / phpxmlrpc

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

tests/09HTTPTest.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/08ServerTest.php';
+include_once __DIR__.'/08ServerTest.php';
 
 /**
  * Tests which stress http features of the library.
@@ -34,7 +34,7 @@ 
     {
         $methods = array();
         // as long as we are descendants, get_class_methods will list private/protected methods
-        foreach(get_class_methods('ServerTest') as $method)
+        foreach (get_class_methods('ServerTest') as $method)
         {
             if (strpos($method, 'test') === 0 && !in_array($method, $this->unsafeMethods))
             {
@@ -148,7 +148,7 @@ 
         // this checks for a non-failed call
         $time = microtime(true);
         $this->send($m);
-        $time = microtime(true) - $time;
+        $time = microtime(true)-$time;
         $this->assertGreaterThan(1.0, $time);
         $this->assertLessThan(2.0, $time);
 
@@ -156,7 +156,7 @@ 
         $m = new xmlrpcmsg('tests.sleep', array(new xmlrpcval(5, 'int')));
         $time = microtime(true);
         $r = $this->send($m, array(0, PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['http_error'], PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['curl_fail']));
-        $time = microtime(true) - $time;
+        $time = microtime(true)-$time;
         $this->assertGreaterThan(2.0, $time);
         $this->assertLessThan(4.0, $time);
 
@@ -176,7 +176,7 @@ 
         $this->addQueryParams(array('SLOW_LORIS' => 1));
         $time = microtime(true);
         $this->send($m, array(0, PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['http_error'], PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['curl_fail']));
-        $time = microtime(true) - $time;
+        $time = microtime(true)-$time;
         $this->assertGreaterThan(2.0, $time);
         $this->assertLessThan(4.0, $time);
     }
@@ -355,7 +355,7 @@ 
                 preg_match('/ubunutu([0-9]+)/', $output[0], $matches);
                 $ubuntuVersion = @$matches[1];
             }
-            if ($ubuntuVersion >= 20 && $this->args['SSLVERSION'] != 6) {
+            if ($ubuntuVersion>=20 && $this->args['SSLVERSION'] != 6) {
                 $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher');
             }
         }
@@ -380,7 +380,7 @@ 
             $this->client->setOption(\PhpXmlRpc\Client::OPT_EXTRA_SOCKET_OPTS,
                 array('ssl' => array(
                     // security level is available as of php 7.2.0 + openssl 1.1.0 according to the docs
-                    'security_level' => min(1 + $version[1], 5),
+                    'security_level' => min(1+$version[1], 5),
                     // capture_session_meta was deprecated in php 7.0
                     //'capture_session_meta' => true,
                 ))
@@ -528,7 +528,7 @@ 
         if (version_compare(PHP_VERSION, '8.0', '>=') && $this->args['SSLVERSION'] == 0)
         {
             $version = explode('.', PHP_VERSION);
-            $this->client->setSSLVersion(min(4 + $version[1], 7));
+            $this->client->setSSLVersion(min(4+$version[1], 7));
         }
 
         $this->$method();

Braces +4 added lines, -8 removed lines

@@ -304,8 +304,7 @@ 
         if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
         }
@@ -480,8 +479,7 @@ 
         if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
         }
@@ -505,12 +503,10 @@ 
         if (!function_exists('curl_init'))
         {
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
         }

lib/xmlrpcs.inc

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function echoInput()
     {
-        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string'));
+        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string'));
         print $r->serialize();
     }
 
@@ -65,7 +65,7 @@ 
      */
     public function &__get($name)
     {
-        switch($name) {
+        switch ($name) {
             case 'dmap':
                 return $this->dmap;
             default:
@@ -96,30 +96,30 @@ 
     Server::xmlrpc_debugmsg($m);
 }
 
-function _xmlrpcs_getCapabilities($server, $m=null)
+function _xmlrpcs_getCapabilities($server, $m = null)
 {
     return Server::_xmlrpcs_getCapabilities($server, $m);
 }
 
-$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
-$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
-$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
-function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
+$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray));
+$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
+$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
+function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
 {
     return Server::_xmlrpcs_listMethods($server, $m);
 }
 
-$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcString));
-$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
-$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
+$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcString));
+$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
+$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
 function _xmlrpcs_methodSignature($server, $m)
 {
     return Server::_xmlrpcs_methodSignature($server, $m);
 }
 
-$_xmlrpcs_methodHelp_sig=array(array(\PhpXmlRpc\Value::$xmlrpcString, \PhpXmlRpc\Value::$xmlrpcString));
-$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
-$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
+$_xmlrpcs_methodHelp_sig = array(array(\PhpXmlRpc\Value::$xmlrpcString, \PhpXmlRpc\Value::$xmlrpcString));
+$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
+$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
 function _xmlrpcs_methodHelp($server, $m)
 {
     return Server::_xmlrpcs_methodHelp($server, $m);

demo/client/codegen.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the code-generation capabilities of the library: create a client class which exposes a bunch of methods
@@ -26,12 +26,12 @@ 
 );
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
-$targetFile = sys_get_temp_dir() . '/MyClient.php';
+$targetFile = sys_get_temp_dir().'/MyClient.php';
 $generated = file_put_contents($targetFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     $code['code']
 );
 
@@ -51,8 +51,8 @@ 
 $client = new MyClient();
 $sorted = $client->examples_sortByAge(array(
     array('name' => 'Dave', 'age' => 24),
-    array('name' => 'Edd',  'age' => 45),
-    array('name' => 'Joe',  'age' => 37),
+    array('name' => 'Edd', 'age' => 45),
+    array('name' => 'Joe', 'age' => 37),
     array('name' => 'Fred', 'age' => 27),
 ));
 

demo/server/codegen.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the code-generation capabilities of the library: create all that is required to expose as xml-rpc methods
@@ -13,7 +13,7 @@ 
 use PhpXmlRpc\Wrapper;
 
 // CommentManager is the "xml-rpc-unaware" class, whose methods we want to make accessible via xml-rpc calls
-$cm = new CommentManager(sys_get_temp_dir() . "/comments.db");
+$cm = new CommentManager(sys_get_temp_dir()."/comments.db");
 
 // analyze the CommentManager instance and generate both code defining stub-methods and a dispatch map for the xml-rpc Server
 $w = new Wrapper();
@@ -31,40 +31,40 @@ 
 // and a controller, to be accessed from the internet. This split allows to a) hand-edit the controller code if needed,
 // and b) later regenerate the stub-methods-holder and dispatch map without touching the controller.
 // NB: good security practices dictate that none of those files should be writeable by the webserver user account
-$targetClassFile = sys_get_temp_dir() . '/MyServerClass.php';
-$targetDispatchMapFile = sys_get_temp_dir() . '/myServerDispatchMap.php';
-$targetControllerFile = sys_get_temp_dir() . '/myServerController.php';
+$targetClassFile = sys_get_temp_dir().'/MyServerClass.php';
+$targetDispatchMapFile = sys_get_temp_dir().'/myServerDispatchMap.php';
+$targetControllerFile = sys_get_temp_dir().'/myServerController.php';
 
 // generate a file with a class definition
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
 file_put_contents($targetClassFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     "class MyServerClass\n{\n\n"
 ) || die('uh oh');
 
 // we mangle a bit the code we get from wrapPhpClass to turn it into a php class definition instead of a bunch of functions
 
-foreach($code as $methodName => $methodDef) {
-    file_put_contents($targetClassFile, '  ' . str_replace(array('function ', "\n"), array('public static function ', "\n  "), $methodDef['source']) . "\n\n", FILE_APPEND) || die('uh oh');
-    $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function'];
+foreach ($code as $methodName => $methodDef) {
+    file_put_contents($targetClassFile, '  '.str_replace(array('function ', "\n"), array('public static function ', "\n  "), $methodDef['source'])."\n\n", FILE_APPEND) || die('uh oh');
+    $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function'];
     unset($code[$methodName]['source']);
 }
 file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh');
 
 // generate separate files with the xml-rpc server instantiation and its dispatch map
 
-file_put_contents($targetDispatchMapFile, "<?php\n\nreturn " . var_export($code, true) . ";\n");
+file_put_contents($targetDispatchMapFile, "<?php\n\nreturn ".var_export($code, true).";\n");
 
 file_put_contents($targetControllerFile,
-    "<?php\n\n" .
+    "<?php\n\n".
 
-    "require_once '$autoloader';\n\n" .
+    "require_once '$autoloader';\n\n".
 
-    "require_once '$targetClassFile';\n\n" .
+    "require_once '$targetClassFile';\n\n".
 
     // NB: since we are running the generated code within the same script, the existing CommentManager instance will be
     // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder
@@ -74,12 +74,12 @@ 
     //     Wrapper::holdObject('xmlrpc_CommentManager_addComment', $cm);
     //     Wrapper::holdObject('xmlrpc_CommentManager_getComments', $cm);
 
-    "\$dm = require_once '$targetDispatchMapFile';\n" .
-    '$s = new \PhpXmlRpc\Server($dm, false);' . "\n\n" .
-    '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!' . "\n" .
-    '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);' . "\n" .
-    '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);' . "\n\n" .
-    '$s->service();' . "\n"
+    "\$dm = require_once '$targetDispatchMapFile';\n".
+    '$s = new \PhpXmlRpc\Server($dm, false);'."\n\n".
+    '// NB: do not leave these 2 debug lines enabled on publicly accessible servers!'."\n".
+    '$s->setOption(\PhpXmlRpc\Server::OPT_DEBUG, 2);'."\n".
+    '$s->setOption(\PhpXmlRpc\Server::OPT_EXCEPTION_HANDLING, 1);'."\n\n".
+    '$s->service();'."\n"
 ) || die('uh oh');
 
 // test that everything worked by running it in realtime (note that this script will return an xml-rpc error message if