gggeek / phpxmlrpc

tests/04ParsingTest.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/LoggerAwareTestCase.php';
+include_once __DIR__.'/LoggerAwareTestCase.php';
 
 /**
  * Tests involving xml parsing.
@@ -101,7 +101,7 @@ 
 
     public function testI8()
     {
-        if (PHP_INT_SIZE == 4 ) {
+        if (PHP_INT_SIZE == 4) {
             $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode');
         }
 
@@ -175,7 +175,7 @@ 
 
     public function testUnicodeInMemberName()
     {
-        $str = "G" . chr(252) . "nter, El" . chr(232) . "ne";
+        $str = "G".chr(252)."nter, El".chr(232)."ne";
         $v = array($str => new xmlrpcval(1));
         $r = new xmlrpcresp(new xmlrpcval($v, 'struct'));
         $r = $r->serialize();
@@ -191,7 +191,7 @@ 
         $response = @utf8_encode(
             '<?xml version="1.0"?>
 <!-- covers what happens when lib receives UTF8 chars in response text and comments -->
-<!-- ' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232; -->
+<!-- ' . chr(224).chr(252).chr(232).'&#224;&#252;&#232; -->
 <methodResponse>
 <fault>
 <value>
@@ -202,7 +202,7 @@ 
 </member>
 <member>
 <name>faultString</name>
-<value><string>' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232;</string></value>
+<value><string>' . chr(224).chr(252).chr(232).'&#224;&#252;&#232;</string></value>
 </member>
 </struct>
 </value>
@@ -211,7 +211,7 @@ 
         $m = $this->newRequest('dummy');
         $r = $m->parseResponse($response);
         $v = $r->faultString();
-        $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v);
+        $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v);
     }
 
     public function testBrokenRequests()
@@ -468,8 +468,8 @@ 
         $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values;
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true;
 
-        foreach($values as $value) {
-            $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> ';
+        foreach ($values as $value) {
+            $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> ';
             $r = $s->parseResponse($f);
             $v = $r->faultCode();
             $this->assertEquals(2, $v, "Testing $value");
@@ -574,11 +574,11 @@ 
 
     public function testUTF8Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newRequest('dummy');
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -586,7 +586,7 @@ 
         $this->assertEquals($string, $v);
 
         $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -602,11 +602,11 @@ 
 
     public function testLatin1Response()
     {
-        $string = chr(224) . chr(252) . chr(232);
+        $string = chr(224).chr(252).chr(232);
 
         $s = $this->newRequest('dummy');
-        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+        $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();
@@ -614,7 +614,7 @@ 
         $this->assertEquals($string, $v);
 
         $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
-<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
+<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse>
 ';
         $r = $s->parseResponse($f, false, 'phpvals');
         $v = $r->value();

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

demo/server/discuss.php

Spacing +4 added lines, -4 removed lines

@@ -8,23 +8,23 @@
  *   `$functions_parameters_type` and `$exception_handling`
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
 use PhpXmlRpc\Server;
 use PhpXmlRpc\Value;
 
-$manager = new CommentManager(sys_get_temp_dir() . "/comments.db");
+$manager = new CommentManager(sys_get_temp_dir()."/comments.db");
 
 $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
 
-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
     'and the third is the comment itself. Returns the number of comments against that ID.';
 
 $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
 
-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
     'containing name and comment text.';
 
 $srv = new Server();

src/Value.php

Spacing +31 added lines, -31 removed lines

@@ -98,7 +98,7 @@ 
                     $this->me['struct'] = $val;
                     break;
                 default:
-                    $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)");
+                    $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)");
             }
         }
     }
@@ -128,7 +128,7 @@ 
         }
 
         if ($typeOf !== 1) {
-            $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)");
+            $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
             return 0;
         }
 
@@ -145,10 +145,10 @@ 
 
         switch ($this->mytype) {
             case 1:
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value');
                 return 0;
             case 3:
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value');
                 return 0;
             case 2:
                 // we're adding a scalar value to an array here
@@ -192,7 +192,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -223,7 +223,7 @@ 
 
             return 1;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');
             return 0;
         }
     }
@@ -288,7 +288,7 @@ 
         $val = reset($this->me);
         $typ = key($this->me);
 
-        return '<value>' . $this->serializeData($typ, $val, $charsetEncoding) . "</value>\n";
+        return '<value>'.$this->serializeData($typ, $val, $charsetEncoding)."</value>\n";
     }
 
     /**
@@ -303,7 +303,7 @@ 
     {
         $this->logDeprecationUnlessCalledBy('serialize');
 
-        if (!isset(static::$xmlrpcTypes[(string)$typ])) {
+        if (!isset(static::$xmlrpcTypes[(string) $typ])) {
             return '';
         }
 
@@ -311,19 +311,19 @@ 
             case 1:
                 switch ($typ) {
                     case static::$xmlrpcBase64:
-                        $rs = "<{$typ}>" . base64_encode($val) . "</{$typ}>";
+                        $rs = "<{$typ}>".base64_encode($val)."</{$typ}>";
                         break;
                     case static::$xmlrpcBoolean:
-                        $rs = "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
+                        $rs = "<{$typ}>".($val ? '1' : '0')."</{$typ}>";
                         break;
                     case static::$xmlrpcString:
                         // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml
-                        $rs = "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>";
+                        $rs = "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>";
                         break;
                     case static::$xmlrpcInt:
                     case static::$xmlrpcI4:
                     case static::$xmlrpcI8:
-                        $rs = "<{$typ}>" . (int)$val . "</{$typ}>";
+                        $rs = "<{$typ}>".(int) $val."</{$typ}>";
                         break;
                     case static::$xmlrpcDouble:
                         // avoid using standard conversion of float to string because it is locale-dependent,
@@ -331,16 +331,16 @@ 
                         // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14.
                         // The code below tries its best at keeping max precision while avoiding exp notation,
                         // but there is of course no limit in the number of decimal places to be used...
-                        $rs = "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((float)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>";
+                        $rs = "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((float) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>";
                         break;
                     case static::$xmlrpcDateTime:
                         if (is_string($val)) {
                             $rs = "<{$typ}>{$val}</{$typ}>";
                         // DateTimeInterface is not present in php 5.4...
                         } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) {
-                            $rs = "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>";
+                            $rs = "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>";
                         } elseif (is_int($val)) {
-                            $rs = "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>";
+                            $rs = "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>";
                         } else {
                             // not really a good idea here: but what should we output anyway? left for backward compat...
                             $rs = "<{$typ}>{$val}</{$typ}>";
@@ -362,14 +362,14 @@ 
             case 3:
                 // struct
                 if ($this->_php_class) {
-                    $rs = '<struct php_class="' . $this->_php_class . "\">\n";
+                    $rs = '<struct php_class="'.$this->_php_class."\">\n";
                 } else {
                     $rs = "<struct>\n";
                 }
                 $charsetEncoder = $this->getCharsetEncoder();
                 /** @var Value $val2 */
                 foreach ($val as $key2 => $val2) {
-                    $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n";
+                    $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n";
                     $rs .= $val2->serialize($charsetEncoding);
                     $rs .= "</member>\n";
                 }
@@ -581,7 +581,7 @@ 
      */
     public function structMemExists($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return array_key_exists($key, $this->me['struct']);
     }
@@ -597,7 +597,7 @@ 
      */
     public function structMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['struct'][$key];
     }
@@ -610,7 +610,7 @@ 
      */
     public function structReset()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         reset($this->me['struct']);
     }
@@ -624,7 +624,7 @@ 
      */
     public function structEach()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         $key = key($this->me['struct']);
         $value = current($this->me['struct']);
@@ -643,7 +643,7 @@ 
      */
     public function arrayMem($key)
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return $this->me['array'][$key];
     }
@@ -657,7 +657,7 @@ 
      */
     public function arraySize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['array']);
     }
@@ -671,7 +671,7 @@ 
      */
     public function structSize()
     {
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
 
         return count($this->me['struct']);
     }
@@ -683,12 +683,12 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Getting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Getting property Value::'.$name.' is deprecated');
                 return $this->$name;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 $result = null;
                 return $result;
         }
@@ -700,13 +700,13 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Setting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Setting property Value::'.$name.' is deprecated');
                 $this->$name = $value;
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -716,7 +716,7 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Checking property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Checking property Value::'.$name.' is deprecated');
                 return isset($this->$name);
             default:
                 return false;
@@ -729,13 +729,13 @@ 
             case 'me':
             case 'mytype':
             case '_php_class':
-                $this->logDeprecation('Unsetting property Value::' . $name . ' is deprecated');
+                $this->logDeprecation('Unsetting property Value::'.$name.' is deprecated');
                 unset($this->$name);
                 break;
             default:
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }