Passed
Push — master ( b1cc15...197547 )
by Gaetano
14:35 queued 05:19
created
tests/07ClientTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/ServerAwareTestCase.php';
3
+include_once __DIR__.'/ServerAwareTestCase.php';
4 4
 
5 5
 /**
6 6
  * Tests involving the Client class features (and mostly no server).
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         $this->client->server .= 'XXX';
63 63
         $dnsinfo = @dns_get_record($this->client->server);
64 64
         if ($dnsinfo) {
65
-            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found');
65
+            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found');
66 66
         } else {
67 67
             $m = new xmlrpcmsg('examples.echo', array(
68 68
                 new xmlrpcval('hello', 'string'),
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         // now test a successful connection
93 93
         $server = explode(':', $this->args['HTTPSERVER']);
94
-        if (count($server) > 1) {
94
+        if (count($server)>1) {
95 95
             $this->client->port = $server[1];
96 96
         }
97 97
         $this->client->server = $server[0];
Please login to merge, or discard this patch.
tests/04ParsingTest.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/LoggerAwareTestCase.php';
3
+include_once __DIR__.'/LoggerAwareTestCase.php';
4 4
 
5 5
 /**
6 6
  * Tests involving xml parsing.
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 
102 102
     public function testI8()
103 103
     {
104
-        if (PHP_INT_SIZE == 4 ) {
104
+        if (PHP_INT_SIZE == 4) {
105 105
             $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode');
106 106
         }
107 107
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 
176 176
     public function testUnicodeInMemberName()
177 177
     {
178
-        $str = "G" . chr(252) . "nter, El" . chr(232) . "ne";
178
+        $str = "G".chr(252)."nter, El".chr(232)."ne";
179 179
         $v = array($str => new xmlrpcval(1));
180 180
         $r = new xmlrpcresp(new xmlrpcval($v, 'struct'));
181 181
         $r = $r->serialize();
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         $response = @utf8_encode(
192 192
             '<?xml version="1.0"?>
193 193
 <!-- covers what happens when lib receives UTF8 chars in response text and comments -->
194
-<!-- ' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232; -->
194
+<!-- ' . chr(224).chr(252).chr(232).'&#224;&#252;&#232; -->
195 195
 <methodResponse>
196 196
 <fault>
197 197
 <value>
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 </member>
203 203
 <member>
204 204
 <name>faultString</name>
205
-<value><string>' . chr(224) . chr(252) . chr(232) . '&#224;&#252;&#232;</string></value>
205
+<value><string>' . chr(224).chr(252).chr(232).'&#224;&#252;&#232;</string></value>
206 206
 </member>
207 207
 </struct>
208 208
 </value>
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
         $m = $this->newRequest('dummy');
212 212
         $r = $m->parseResponse($response);
213 213
         $v = $r->faultString();
214
-        $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v);
214
+        $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v);
215 215
     }
216 216
 
217 217
     public function testBrokenRequests()
@@ -468,8 +468,8 @@  discard block
 block discarded – undo
468 468
         $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values;
469 469
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true;
470 470
 
471
-        foreach($values as $value) {
472
-            $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> ';
471
+        foreach ($values as $value) {
472
+            $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> ';
473 473
             $r = $s->parseResponse($f);
474 474
             $v = $r->faultCode();
475 475
             $this->assertEquals(2, $v, "Testing $value");
@@ -574,11 +574,11 @@  discard block
 block discarded – undo
574 574
 
575 575
     public function testUTF8Response()
576 576
     {
577
-        $string = chr(224) . chr(252) . chr(232);
577
+        $string = chr(224).chr(252).chr(232);
578 578
 
579 579
         $s = $this->newRequest('dummy');
580
-        $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>
581
-<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>
580
+        $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>
581
+<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>
582 582
 ';
583 583
         $r = $s->parseResponse($f, false, 'phpvals');
584 584
         $v = $r->value();
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
         $this->assertEquals($string, $v);
587 587
 
588 588
         $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
589
-<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>
589
+<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>
590 590
 ';
591 591
         $r = $s->parseResponse($f, false, 'phpvals');
592 592
         $v = $r->value();
@@ -602,11 +602,11 @@  discard block
 block discarded – undo
602 602
 
603 603
     public function testLatin1Response()
604 604
     {
605
-        $string = chr(224) . chr(252) . chr(232);
605
+        $string = chr(224).chr(252).chr(232);
606 606
 
607 607
         $s = $this->newRequest('dummy');
608
-        $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>
609
-<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>
608
+        $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>
609
+<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>
610 610
 ';
611 611
         $r = $s->parseResponse($f, false, 'phpvals');
612 612
         $v = $r->value();
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
         $this->assertEquals($string, $v);
615 615
 
616 616
         $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member>
617
-<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>
617
+<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>
618 618
 ';
619 619
         $r = $s->parseResponse($f, false, 'phpvals');
620 620
         $v = $r->value();
Please login to merge, or discard this patch.
tests/13LegacyAPITest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/ServerAwareTestCase.php';
3
+include_once __DIR__.'/ServerAwareTestCase.php';
4 4
 
5 5
 /**
6 6
  * @todo Long-term, this should replace all testing of the legacy API done via the main test-suite...
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     {
15 15
         /// @todo pass on as cli args for the executed script all the args that are already parsed by now, plus $this->testId
16 16
 
17
-        exec('php ' . __DIR__ . '/legacy_loader_test.php', $out, $result);
17
+        exec('php '.__DIR__.'/legacy_loader_test.php', $out, $result);
18 18
 
19 19
         /// @todo dump output if in debug mode or if test fails
20 20
 
Please login to merge, or discard this patch.
tests/ServerAwareTestCase.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/LoggerAwareTestCase.php';
3
+include_once __DIR__.'/LoggerAwareTestCase.php';
4 4
 
5 5
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
6 6
 use PHPUnit\Framework\TestResult;
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
      */
31 31
     public function _run($result = NULL)
32 32
     {
33
-        $this->testId = get_class($this) . '__' . $this->getName();
33
+        $this->testId = get_class($this).'__'.$this->getName();
34 34
 
35 35
         if ($result === NULL) {
36 36
             $result = $this->createResult();
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 
63 63
         // Set up a database connection or other fixture which needs to be available.
64 64
         self::$randId = uniqid();
65
-        file_put_contents(sys_get_temp_dir() . '/phpunit_rand_id.txt', self::$randId);
65
+        file_put_contents(sys_get_temp_dir().'/phpunit_rand_id.txt', self::$randId);
66 66
     }
67 67
 
68 68
     public static function tear_down_after_class()
69 69
     {
70
-        if (is_file(sys_get_temp_dir() . '/phpunit_rand_id.txt')) {
71
-            unlink(sys_get_temp_dir() . '/phpunit_rand_id.txt');
70
+        if (is_file(sys_get_temp_dir().'/phpunit_rand_id.txt')) {
71
+            unlink(sys_get_temp_dir().'/phpunit_rand_id.txt');
72 72
         }
73 73
 
74 74
         parent::tear_down_after_class();
@@ -79,15 +79,15 @@  discard block
 block discarded – undo
79 79
         parent::set_up();
80 80
 
81 81
         // assumes HTTPURI to be in the form /tests/index.php?etc...
82
-        $this->baseUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']);
83
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
82
+        $this->baseUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']);
83
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
84 84
     }
85 85
 
86 86
     protected function getClient()
87 87
     {
88 88
         $server = explode(':', $this->args['HTTPSERVER']);
89 89
         /// @todo use the non-legacy API calling convention, except in a dedicated test
90
-        if (count($server) > 1) {
90
+        if (count($server)>1) {
91 91
             $client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]);
92 92
         } else {
93 93
             $client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']);
Please login to merge, or discard this patch.
tests/09HTTPTest.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -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.
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     {
35 35
         $methods = array();
36 36
         // as long as we are descendants, get_class_methods will list private/protected methods
37
-        foreach(get_class_methods('ServerTest') as $method)
37
+        foreach (get_class_methods('ServerTest') as $method)
38 38
         {
39 39
             if (strpos($method, 'test') === 0 && !in_array($method, $this->unsafeMethods))
40 40
             {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
         // this checks for a non-failed call
149 149
         $time = microtime(true);
150 150
         $this->send($m);
151
-        $time = microtime(true) - $time;
151
+        $time = microtime(true)-$time;
152 152
         $this->assertGreaterThan(1.0, $time);
153 153
         $this->assertLessThan(2.0, $time);
154 154
 
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         $m = new xmlrpcmsg('tests.sleep', array(new xmlrpcval(5, 'int')));
157 157
         $time = microtime(true);
158 158
         $r = $this->send($m, array(0, PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['http_error'], PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['curl_fail']));
159
-        $time = microtime(true) - $time;
159
+        $time = microtime(true)-$time;
160 160
         $this->assertGreaterThan(2.0, $time);
161 161
         $this->assertLessThan(4.0, $time);
162 162
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
         $this->addQueryParams(array('SLOW_LORIS' => 1));
177 177
         $time = microtime(true);
178 178
         $this->send($m, array(0, PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['http_error'], PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['curl_fail']));
179
-        $time = microtime(true) - $time;
179
+        $time = microtime(true)-$time;
180 180
         $this->assertGreaterThan(2.0, $time);
181 181
         $this->assertLessThan(4.0, $time);
182 182
     }
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
                 preg_match('/ubunutu([0-9]+)/', $output[0], $matches);
356 356
                 $ubuntuVersion = @$matches[1];
357 357
             }
358
-            if ($ubuntuVersion >= 20 && $this->args['SSLVERSION'] != 6) {
358
+            if ($ubuntuVersion>=20 && $this->args['SSLVERSION'] != 6) {
359 359
                 $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher');
360 360
             }
361 361
         }
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
             $this->client->setOption(\PhpXmlRpc\Client::OPT_EXTRA_SOCKET_OPTS,
381 381
                 array('ssl' => array(
382 382
                     // security level is available as of php 7.2.0 + openssl 1.1.0 according to the docs
383
-                    'security_level' => min(1 + $version[1], 5),
383
+                    'security_level' => min(1+$version[1], 5),
384 384
                     // capture_session_meta was deprecated in php 7.0
385 385
                     //'capture_session_meta' => true,
386 386
                 ))
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
         if (version_compare(PHP_VERSION, '8.0', '>=') && $this->args['SSLVERSION'] == 0)
529 529
         {
530 530
             $version = explode('.', PHP_VERSION);
531
-            $this->client->setSSLVersion(min(4 + $version[1], 7));
531
+            $this->client->setSSLVersion(min(4+$version[1], 7));
532 532
         }
533 533
 
534 534
         $this->$method();
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -304,8 +304,7 @@  discard block
 block discarded – undo
304 304
         if (!function_exists('curl_init'))
305 305
         {
306 306
             $this->markTestSkipped('CURL missing: cannot test https functionality');
307
-        }
308
-        else if ($this->args['HTTPSSERVER'] == '')
307
+        } else if ($this->args['HTTPSSERVER'] == '')
309 308
         {
310 309
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https');
311 310
         }
@@ -480,8 +479,7 @@  discard block
 block discarded – undo
480 479
         if (!function_exists('curl_init'))
481 480
         {
482 481
             $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy');
483
-        }
484
-        else if ($this->args['PROXYSERVER'] == '')
482
+        } else if ($this->args['PROXYSERVER'] == '')
485 483
         {
486 484
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1');
487 485
         }
@@ -505,12 +503,10 @@  discard block
 block discarded – undo
505 503
         if (!function_exists('curl_init'))
506 504
         {
507 505
             $this->markTestSkipped('CURL missing: cannot test https w. proxy');
508
-        }
509
-        else if ($this->args['PROXYSERVER'] == '')
506
+        } else if ($this->args['PROXYSERVER'] == '')
510 507
         {
511 508
             $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https');
512
-        }
513
-        else if ($this->args['HTTPSSERVER'] == '')
509
+        } else if ($this->args['HTTPSSERVER'] == '')
514 510
         {
515 511
             $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy');
516 512
         }
Please login to merge, or discard this patch.
lib/xmlrpcs.inc 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      */
55 55
     public function echoInput()
56 56
     {
57
-        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string'));
57
+        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string'));
58 58
         print $r->serialize();
59 59
     }
60 60
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      */
66 66
     public function &__get($name)
67 67
     {
68
-        switch($name) {
68
+        switch ($name) {
69 69
             case 'dmap':
70 70
                 return $this->dmap;
71 71
             default:
@@ -96,30 +96,30 @@  discard block
 block discarded – undo
96 96
     Server::xmlrpc_debugmsg($m);
97 97
 }
98 98
 
99
-function _xmlrpcs_getCapabilities($server, $m=null)
99
+function _xmlrpcs_getCapabilities($server, $m = null)
100 100
 {
101 101
     return Server::_xmlrpcs_getCapabilities($server, $m);
102 102
 }
103 103
 
104
-$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
105
-$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
106
-$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
107
-function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
104
+$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray));
105
+$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
106
+$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
107
+function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
108 108
 {
109 109
     return Server::_xmlrpcs_listMethods($server, $m);
110 110
 }
111 111
 
112
-$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcString));
113
-$_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)';
114
-$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
112
+$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcString));
113
+$_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)';
114
+$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
115 115
 function _xmlrpcs_methodSignature($server, $m)
116 116
 {
117 117
     return Server::_xmlrpcs_methodSignature($server, $m);
118 118
 }
119 119
 
120
-$_xmlrpcs_methodHelp_sig=array(array(\PhpXmlRpc\Value::$xmlrpcString, \PhpXmlRpc\Value::$xmlrpcString));
121
-$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
122
-$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
120
+$_xmlrpcs_methodHelp_sig = array(array(\PhpXmlRpc\Value::$xmlrpcString, \PhpXmlRpc\Value::$xmlrpcString));
121
+$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
122
+$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
123 123
 function _xmlrpcs_methodHelp($server, $m)
124 124
 {
125 125
     return Server::_xmlrpcs_methodHelp($server, $m);
Please login to merge, or discard this patch.
src/Client_for_ssl_proxy.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2011,9 +2011,9 @@
 block discarded – undo
2011 2011
      * @return false|\CurlHandle|resource
2012 2012
      */
2013 2013
     protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '',
2014
-         $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
2015
-         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
2016
-         $keyPass = '', $sslVersion = 0)
2014
+            $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0,
2015
+            $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '',
2016
+            $keyPass = '', $sslVersion = 0)
2017 2017
     {
2018 2018
         $this->logDeprecationUnlessCalledBy('sendViaCURL');
2019 2019
 
Please login to merge, or discard this patch.
Spacing   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -337,10 +337,10 @@  discard block
 block discarded – undo
337 337
             $server = $parts['host'];
338 338
             $path = isset($parts['path']) ? $parts['path'] : '';
339 339
             if (isset($parts['query'])) {
340
-                $path .= '?' . $parts['query'];
340
+                $path .= '?'.$parts['query'];
341 341
             }
342 342
             if (isset($parts['fragment'])) {
343
-                $path .= '#' . $parts['fragment'];
343
+                $path .= '#'.$parts['fragment'];
344 344
             }
345 345
             if (isset($parts['port'])) {
346 346
                 $port = $parts['port'];
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
             }
357 357
         }
358 358
         if ($path == '' || $path[0] != '/') {
359
-            $this->path = '/' . $path;
359
+            $this->path = '/'.$path;
360 360
         } else {
361 361
             $this->path = $path;
362 362
         }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
         //$this->accepted_charset_encodings = $ch->knownCharsets();
389 389
 
390 390
         // initialize user_agent string
391
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
391
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
392 392
     }
393 393
 
394 394
     /**
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
      */
561 561
     public function setSSLVerifyPeer($i)
562 562
     {
563
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
563
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
564 564
 
565 565
         $this->verifypeer = $i;
566 566
         return $this;
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
      */
578 578
     public function setSSLVerifyHost($i)
579 579
     {
580
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
580
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
581 581
 
582 582
         $this->verifyhost = $i;
583 583
         return $this;
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
      */
594 594
     public function setSSLVersion($i)
595 595
     {
596
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
596
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
597 597
 
598 598
         $this->sslversion = $i;
599 599
         return $this;
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
      */
659 659
     public function setRequestCompression($compMethod)
660 660
     {
661
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
661
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
662 662
 
663 663
         $this->request_compression = $compMethod;
664 664
         return $this;
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
      */
709 709
     public function setCurlOptions($options)
710 710
     {
711
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
711
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
712 712
 
713 713
         $this->extracurlopts = $options;
714 714
         return $this;
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
721 721
      */
722 722
     public function setUseCurl($useCurlMode)
723 723
     {
724
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
724
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
725 725
 
726 726
         $this->use_curl = $useCurlMode;
727 727
         return $this;
@@ -739,7 +739,7 @@  discard block
 block discarded – undo
739 739
      */
740 740
     public function setUserAgent($agentString)
741 741
     {
742
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
742
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
743 743
 
744 744
         $this->user_agent = $agentString;
745 745
         return $this;
@@ -771,12 +771,12 @@  discard block
 block discarded – undo
771 771
             }
772 772
         }
773 773
 
774
-        $url = $this->method . '://' . $this->server;
774
+        $url = $this->method.'://'.$this->server;
775 775
         if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'h2c'))) ||
776 776
             ($this->port == 443 && in_array($this->method, array('https', 'h2')))) {
777
-            return $url . $this->path;
777
+            return $url.$this->path;
778 778
         } else {
779
-            return $url . ':' . $this->port . $this->path;
779
+            return $url.':'.$this->port.$this->path;
780 780
         }
781 781
     }
782 782
 
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
     public function send($req, $timeout = 0, $method = '')
820 820
     {
821 821
         if ($method !== '' || $timeout !== 0) {
822
-            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated');
822
+            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated');
823 823
         }
824 824
 
825 825
         // if user does not specify http protocol, use native method of this client
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
938 938
                     $payload = $a;
939 939
                     $encodingHdr = "Content-Encoding: gzip\r\n";
940 940
                 } else {
941
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request');
941
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request');
942 942
                 }
943 943
             } else if (function_exists('gzcompress')) {
944 944
                 $a = @gzcompress($payload);
@@ -946,14 +946,14 @@  discard block
 block discarded – undo
946 946
                     $payload = $a;
947 947
                     $encodingHdr = "Content-Encoding: deflate\r\n";
948 948
                 } else {
949
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request');
949
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request');
950 950
                 }
951 951
             } else {
952
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install');
952
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install');
953 953
             }
954 954
         } else {
955 955
             if ($opts['request_compression'] != '') {
956
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported');
956
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported');
957 957
             }
958 958
         }
959 959
 
@@ -961,16 +961,16 @@  discard block
 block discarded – undo
961 961
         $credentials = '';
962 962
         if ($opts['username'] != '') {
963 963
             if ($opts['authtype'] != 1) {
964
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
964
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
965 965
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
966
-                    PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0');
966
+                    PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0');
967 967
             }
968
-            $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n";
968
+            $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n";
969 969
         }
970 970
 
971 971
         $acceptedEncoding = '';
972 972
         if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) {
973
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n";
973
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n";
974 974
         }
975 975
 
976 976
         if ($port == 0) {
@@ -991,21 +991,21 @@  discard block
 block discarded – undo
991 991
             } elseif ($method === 'h2') {
992 992
                 $protocol = 'https';
993 993
             } else if (strpos($protocol, ':') !== false) {
994
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
995
-                return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'] .
994
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
995
+                return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'].
996 996
                     " attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
997 997
             }
998 998
             /// @todo this does not work atm (tested at least with an http proxy forwarding to an https server) - we
999 999
             ///       should implement the CONNECT protocol
1000
-            $uri = $protocol . '://' . $server . ':' . $port . $path;
1000
+            $uri = $protocol.'://'.$server.':'.$port.$path;
1001 1001
             if ($opts['proxy_user'] != '') {
1002 1002
                 if ($opts['proxy_authtype'] != 1) {
1003
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
1003
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
1004 1004
                     return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1005
-                        PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with socket transport');
1005
+                        PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with socket transport');
1006 1006
                 }
1007
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' .
1008
-                    $opts['proxy_pass']) . "\r\n";
1007
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'.
1008
+                    $opts['proxy_pass'])."\r\n";
1009 1009
             }
1010 1010
         } else {
1011 1011
             $connectServer = $server;
@@ -1022,14 +1022,14 @@  discard block
 block discarded – undo
1022 1022
             $version = '';
1023 1023
             foreach ($opts['cookies'] as $name => $cookie) {
1024 1024
                 /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments
1025
-                $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
1025
+                $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
1026 1026
             }
1027
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
1027
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
1028 1028
         }
1029 1029
 
1030 1030
         $extraHeaders = '';
1031 1031
         if (is_array($this->extra_headers) && $this->extra_headers) {
1032
-            $extraHeaders = implode("\r\n", $this->extra_headers) . "\r\n";
1032
+            $extraHeaders = implode("\r\n", $this->extra_headers)."\r\n";
1033 1033
         }
1034 1034
 
1035 1035
         // omit port if default
@@ -1037,24 +1037,24 @@  discard block
 block discarded – undo
1037 1037
         if (($port == 80 && in_array($method, array('http', 'http10', 'http11'))) || ($port == 443 && $method == 'https')) {
1038 1038
             $port = '';
1039 1039
         } else {
1040
-            $port = ':' . $port;
1041
-        }
1042
-
1043
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
1044
-            'User-Agent: ' . $opts['user_agent'] . "\r\n" .
1045
-            'Host: ' . $server . $port . "\r\n" .
1046
-            $credentials .
1047
-            $proxyCredentials .
1048
-            $acceptedEncoding .
1049
-            $encodingHdr .
1050
-            'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" .
1051
-            $cookieHeader .
1052
-            'Content-Type: ' . $req->getContentType() . "\r\n" .
1053
-            $extraHeaders .
1054
-            'Content-Length: ' . strlen($payload) . "\r\n\r\n" .
1040
+            $port = ':'.$port;
1041
+        }
1042
+
1043
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
1044
+            'User-Agent: '.$opts['user_agent']."\r\n".
1045
+            'Host: '.$server.$port."\r\n".
1046
+            $credentials.
1047
+            $proxyCredentials.
1048
+            $acceptedEncoding.
1049
+            $encodingHdr.
1050
+            'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n".
1051
+            $cookieHeader.
1052
+            'Content-Type: '.$req->getContentType()."\r\n".
1053
+            $extraHeaders.
1054
+            'Content-Length: '.strlen($payload)."\r\n\r\n".
1055 1055
             $payload;
1056 1056
 
1057
-        if ($opts['debug'] > 1) {
1057
+        if ($opts['debug']>1) {
1058 1058
             $this->getLogger()->debug("---SENDING---\n$op\n---END---");
1059 1059
         }
1060 1060
 
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
 
1081 1081
             if ($opts['sslversion'] != 0) {
1082 1082
                 /// @see https://www.php.net/manual/en/function.curl-setopt.php, https://www.php.net/manual/en/migration56.openssl.php
1083
-                switch($opts['sslversion']) {
1083
+                switch ($opts['sslversion']) {
1084 1084
                     /// @todo what does this map to? 1.0-1.3?
1085 1085
                     //case 1: // TLSv1
1086 1086
                     //    break;
@@ -1104,12 +1104,12 @@  discard block
 block discarded – undo
1104 1104
                             $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
1105 1105
                         } else {
1106 1106
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1107
-                                PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later');
1107
+                                PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later');
1108 1108
                         }
1109 1109
                         break;
1110 1110
                     default:
1111 1111
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1112
-                            PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version');
1112
+                            PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version');
1113 1113
                 }
1114 1114
             }
1115 1115
         }
@@ -1122,7 +1122,7 @@  discard block
 block discarded – undo
1122 1122
 
1123 1123
         $context = stream_context_create($contextOptions);
1124 1124
 
1125
-        if ($opts['timeout'] <= 0) {
1125
+        if ($opts['timeout']<=0) {
1126 1126
             $connectTimeout = ini_get('default_socket_timeout');
1127 1127
         } else {
1128 1128
             $connectTimeout = $opts['timeout'];
@@ -1141,7 +1141,7 @@  discard block
 block discarded – undo
1141 1141
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
1142 1142
             STREAM_CLIENT_CONNECT, $context);
1143 1143
         if ($fp) {
1144
-            if ($opts['timeout'] > 0) {
1144
+            if ($opts['timeout']>0) {
1145 1145
                 stream_set_timeout($fp, $opts['timeout'], 0);
1146 1146
             }
1147 1147
         } else {
@@ -1150,13 +1150,13 @@  discard block
 block discarded – undo
1150 1150
                 $this->errstr = $err['message'];
1151 1151
             }
1152 1152
 
1153
-            $this->errstr = 'Connect error: ' . $this->errstr;
1154
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
1153
+            $this->errstr = 'Connect error: '.$this->errstr;
1154
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
1155 1155
         }
1156 1156
 
1157 1157
 $ap = $op;
1158 1158
 $ap = str_replace('Host: localhost', 'Host: localhost:443', $ap);
1159
-$op = "CONNECT " . $uri . " HTTP/1.0\r\n" . 'Host: ' . $server . $port . "\r\n\r\n";
1159
+$op = "CONNECT ".$uri." HTTP/1.0\r\n".'Host: '.$server.$port."\r\n\r\n";
1160 1160
 echo "In fact sending: "; var_dump($op);
1161 1161
 
1162 1162
         if (!fputs($fp, $op, strlen($op))) {
@@ -1243,19 +1243,19 @@  discard block
 block discarded – undo
1243 1243
             $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']);
1244 1244
 
1245 1245
         if (!$curl) {
1246
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
1246
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
1247 1247
                 ': error during curl initialization. Check php error log for details');
1248 1248
         }
1249 1249
 
1250 1250
         $result = curl_exec($curl);
1251 1251
 
1252
-        if ($opts['debug'] > 1) {
1252
+        if ($opts['debug']>1) {
1253 1253
             $message = "---CURL INFO---\n";
1254 1254
             foreach (curl_getinfo($curl) as $name => $val) {
1255 1255
                 if (is_array($val)) {
1256 1256
                     $val = implode("\n", $val);
1257 1257
                 }
1258
-                $message .= $name . ': ' . $val . "\n";
1258
+                $message .= $name.': '.$val."\n";
1259 1259
             }
1260 1260
             $message .= '---END---';
1261 1261
             $this->getLogger()->debug($message);
@@ -1265,8 +1265,8 @@  discard block
 block discarded – undo
1265 1265
             /// @todo we should use a better check here - what if we get back '' or '0'?
1266 1266
 
1267 1267
             $this->errstr = 'no response';
1268
-            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
1269
-                ': ' . curl_error($curl));
1268
+            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
1269
+                ': '.curl_error($curl));
1270 1270
             curl_close($curl);
1271 1271
             if ($opts['keepalive']) {
1272 1272
                 $this->xmlrpc_curl_handle = null;
@@ -1324,7 +1324,7 @@  discard block
 block discarded – undo
1324 1324
                     $payload = $a;
1325 1325
                     $encodingHdr = 'Content-Encoding: gzip';
1326 1326
                 } else {
1327
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request');
1327
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request');
1328 1328
                 }
1329 1329
             } else if (function_exists('gzcompress')) {
1330 1330
                 $a = @gzcompress($payload);
@@ -1332,14 +1332,14 @@  discard block
 block discarded – undo
1332 1332
                     $payload = $a;
1333 1333
                     $encodingHdr = 'Content-Encoding: deflate';
1334 1334
                 } else {
1335
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request');
1335
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request');
1336 1336
                 }
1337 1337
             } else {
1338
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install');
1338
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install');
1339 1339
             }
1340 1340
         } else {
1341 1341
             if ($opts['request_compression'] != '') {
1342
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported');
1342
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported');
1343 1343
             }
1344 1344
         }
1345 1345
 
@@ -1353,12 +1353,12 @@  discard block
 block discarded – undo
1353 1353
                     // http, https
1354 1354
                     $protocol = $method;
1355 1355
                     if (strpos($protocol, ':') !== false) {
1356
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
1356
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
1357 1357
                         return false;
1358 1358
                     }
1359 1359
                 }
1360 1360
             }
1361
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $path);
1361
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$path);
1362 1362
             if (!$curl) {
1363 1363
                 return false;
1364 1364
             }
@@ -1372,7 +1372,7 @@  discard block
 block discarded – undo
1372 1372
         // results into variable
1373 1373
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
1374 1374
 
1375
-        if ($opts['debug'] > 1) {
1375
+        if ($opts['debug']>1) {
1376 1376
             curl_setopt($curl, CURLOPT_VERBOSE, true);
1377 1377
             /// @todo redirect curlopt_stderr to some stream which can be piped to the logger
1378 1378
         }
@@ -1397,7 +1397,7 @@  discard block
 block discarded – undo
1397 1397
             }
1398 1398
         }
1399 1399
         // extra headers
1400
-        $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']));
1400
+        $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings']));
1401 1401
         // if no keepalive is wanted, let the server know it in advance
1402 1402
         if (!$opts['keepalive']) {
1403 1403
             $headers[] = 'Connection: close';
@@ -1433,7 +1433,7 @@  discard block
 block discarded – undo
1433 1433
                 if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) {
1434 1434
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
1435 1435
                 } else {
1436
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
1436
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
1437 1437
                     curl_close($curl);
1438 1438
                     return false;
1439 1439
                 }
@@ -1444,11 +1444,11 @@  discard block
 block discarded – undo
1444 1444
         }
1445 1445
 
1446 1446
         if ($opts['username'] && $opts['password']) {
1447
-            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']);
1447
+            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']);
1448 1448
             if (defined('CURLOPT_HTTPAUTH')) {
1449 1449
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
1450 1450
             } elseif ($opts['authtype'] != 1) {
1451
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
1451
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
1452 1452
                 curl_close($curl);
1453 1453
                 return false;
1454 1454
             }
@@ -1493,13 +1493,13 @@  discard block
 block discarded – undo
1493 1493
             if ($opts['proxyport'] == 0) {
1494 1494
                 $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080
1495 1495
             }
1496
-            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']);
1496
+            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']);
1497 1497
             if ($opts['proxy_user']) {
1498
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']);
1498
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']);
1499 1499
                 if (defined('CURLOPT_PROXYAUTH')) {
1500 1500
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
1501 1501
                 } elseif ($opts['proxy_authtype'] != 1) {
1502
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
1502
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
1503 1503
                     curl_close($curl);
1504 1504
                     return false;
1505 1505
                 }
@@ -1511,7 +1511,7 @@  discard block
 block discarded – undo
1511 1511
         if (count($opts['cookies'])) {
1512 1512
             $cookieHeader = '';
1513 1513
             foreach ($opts['cookies'] as $name => $cookie) {
1514
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
1514
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
1515 1515
             }
1516 1516
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
1517 1517
         }
@@ -1520,7 +1520,7 @@  discard block
 block discarded – undo
1520 1520
             curl_setopt($curl, $opt, $val);
1521 1521
         }
1522 1522
 
1523
-        if ($opts['debug'] > 1) {
1523
+        if ($opts['debug']>1) {
1524 1524
             $this->getLogger()->debug("---SENDING---\n$payload\n---END---");
1525 1525
         }
1526 1526
 
@@ -1621,7 +1621,7 @@  discard block
 block discarded – undo
1621 1621
             $call['methodName'] = new Value($req->method(), 'string');
1622 1622
             $numParams = $req->getNumParams();
1623 1623
             $params = array();
1624
-            for ($i = 0; $i < $numParams; $i++) {
1624
+            for ($i = 0; $i<$numParams; $i++) {
1625 1625
                 $params[$i] = $req->getParam($i);
1626 1626
             }
1627 1627
             $call['params'] = new Value($params, 'array');
@@ -1643,7 +1643,7 @@  discard block
 block discarded – undo
1643 1643
         $response = array();
1644 1644
 
1645 1645
         if ($this->return_type == 'xml') {
1646
-            for ($i = 0; $i < count($reqs); $i++) {
1646
+            for ($i = 0; $i<count($reqs); $i++) {
1647 1647
                 $response[] = new static::$responseClass($rets, 0, '', 'xml', $result->httpResponse());
1648 1648
             }
1649 1649
 
@@ -1651,21 +1651,21 @@  discard block
 block discarded – undo
1651 1651
             if (!is_array($rets)) {
1652 1652
                 // bad return type from system.multicall
1653 1653
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1654
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse());
1654
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse());
1655 1655
             }
1656 1656
             $numRets = count($rets);
1657 1657
             if ($numRets != count($reqs)) {
1658 1658
                 // wrong number of return values.
1659 1659
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1660
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals',
1660
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals',
1661 1661
                     $result->httpResponse());
1662 1662
             }
1663 1663
 
1664
-            for ($i = 0; $i < $numRets; $i++) {
1664
+            for ($i = 0; $i<$numRets; $i++) {
1665 1665
                 $val = $rets[$i];
1666 1666
                 if (!is_array($val)) {
1667 1667
                     return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1668
-                        PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
1668
+                        PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
1669 1669
                         'phpvals', $result->httpResponse());
1670 1670
                 }
1671 1671
                 switch (count($val)) {
@@ -1673,7 +1673,7 @@  discard block
 block discarded – undo
1673 1673
                         if (!isset($val[0])) {
1674 1674
                             // Bad value
1675 1675
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1676
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value",
1676
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value",
1677 1677
                                 'phpvals', $result->httpResponse());
1678 1678
                         }
1679 1679
                         // Normal return value
@@ -1685,20 +1685,20 @@  discard block
 block discarded – undo
1685 1685
                         if (!is_int($code)) {
1686 1686
                             /// @todo should we check that it is != 0?
1687 1687
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1688
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
1688
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
1689 1689
                                 'phpvals', $result->httpResponse());
1690 1690
                         }
1691 1691
                         $str = @$val['faultString'];
1692 1692
                         if (!is_string($str)) {
1693 1693
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1694
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString",
1694
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString",
1695 1695
                                 'phpvals', $result->httpResponse());
1696 1696
                         }
1697 1697
                         $response[$i] = new static::$responseClass(0, $code, $str, 'phpvals', $result->httpResponse());
1698 1698
                         break;
1699 1699
                     default:
1700 1700
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1701
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
1701
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
1702 1702
                             'phpvals', $result->httpResponse());
1703 1703
                 }
1704 1704
             }
@@ -1707,14 +1707,14 @@  discard block
 block discarded – undo
1707 1707
             // return type == 'xmlrpcvals'
1708 1708
             if ($rets->kindOf() != 'array') {
1709 1709
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1710
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals',
1710
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals',
1711 1711
                     $result->httpResponse());
1712 1712
             }
1713 1713
             $numRets = $rets->count();
1714 1714
             if ($numRets != count($reqs)) {
1715 1715
                 // wrong number of return values.
1716 1716
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1717
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals',
1717
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals',
1718 1718
                     $result->httpResponse());
1719 1719
             }
1720 1720
 
@@ -1723,7 +1723,7 @@  discard block
 block discarded – undo
1723 1723
                     case 'array':
1724 1724
                         if ($val->count() != 1) {
1725 1725
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1726
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
1726
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
1727 1727
                                 'phpvals', $result->httpResponse());
1728 1728
                         }
1729 1729
                         // Normal return value
@@ -1732,28 +1732,28 @@  discard block
 block discarded – undo
1732 1732
                     case 'struct':
1733 1733
                         if ($val->count() != 2) {
1734 1734
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1735
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
1735
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
1736 1736
                                 'phpvals', $result->httpResponse());
1737 1737
                         }
1738 1738
                         /** @var Value $code */
1739 1739
                         $code = $val['faultCode'];
1740 1740
                         if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') {
1741 1741
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1742
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
1742
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
1743 1743
                                 'xmlrpcvals', $result->httpResponse());
1744 1744
                         }
1745 1745
                         /** @var Value $str */
1746 1746
                         $str = $val['faultString'];
1747 1747
                         if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') {
1748 1748
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1749
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
1749
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
1750 1750
                                 'xmlrpcvals', $result->httpResponse());
1751 1751
                         }
1752 1752
                         $response[] = new static::$responseClass(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse());
1753 1753
                         break;
1754 1754
                     default:
1755 1755
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1756
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
1756
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
1757 1757
                             'xmlrpcvals', $result->httpResponse());
1758 1758
                 }
1759 1759
             }
@@ -1788,7 +1788,7 @@  discard block
 block discarded – undo
1788 1788
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
1789 1789
         $method = 'http')
1790 1790
     {
1791
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
1791
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
1792 1792
 
1793 1793
         return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null,
1794 1794
             null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method);
@@ -1826,7 +1826,7 @@  discard block
 block discarded – undo
1826 1826
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
1827 1827
         $sslVersion = 0)
1828 1828
     {
1829
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
1829
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
1830 1830
 
1831 1831
         return $this->sendPayloadCURL($req, $server, $port, $timeout, $username,
1832 1832
             $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort,
@@ -2039,7 +2039,7 @@  discard block
 block discarded – undo
2039 2039
     public function &__get($name)
2040 2040
     {
2041 2041
         if (in_array($name, static::$options)) {
2042
-            $this->logDeprecation('Getting property Client::' . $name . ' is deprecated');
2042
+            $this->logDeprecation('Getting property Client::'.$name.' is deprecated');
2043 2043
             return $this->$name;
2044 2044
         }
2045 2045
 
@@ -2050,12 +2050,12 @@  discard block
 block discarded – undo
2050 2050
             case 'server':
2051 2051
             case 'port':
2052 2052
             case 'path':
2053
-                $this->logDeprecation('Getting property Client::' . $name . ' is deprecated');
2053
+                $this->logDeprecation('Getting property Client::'.$name.' is deprecated');
2054 2054
                 return $this->$name;
2055 2055
             default:
2056 2056
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
2057 2057
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
2058
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
2058
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
2059 2059
                 $result = null;
2060 2060
                 return $result;
2061 2061
         }
@@ -2064,7 +2064,7 @@  discard block
 block discarded – undo
2064 2064
     public function __set($name, $value)
2065 2065
     {
2066 2066
         if (in_array($name, static::$options)) {
2067
-            $this->logDeprecation('Setting property Client::' . $name . ' is deprecated');
2067
+            $this->logDeprecation('Setting property Client::'.$name.' is deprecated');
2068 2068
             $this->$name = $value;
2069 2069
             return;
2070 2070
         }
@@ -2076,20 +2076,20 @@  discard block
 block discarded – undo
2076 2076
             case 'server':
2077 2077
             case 'port':
2078 2078
             case 'path':
2079
-                $this->logDeprecation('Setting property Client::' . $name . ' is deprecated');
2079
+                $this->logDeprecation('Setting property Client::'.$name.' is deprecated');
2080 2080
                 $this->$name = $value;
2081 2081
                 return;
2082 2082
             default:
2083 2083
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
2084 2084
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
2085
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
2085
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
2086 2086
         }
2087 2087
     }
2088 2088
 
2089 2089
     public function __isset($name)
2090 2090
     {
2091 2091
         if (in_array($name, static::$options)) {
2092
-            $this->logDeprecation('Checking property Client::' . $name . ' is deprecated');
2092
+            $this->logDeprecation('Checking property Client::'.$name.' is deprecated');
2093 2093
             return isset($this->$name);
2094 2094
         }
2095 2095
 
@@ -2100,7 +2100,7 @@  discard block
 block discarded – undo
2100 2100
             case 'server':
2101 2101
             case 'port':
2102 2102
             case 'path':
2103
-                $this->logDeprecation('Checking property Client::' . $name . ' is deprecated');
2103
+                $this->logDeprecation('Checking property Client::'.$name.' is deprecated');
2104 2104
                 return isset($this->$name);
2105 2105
             default:
2106 2106
                 return false;
@@ -2110,7 +2110,7 @@  discard block
 block discarded – undo
2110 2110
     public function __unset($name)
2111 2111
     {
2112 2112
         if (in_array($name, static::$options)) {
2113
-            $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated');
2113
+            $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated');
2114 2114
             unset($this->$name);
2115 2115
             return;
2116 2116
         }
@@ -2122,13 +2122,13 @@  discard block
 block discarded – undo
2122 2122
             case 'server':
2123 2123
             case 'port':
2124 2124
             case 'path':
2125
-                $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated');
2125
+                $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated');
2126 2126
                 unset($this->$name);
2127 2127
                 return;
2128 2128
             default:
2129 2129
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
2130 2130
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
2131
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
2131
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
2132 2132
         }
2133 2133
     }
2134 2134
 }
Please login to merge, or discard this patch.