Inspection of "add demo code for Symfony" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 2df217...792a3a )

by Gaetano

created 2023-01-31 18:51 UTC

Status

Braces +4 added lines, -8 removed lines patch added patch discarded remove patch

@@ -201,8 +201,7 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
             return;
@@ -226,8 +225,7 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test https functionality');
             return;
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
             return;
@@ -278,13 +276,11 @@  discard block
 block discarded – undo
         {
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
             return;
-        }
-        else if ($this->args['PROXYSERVER'] == '')
+        } else if ($this->args['PROXYSERVER'] == '')
         {
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
             return;
-        }
-        else if ($this->args['HTTPSSERVER'] == '')
+        } else if ($this->args['HTTPSSERVER'] == '')
         {
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
             return;

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/08ServerTest.php';
+include_once __DIR__.'/08ServerTest.php';
 
 /**
  * Tests which stress http features of the library.
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
         );
 
         $methods = array();
-        foreach(get_class_methods('ServerTest') as $method)
+        foreach (get_class_methods('ServerTest') as $method)
         {
             if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
             {
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
                 preg_match('/ubunutu([0-9]+)/', $output[0], $matches);
                 $ubuntuVersion = @$matches[1];
             }
-            if ($ubuntuVersion >= 20) {
+            if ($ubuntuVersion>=20) {
                 $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher');
                 return;
             }

Please login to merge, or discard this patch.

demo/vardemo.php 1 patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-require_once __DIR__ . "/client/_prepend.php";
+require_once __DIR__."/client/_prepend.php";
 
 output('<html lang="en">
 <head><title>phpxmlrpc</title></head>
@@ -10,25 +10,25 @@  discard block
 block discarded – undo
 output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n");
 
 $v = new PhpXmlRpc\Value(1234, 'int');
-output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Int: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >');
-output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("String <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(true, 'boolean');
-output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(1234.5678, 'double');
-output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Double: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601');
-output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>");
 $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601');
-output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value('hello world', 'base64');
-output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
-output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>");
+output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>");
+output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
     ),
     "array"
 );
-output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Array: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $v = new PhpXmlRpc\Value(
     array(
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
     ),
     "struct"
 );
-output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 $w = new PhpXmlRpc\Value(array($v), 'array');
-output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
+output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>");
 
 class MyClass
 {
@@ -76,49 +76,49 @@  discard block
 block discarded – undo
 // the public property is the only one which will be serialized. As such, it has to be of type Value
 $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped');
 $w = new PhpXmlRpc\Value($myObject, 'struct');
-output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
+output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>");
 
 output("<h3>Testing value serialization - xml-rpc extensions</h3>\n");
 $v = new PhpXmlRpc\Value(1234, 'i8');
-output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("I8: <PRE>".htmlentities($v->serialize())."</PRE>");
 $v = new PhpXmlRpc\Value(null, 'null');
-output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Null: <PRE>".htmlentities($v->serialize())."</PRE>");
 \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true;
-output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 output("<h3>Testing value serialization - character encoding</h3>\n");
 // The greek word 'kosme'
 $v = new PhpXmlRpc\Value('κόσμε');
-output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
-output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>");
+output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>");
+output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>");
 if (function_exists('mb_convert_encoding')) {
-    output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>");
+    output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>");
 }
 
 output("<h3>Testing request serialization</h3>\n");
 $req = new PhpXmlRpc\Request('examples.getStateName');
 $req->method('examples.getStateName');
 $req->addParam(new PhpXmlRpc\Value(42, 'int'));
-output("<PRE>" . htmlentities($req->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($req->serialize())."</PRE>");
 
 output("<h3>Testing response serialization</h3>\n");
 $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life'));
-output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>");
+output("<PRE>".htmlentities($resp->serialize())."</PRE>");
 
 output("<h3>Testing ISO date formatting</h3><pre>\n");
 $t = time();
 $date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
 output("Now is $t --> $date\n");
-output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n");
+output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n");
 $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
 output("That is to say $date --> $tb\n");
-output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n");
-output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n");
+output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n");
+output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n");
 output("</pre>\n");
 
 output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n");
 $v = new PhpXmlRpc\Value(1234.56789, 'double');
 \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2;
-output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
+output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>");
 
 output('</body></html>');

Please login to merge, or discard this patch.

demo/server/server.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
     }
 }
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\PhpXmlRpc;
 use PhpXmlRpc\Server;
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
         } 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');
             }
         }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
     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();
     }
 }

Please login to merge, or discard this patch.

demo/client/_prepend.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
 }
 
 // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();
 
 // Let unit tests run against localhost, 'plain' demos against a known public server
@@ -22,5 +22,5 @@  discard block
 block discarded – undo
 function output($text)
 {
     /// @todo we should only strip html tags, and let through all xml tags
-    echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>','<br>'), "\n", $text)) : $text;
+    echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>', '<br>'), "\n", $text)) : $text;
 }

Please login to merge, or discard this patch.

tests/05LoggerTest.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/PolyfillTestCase.php';
+include_once __DIR__.'/PolyfillTestCase.php';
 
 use PhpXmlRpc\Helper\Charset;
 use PhpXmlRpc\Helper\Http;
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
         $l = $h->getLogger();
         Http::setLogger($this);
 
-        $s = "HTTP/1.0 200 OK\r\n" .
-            "Content-Type: unknown\r\n" .
-            "\r\n" .
+        $s = "HTTP/1.0 200 OK\r\n".
+            "Content-Type: unknown\r\n".
+            "\r\n".
             "body";
         ob_start();
         $h->parseResponseHeaders($s, false, 1);

Please login to merge, or discard this patch.

src/Request.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -57,9 +57,9 @@  discard block
 block discarded – undo
     public function xml_header($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
         } else {
-            return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+            return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
         }
     }
 
@@ -82,16 +82,16 @@  discard block
 block discarded – undo
     public function createPayload($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         $this->payload = $this->xml_header($charsetEncoding);
-        $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
-            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
+        $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
+            $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
         $this->payload .= "<params>\n";
         foreach ($this->params as $p) {
-            $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
+            $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
                 "</param>\n";
         }
         $this->payload .= "</params>\n";
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
 
             return true;
         } else {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
             return false;
         }
     }
@@ -213,14 +213,14 @@  discard block
 block discarded – undo
      */
     public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
     {
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $this->getLogger()->debug("---GOT---\n$data\n---END---");
         }
 
         $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
 
         if ($data == '') {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
             return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
         }
 
@@ -228,12 +228,12 @@  discard block
 block discarded – undo
         if (substr($data, 0, 4) == 'HTTP') {
             $httpParser = new Http();
             try {
-                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
+                $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
             } catch (HttpException $e) {
                 // failed processing of HTTP response headers
                 // save into response obj the full payload received, for debugging
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
             }
         } else {
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
         // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
         $pos = strrpos($data, '</methodResponse>');
         if ($pos !== false) {
-            $data = substr($data, 0, $pos + 17);
+            $data = substr($data, 0, $pos+17);
         }
 
         // try to 'guestimate' the character encoding of the received response
@@ -258,21 +258,21 @@  discard block
 block discarded – undo
             $data
         );
 
-        if ($this->debug >= 0) {
+        if ($this->debug>=0) {
             $this->httpResponse = $httpResponse;
         } else {
             $httpResponse = null;
         }
 
-        if ($this->debug > 0) {
+        if ($this->debug>0) {
             $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
             if ($start) {
                 $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
                 /// @todo what if there is no end tag?
                 $end = strpos($data, '-->', $start);
-                $comments = substr($data, $start, $end - $start);
-                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t" .
-                    str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
+                $comments = substr($data, $start, $end-$start);
+                $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t".
+                    str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
             }
         }
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
                     if ($respEncoding == 'ISO-8859-1') {
                         $data = utf8_encode($data);
                     } else {
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
                     }
                 }
             }
@@ -320,16 +320,16 @@  discard block
 block discarded – undo
             //    there could be proxies meddling with the request, or network data corruption...
 
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
-                PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
 
-            if ($this->debug > 0) {
+            if ($this->debug>0) {
                 $this->getLogger()->debug($xmlRpcParser->_xh['isf_reason']);
             }
         }
         // second error check: xml well-formed but not xml-rpc compliant
         elseif ($xmlRpcParser->_xh['isf'] == 2) {
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
-                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
+                PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
 
             /// @todo echo something for the user? check if it was already done by the parser...
             //if ($this->debug > 0) {
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
         }
         // third error check: parsing of the response has somehow gone boink.
         /// @todo shall we omit this check, since we trust the parsing code?
-        elseif ($xmlRpcParser->_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
+        elseif ($xmlRpcParser->_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
             // something odd has happened and it's time to generate a client side error indicating something odd went on
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
                 '', $httpResponse
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
 
             /// @todo echo something for the user?
         } else {
-            if ($this->debug > 1) {
+            if ($this->debug>1) {
                 $this->getLogger()->debug(
                     "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
                 );
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
                 if ($errNo == 0) {
                     // FAULT returned, errno needs to reflect that
                     /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
                     $errNo = -1;
                 }
 

Please login to merge, or discard this patch.

tests/12ExtraFilesTest.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'extras' directory.

Please login to merge, or discard this patch.

tests/10DemofilesTest.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'demo' directory.

Please login to merge, or discard this patch.

tests/08ServerTest.php 1 patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?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.
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
         // (but only if not called from subclass objects / multitests)
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            for ($i = 0; $i < count($trace); $i++) {
+            for ($i = 0; $i<count($trace); $i++) {
                 if (strpos($trace[$i]['function'], 'test') === 0) {
                     self::$failed_tests[$trace[$i]['function']] = true;
                     break;
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
         parent::set_up();
 
         $server = explode(':', $this->args['HTTPSERVER']);
-        if (count($server) > 1) {
+        if (count($server)>1) {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
         } else {
             $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
         }
         $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) {
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
         $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'),
         ));
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
     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>';
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
     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);
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals($a + $b, $v->scalarval());
+            $this->assertEquals($a+$b, $v->scalarval());
         }
     }
 
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
         ));
         $v = $this->send($m);
         if ($v) {
-            $this->assertEquals(12 - 23, $v->scalarval());
+            $this->assertEquals(12-23, $v->scalarval());
         }
     }
 
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
         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';
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
             $got = '';
             $expected = '37210';
             $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
-            foreach($expect_array as $val) {
+            foreach ($expect_array as $val) {
                 $b = $v->structmem($val);
                 $got .= $b->me['int'];
             }
@@ -868,7 +868,7 @@  discard block
 block discarded – undo
     {
         // 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 {
@@ -907,9 +907,9 @@  discard block
 block discarded – undo
         $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));
@@ -957,10 +957,10 @@  discard block
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

		@@ -201,8 +201,7 @@ discard block
		block discarded – undo
201	201	{
202	202	$this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
203	203	return;
204		- }
205		- else if ($this->args['PROXYSERVER'] == '')
	204	+ } else if ($this->args['PROXYSERVER'] == '')
206	205	{
207	206	$this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
208	207	return;
		@@ -226,8 +225,7 @@ discard block
		block discarded – undo
226	225	{
227	226	$this->markTestSkipped('CURL missing: cannot test https functionality');
228	227	return;
229		- }
230		- else if ($this->args['HTTPSSERVER'] == '')
	228	+ } else if ($this->args['HTTPSSERVER'] == '')
231	229	{
232	230	$this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
233	231	return;
		@@ -278,13 +276,11 @@ discard block
		block discarded – undo
278	276	{
279	277	$this->markTestSkipped('CURL missing: cannot test https w. proxy');
280	278	return;
281		- }
282		- else if ($this->args['PROXYSERVER'] == '')
	279	+ } else if ($this->args['PROXYSERVER'] == '')
283	280	{
284	281	$this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
285	282	return;
286		- }
287		- else if ($this->args['HTTPSSERVER'] == '')
	283	+ } else if ($this->args['HTTPSSERVER'] == '')
288	284	{
289	285	$this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
290	286	return;

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/08ServerTest.php';
	3	+include_once __DIR__.'/08ServerTest.php';
4	4
5	5	/**
6	6	* Tests which stress http features of the library.
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	);
26	26
27	27	$methods = array();
28		- foreach(get_class_methods('ServerTest') as $method)
	28	+ foreach (get_class_methods('ServerTest') as $method)
29	29	{
30	30	if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
31	31	{
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	preg_match('/ubunutu([0-9]+)/', $output[0], $matches);
318	318	$ubuntuVersion = @$matches[1];
319	319	}
320		- if ($ubuntuVersion >= 20) {
	320	+ if ($ubuntuVersion>=20) {
321	321	$this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher');
322	322	return;
323	323	}

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-require_once __DIR__ . "/client/_prepend.php";
	2	+require_once __DIR__."/client/_prepend.php";
3	3
4	4	output('<html lang="en">
5	5	<head><title>phpxmlrpc</title></head>
		@@ -10,25 +10,25 @@ discard block
		block discarded – undo
10	10	output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n");
11	11
12	12	$v = new PhpXmlRpc\Value(1234, 'int');
13		-output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	13	+output("Int: <PRE>".htmlentities($v->serialize())."</PRE>");
14	14
15	15	$v = new PhpXmlRpc\Value('Are the following characters escaped? < & >');
16		-output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	16	+output("String <PRE>".htmlentities($v->serialize())."</PRE>");
17	17
18	18	$v = new PhpXmlRpc\Value(true, 'boolean');
19		-output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	19	+output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>");
20	20
21	21	$v = new PhpXmlRpc\Value(1234.5678, 'double');
22		-output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	22	+output("Double: <PRE>".htmlentities($v->serialize())."</PRE>");
23	23
24	24	$v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601');
25		-output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	25	+output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>");
26	26	$v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601');
27		-output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	27	+output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>");
28	28
29	29	$v = new PhpXmlRpc\Value('hello world', 'base64');
30		-output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
31		-output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>");
	30	+output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>");
	31	+output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>");
32	32
33	33	$v = new PhpXmlRpc\Value(
34	34	array(
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	),
42	42	"array"
43	43	);
44		-output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	44	+output("Array: <PRE>".htmlentities($v->serialize())."</PRE>");
45	45
46	46	$v = new PhpXmlRpc\Value(
47	47	array(
		@@ -61,10 +61,10 @@ discard block
		block discarded – undo
61	61	),
62	62	"struct"
63	63	);
64		-output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	64	+output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>");
65	65
66	66	$w = new PhpXmlRpc\Value(array($v), 'array');
67		-output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
	67	+output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>");
68	68
69	69	class MyClass
70	70	{
		@@ -76,49 +76,49 @@ discard block
		block discarded – undo
76	76	// the public property is the only one which will be serialized. As such, it has to be of type Value
77	77	$myObject->public = new \PhpXmlRpc\Value('a public property, wrapped');
78	78	$w = new PhpXmlRpc\Value($myObject, 'struct');
79		-output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>");
	79	+output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>");
80	80
81	81	output("<h3>Testing value serialization - xml-rpc extensions</h3>\n");
82	82	$v = new PhpXmlRpc\Value(1234, 'i8');
83		-output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	83	+output("I8: <PRE>".htmlentities($v->serialize())."</PRE>");
84	84	$v = new PhpXmlRpc\Value(null, 'null');
85		-output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	85	+output("Null: <PRE>".htmlentities($v->serialize())."</PRE>");
86	86	\PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true;
87		-output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	87	+output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>");
88	88
89	89	output("<h3>Testing value serialization - character encoding</h3>\n");
90	90	// The greek word 'kosme'
91	91	$v = new PhpXmlRpc\Value('κόσμε');
92		-output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>");
93		-output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>");
	92	+output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>");
	93	+output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>");
94	94	if (function_exists('mb_convert_encoding')) {
95		- output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>");
	95	+ output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>");
96	96	}
97	97
98	98	output("<h3>Testing request serialization</h3>\n");
99	99	$req = new PhpXmlRpc\Request('examples.getStateName');
100	100	$req->method('examples.getStateName');
101	101	$req->addParam(new PhpXmlRpc\Value(42, 'int'));
102		-output("<PRE>" . htmlentities($req->serialize()) . "</PRE>");
	102	+output("<PRE>".htmlentities($req->serialize())."</PRE>");
103	103
104	104	output("<h3>Testing response serialization</h3>\n");
105	105	$resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life'));
106		-output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>");
	106	+output("<PRE>".htmlentities($resp->serialize())."</PRE>");
107	107
108	108	output("<h3>Testing ISO date formatting</h3><pre>\n");
109	109	$t = time();
110	110	$date = PhpXmlRpc\Helper\Date::iso8601Encode($t);
111	111	output("Now is $t --> $date\n");
112		-output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n");
	112	+output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n");
113	113	$tb = PhpXmlRpc\Helper\Date::iso8601Decode($date);
114	114	output("That is to say $date --> $tb\n");
115		-output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n");
116		-output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n");
	115	+output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n");
	116	+output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n");
117	117	output("</pre>\n");
118	118
119	119	output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n");
120	120	$v = new PhpXmlRpc\Value(1234.56789, 'double');
121	121	\PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2;
122		-output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>");
	122	+output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>");
123	123
124	124	output('</body></html>');

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	}
25	25	}
26	26
27		-require_once __DIR__ . "/_prepend.php";
	27	+require_once __DIR__."/_prepend.php";
28	28
29	29	use PhpXmlRpc\PhpXmlRpc;
30	30	use PhpXmlRpc\Server;
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	} elseif ($_GET['FORCE_AUTH'] == 'Digest') {
84	84	if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
85	85	header('HTTP/1.1 401 Unauthorized');
86		- header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
	86	+ header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
87	87	die('Text visible if user hits Cancel button');
88	88	}
89	89	}
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	if (isset($_GET['FORCE_REDIRECT'])) {
92	92	header('HTTP/1.0 302 Found');
93	93	unset($_GET['FORCE_REDIRECT']);
94		- header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : ''));
	94	+ header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : ''));
95	95	die();
96	96	}
97	97	}

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	}
9	9
10	10	// Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer
11		-include_once __DIR__ . '/../../src/Autoloader.php';
	11	+include_once __DIR__.'/../../src/Autoloader.php';
12	12	PhpXmlRpc\Autoloader::register();
13	13
14	14	// Let unit tests run against localhost, 'plain' demos against a known public server
		@@ -22,5 +22,5 @@ discard block
		block discarded – undo
22	22	function output($text)
23	23	{
24	24	/// @todo we should only strip html tags, and let through all xml tags
25		- echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>','<br>'), "\n", $text)) : $text;
	25	+ echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>', '<br>'), "\n", $text)) : $text;
26	26	}

		@@ -57,9 +57,9 @@ discard block
		block discarded – undo
57	57	public function xml_header($charsetEncoding = '')
58	58	{
59	59	if ($charsetEncoding != '') {
60		- return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n";
	60	+ return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n";
61	61	} else {
62		- return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
	62	+ return "<?xml version=\"1.0\"?".">\n<methodCall>\n";
63	63	}
64	64	}
65	65
		@@ -82,16 +82,16 @@ discard block
		block discarded – undo
82	82	public function createPayload($charsetEncoding = '')
83	83	{
84	84	if ($charsetEncoding != '') {
85		- $this->content_type = 'text/xml; charset=' . $charsetEncoding;
	85	+ $this->content_type = 'text/xml; charset='.$charsetEncoding;
86	86	} else {
87	87	$this->content_type = 'text/xml';
88	88	}
89	89	$this->payload = $this->xml_header($charsetEncoding);
90		- $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities(
91		- $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n";
	90	+ $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities(
	91	+ $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n";
92	92	$this->payload .= "<params>\n";
93	93	foreach ($this->params as $p) {
94		- $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) .
	94	+ $this->payload .= "<param>\n".$p->serialize($charsetEncoding).
95	95	"</param>\n";
96	96	}
97	97	$this->payload .= "</params>\n";
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141
142	142	return true;
143	143	} else {
144		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value');
	144	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value');
145	145	return false;
146	146	}
147	147	}
		@@ -213,14 +213,14 @@ discard block
		block discarded – undo
213	213	*/
214	214	public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS)
215	215	{
216		- if ($this->debug > 0) {
	216	+ if ($this->debug>0) {
217	217	$this->getLogger()->debug("---GOT---\n$data\n---END---");
218	218	}
219	219
220	220	$this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array());
221	221
222	222	if ($data == '') {
223		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.');
	223	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.');
224	224	return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']);
225	225	}
226	226
		@@ -228,12 +228,12 @@ discard block
		block discarded – undo
228	228	if (substr($data, 0, 4) == 'HTTP') {
229	229	$httpParser = new Http();
230	230	try {
231		- $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0);
	231	+ $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0);
232	232	} catch (HttpException $e) {
233	233	// failed processing of HTTP response headers
234	234	// save into response obj the full payload received, for debugging
235	235	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode()));
236		- } catch(\Exception $e) {
	236	+ } catch (\Exception $e) {
237	237	return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data));
238	238	}
239	239	} else {
		@@ -249,7 +249,7 @@ discard block
		block discarded – undo
249	249	// idea from Luca Mariano <[email protected]> originally in PEARified version of the lib
250	250	$pos = strrpos($data, '</methodResponse>');
251	251	if ($pos !== false) {
252		- $data = substr($data, 0, $pos + 17);
	252	+ $data = substr($data, 0, $pos+17);
253	253	}
254	254
255	255	// try to 'guestimate' the character encoding of the received response
		@@ -258,21 +258,21 @@ discard block
		block discarded – undo
258	258	$data
259	259	);
260	260
261		- if ($this->debug >= 0) {
	261	+ if ($this->debug>=0) {
262	262	$this->httpResponse = $httpResponse;
263	263	} else {
264	264	$httpResponse = null;
265	265	}
266	266
267		- if ($this->debug > 0) {
	267	+ if ($this->debug>0) {
268	268	$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
269	269	if ($start) {
270	270	$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
271	271	/// @todo what if there is no end tag?
272	272	$end = strpos($data, '-->', $start);
273		- $comments = substr($data, $start, $end - $start);
274		- $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t" .
275		- str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding));
	273	+ $comments = substr($data, $start, $end-$start);
	274	+ $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED) ---\n\t".
	275	+ str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding));
276	276	}
277	277	}
278	278
		@@ -294,7 +294,7 @@ discard block
		block discarded – undo
294	294	if ($respEncoding == 'ISO-8859-1') {
295	295	$data = utf8_encode($data);
296	296	} else {
297		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding);
	297	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding);
298	298	}
299	299	}
300	300	}
		@@ -320,16 +320,16 @@ discard block
		block discarded – undo
320	320	// there could be proxies meddling with the request, or network data corruption...
321	321
322	322	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'],
323		- PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
	323	+ PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
324	324
325		- if ($this->debug > 0) {
	325	+ if ($this->debug>0) {
326	326	$this->getLogger()->debug($xmlRpcParser->_xh['isf_reason']);
327	327	}
328	328	}
329	329	// second error check: xml well-formed but not xml-rpc compliant
330	330	elseif ($xmlRpcParser->_xh['isf'] == 2) {
331	331	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'],
332		- PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
	332	+ PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', $httpResponse);
333	333
334	334	/// @todo echo something for the user? check if it was already done by the parser...
335	335	//if ($this->debug > 0) {
		@@ -338,7 +338,7 @@ discard block
		block discarded – undo
338	338	}
339	339	// third error check: parsing of the response has somehow gone boink.
340	340	/// @todo shall we omit this check, since we trust the parsing code?
341		- elseif ($xmlRpcParser->_xh['isf'] > 3 \|\| $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
	341	+ elseif ($xmlRpcParser->_xh['isf']>3 \|\| $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) {
342	342	// something odd has happened and it's time to generate a client side error indicating something odd went on
343	343	$r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
344	344	'', $httpResponse
		@@ -346,7 +346,7 @@ discard block
		block discarded – undo
346	346
347	347	/// @todo echo something for the user?
348	348	} else {
349		- if ($this->debug > 1) {
	349	+ if ($this->debug>1) {
350	350	$this->getLogger()->debug(
351	351	"---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---"
352	352	);
		@@ -370,7 +370,7 @@ discard block
		block discarded – undo
370	370	if ($errNo == 0) {
371	371	// FAULT returned, errno needs to reflect that
372	372	/// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr
373		- $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1');
	373	+ $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1');
374	374	$errNo = -1;
375	375	}
376	376

		@@ -1,6 +1,6 @@
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/WebTestCase.php';
	3	+include_once __DIR__.'/WebTestCase.php';
4	4
5	5	/**
6	6	* Tests for php files in the 'extras' directory.

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
	3	+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
4	4
5		-include_once __DIR__ . '/ServerAwareTestCase.php';
	5	+include_once __DIR__.'/ServerAwareTestCase.php';
6	6
7	7	/**
8	8	* Tests which involve interaction with the server - carried out via the client.
		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	// (but only if not called from subclass objects / multitests)
30	30	if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
31	31	$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
32		- for ($i = 0; $i < count($trace); $i++) {
	32	+ for ($i = 0; $i<count($trace); $i++) {
33	33	if (strpos($trace[$i]['function'], 'test') === 0) {
34	34	self::$failed_tests[$trace[$i]['function']] = true;
35	35	break;
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	parent::set_up();
46	46
47	47	$server = explode(':', $this->args['HTTPSERVER']);
48		- if (count($server) > 1) {
	48	+ if (count($server)>1) {
49	49	$this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
50	50	} else {
51	51	$this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
		@@ -75,9 +75,9 @@ discard block
		block discarded – undo
75	75	}
76	76	$this->validateResponse($r);
77	77	if (is_array($errorCode)) {
78		- $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	78	+ $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
79	79	} else {
80		- $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	80	+ $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
81	81	}
82	82	if (!$r->faultCode()) {
83	83	if ($returnResponse) {
		@@ -104,20 +104,20 @@ discard block
		block discarded – undo
104	104	$query = parse_url($this->client->path, PHP_URL_QUERY);
105	105	parse_str($query, $vars);
106	106	$query = http_build_query(array_merge($vars, $data));
107		- $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
	107	+ $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
108	108	}
109	109
110	110	public function testString()
111	111	{
112		- $sendString = "here are 3 \"entities\": < > & " .
113		- "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
114		- " - isn't that great? \\\"hackery\\\" at it's best " .
115		- " also don't want to miss out on \$item[0]. " .
116		- "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
117		- "a simple CR here" . chr(13) .
118		- "a simple LF here" . chr(10) .
119		- "and then LFCR" . chr(10) . chr(13) .
120		- "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
	112	+ $sendString = "here are 3 \"entities\": < > & ".
	113	+ "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
	114	+ " - isn't that great? \\\"hackery\\\" at it's best ".
	115	+ " also don't want to miss out on \$item[0]. ".
	116	+ "The real weird stuff follows: CRLF here".chr(13).chr(10).
	117	+ "a simple CR here".chr(13).
	118	+ "a simple LF here".chr(10).
	119	+ "and then LFCR".chr(10).chr(13).
	120	+ "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
121	121	$m = new xmlrpcmsg('examples.stringecho', array(
122	122	new xmlrpcval($sendString, 'string'),
123	123	));
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	public function testLatin1String()
139	139	{
140	140	$sendString =
141		- "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
	141	+ "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
142	142	$x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
143	143	$sendString.
144	144	'</value></param></params></methodCall>';
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	public function testUtf8Method()
248	248	{
249	249	PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
250		- $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
	250	+ $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
251	251	new xmlrpcval('hello')
252	252	));
253	253	$v = $this->send($m);
		@@ -268,7 +268,7 @@ discard block
		block discarded – undo
268	268	));
269	269	$v = $this->send($m);
270	270	if ($v) {
271		- $this->assertEquals($a + $b, $v->scalarval());
	271	+ $this->assertEquals($a+$b, $v->scalarval());
272	272	}
273	273	}
274	274
		@@ -280,7 +280,7 @@ discard block
		block discarded – undo
280	280	));
281	281	$v = $this->send($m);
282	282	if ($v) {
283		- $this->assertEquals(12 - 23, $v->scalarval());
	283	+ $this->assertEquals(12-23, $v->scalarval());
284	284	}
285	285	}
286	286
		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	if ($v) {
320	320	$sz = $v->arraysize();
321	321	$got = '';
322		- for ($i = 0; $i < $sz; $i++) {
	322	+ for ($i = 0; $i<$sz; $i++) {
323	323	$b = $v->arraymem($i);
324	324	if ($b->scalarval()) {
325	325	$got .= '1';
		@@ -366,7 +366,7 @@ discard block
		block discarded – undo
366	366	$got = '';
367	367	$expected = '37210';
368	368	$expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
369		- foreach($expect_array as $val) {
	369	+ foreach ($expect_array as $val) {
370	370	$b = $v->structmem($val);
371	371	$got .= $b->me['int'];
372	372	}
		@@ -868,7 +868,7 @@ discard block
		block discarded – undo
868	868	{
869	869	// make a 'deep client copy' as the original one might have many properties set
870	870	// also for speed only wrap one method of the whole server
871		- $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
	871	+ $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
872	872	if ($class == '') {
873	873	$this->fail('Registration of remote server failed');
874	874	} else {
		@@ -907,9 +907,9 @@ discard block
		block discarded – undo
907	907	$cookies = array(
908	908	//'c1' => array(),
909	909	'c2' => array('value' => 'c2'),
910		- 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
911		- 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
912		- 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
	910	+ 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
	911	+ 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
	912	+ 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
913	913	);
914	914	$cookiesval = php_xmlrpc_encode($cookies);
915	915	$m = new xmlrpcmsg('tests.setcookies', array($cookiesval));
		@@ -957,10 +957,10 @@ discard block
		block discarded – undo
957	957	$m = new xmlrpcmsg('tests.getcookies', array());
958	958	foreach ($cookies as $cookie => $val) {
959	959	$this->client->setCookie($cookie, $val);
960		- $cookies[$cookie] = (string)$cookies[$cookie];
	960	+ $cookies[$cookie] = (string) $cookies[$cookie];
961	961	}
962	962	$r = $this->client->send($m, $this->timeout, $this->method);
963		- $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
	963	+ $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
964	964	if (!$r->faultCode()) {
965	965	$v = $r->value();
966	966	$v = php_xmlrpc_decode($v);

gggeek / phpxmlrpc

Push — master ( 2df217...792a3a )

Status

Category

Braces +4 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch