Passed
Push — master ( 1a762a...7f95e5 )
by Gaetano
08:04
created
tests/5ServerTest.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/../lib/xmlrpc.inc';
4
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
3
+include_once __DIR__.'/../lib/xmlrpc.inc';
4
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
5 5
 
6
-include_once __DIR__ . '/parse_args.php';
6
+include_once __DIR__.'/parse_args.php';
7 7
 
8
-include_once __DIR__ . '/PolyfillTestCase.php';
8
+include_once __DIR__.'/PolyfillTestCase.php';
9 9
 
10 10
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
11 11
 use PHPUnit\Framework\TestResult;
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         // (but only if not called from subclass objects / multitests)
43 43
         if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') {
44 44
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
45
-            for ($i = 0; $i < count($trace); $i++) {
45
+            for ($i = 0; $i<count($trace); $i++) {
46 46
                 if (strpos($trace[$i]['function'], 'test') === 0) {
47 47
                     self::$failed_tests[$trace[$i]['function']] = true;
48 48
                     break;
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      */
66 66
     public function _run($result = NULL)
67 67
     {
68
-        $this->testId = get_class($this) . '__' . $this->getName();
68
+        $this->testId = get_class($this).'__'.$this->getName();
69 69
 
70 70
         if ($result === NULL) {
71 71
             $result = $this->createResult();
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
         $uri = str_replace('/demo/server/server.php', '/tests/index.php?demo=server/server.php', $this->args['HTTPURI']);
99 99
         $server = explode(':', $this->args['HTTPSERVER']);
100
-        if (count($server) > 1) {
100
+        if (count($server)>1) {
101 101
             $this->client = new xmlrpc_client($uri, $server[0], $server[1]);
102 102
         } else {
103 103
             $this->client = new xmlrpc_client($uri, $this->args['HTTPSERVER']);
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         $this->client->request_compression = $this->request_compression;
108 108
         $this->client->accepted_compression = $this->accepted_compression;
109 109
 
110
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
110
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']);
111 111
 
112 112
         if ($this->args['DEBUG'] == 1)
113 113
             ob_start();
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
         }
145 145
         $this->validateResponse($r);
146 146
         if (is_array($errorCode)) {
147
-            $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
147
+            $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
148 148
         } else {
149
-            $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
149
+            $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
150 150
         }
151 151
         if (!$r->faultCode()) {
152 152
             if ($returnResponse) {
@@ -173,20 +173,20 @@  discard block
 block discarded – undo
173 173
         $query = parse_url($this->client->path, PHP_URL_QUERY);
174 174
         parse_str($query, $vars);
175 175
         $query = http_build_query(array_merge($vars, $data));
176
-        $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query;
176
+        $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query;
177 177
     }
178 178
 
179 179
     public function testString()
180 180
     {
181
-        $sendString = "here are 3 \"entities\": < > & " .
182
-            "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) .
183
-            " - isn't that great? \\\"hackery\\\" at it's best " .
184
-            " also don't want to miss out on \$item[0]. " .
185
-            "The real weird stuff follows: CRLF here" . chr(13) . chr(10) .
186
-            "a simple CR here" . chr(13) .
187
-            "a simple LF here" . chr(10) .
188
-            "and then LFCR" . chr(10) . chr(13) .
189
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->";
181
+        $sendString = "here are 3 \"entities\": < > & ".
182
+            "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92).
183
+            " - isn't that great? \\\"hackery\\\" at it's best ".
184
+            " also don't want to miss out on \$item[0]. ".
185
+            "The real weird stuff follows: CRLF here".chr(13).chr(10).
186
+            "a simple CR here".chr(13).
187
+            "a simple LF here".chr(10).
188
+            "and then LFCR".chr(10).chr(13).
189
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->";
190 190
         $m = new xmlrpcmsg('examples.stringecho', array(
191 191
             new xmlrpcval($sendString, 'string'),
192 192
         ));
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
     public function testLatin1String()
208 208
     {
209 209
         $sendString =
210
-            "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne";
210
+            "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne";
211 211
         $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'.
212 212
             $sendString.
213 213
             '</value></param></params></methodCall>';
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
     public function testUtf8Method()
316 316
     {
317 317
         PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8';
318
-        $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array(
318
+        $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array(
319 319
             new xmlrpcval('hello')
320 320
         ));
321 321
         $v = $this->send($m);
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
         ));
338 338
         $v = $this->send($m);
339 339
         if ($v) {
340
-            $this->assertEquals($a + $b, $v->scalarval());
340
+            $this->assertEquals($a+$b, $v->scalarval());
341 341
         }
342 342
     }
343 343
 
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
         ));
350 350
         $v = $this->send($m);
351 351
         if ($v) {
352
-            $this->assertEquals(12 - 23, $v->scalarval());
352
+            $this->assertEquals(12-23, $v->scalarval());
353 353
         }
354 354
     }
355 355
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
         if ($v) {
384 384
             $sz = $v->arraysize();
385 385
             $got = '';
386
-            for ($i = 0; $i < $sz; $i++) {
386
+            for ($i = 0; $i<$sz; $i++) {
387 387
                 $b = $v->arraymem($i);
388 388
                 if ($b->scalarval()) {
389 389
                     $got .= '1';
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
             $got = '';
447 447
             $expected = '37210';
448 448
             $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes');
449
-            foreach($expect_array as $val) {
449
+            foreach ($expect_array as $val) {
450 450
                 $b = $v->structmem($val);
451 451
                 $got .= $b->me['int'];
452 452
             }
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
     {
900 900
         // make a 'deep client copy' as the original one might have many properties set
901 901
         // also for speed only wrap one method of the whole server
902
-        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' ));
902
+        $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/'));
903 903
         if ($class == '') {
904 904
             $this->fail('Registration of remote server failed');
905 905
         } else {
@@ -938,9 +938,9 @@  discard block
 block discarded – undo
938 938
         $cookies = array(
939 939
             //'c1' => array(),
940 940
             'c2' => array('value' => 'c2'),
941
-            'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30),
942
-            'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'),
943
-            'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
941
+            'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30),
942
+            'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'),
943
+            'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'),
944 944
         );
945 945
         $cookiesval = php_xmlrpc_encode($cookies);
946 946
         $m = new xmlrpcmsg('examples.setcookies', array($cookiesval));
@@ -988,10 +988,10 @@  discard block
 block discarded – undo
988 988
         $m = new xmlrpcmsg('examples.getcookies', array());
989 989
         foreach ($cookies as $cookie => $val) {
990 990
             $this->client->setCookie($cookie, $val);
991
-            $cookies[$cookie] = (string)$cookies[$cookie];
991
+            $cookies[$cookie] = (string) $cookies[$cookie];
992 992
         }
993 993
         $r = $this->client->send($m, $this->timeout, $this->method);
994
-        $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString());
994
+        $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString());
995 995
         if (!$r->faultCode()) {
996 996
             $v = $r->value();
997 997
             $v = php_xmlrpc_decode($v);
Please login to merge, or discard this patch.
tests/9ExtraFilesTest.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__ . '/WebTestCase.php';
3
+include_once __DIR__.'/WebTestCase.php';
4 4
 
5 5
 /**
6 6
  * Tests for php files in the 'extras' directory
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
     {
13 13
         $this->args = argParser::getArgs();
14 14
 
15
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI'] );
15
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI']);
16 16
 
17
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI'] );
17
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
18 18
     }
19 19
 
20 20
     public function testBenchmark()
Please login to merge, or discard this patch.
tests/8DebuggerTest.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__ . '/WebTestCase.php';
3
+include_once __DIR__.'/WebTestCase.php';
4 4
 
5 5
 class DebuggerTest extends PhpXmlRpc_WebTestCase
6 6
 {
@@ -8,9 +8,9 @@  discard block
 block discarded – undo
8 8
     {
9 9
         $this->args = argParser::getArgs();
10 10
 
11
-        $this->baseUrl = $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI'] );
11
+        $this->baseUrl = $this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/index.php', $this->args['HTTPURI']);
12 12
 
13
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . str_replace( '/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI'] );
13
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].str_replace('/demo/server/server.php', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
14 14
     }
15 15
 
16 16
     public function testIndex()
Please login to merge, or discard this patch.
demo/server/_prepend.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,5 +14,5 @@
 block discarded – undo
14 14
 }
15 15
 
16 16
 // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer
17
-include_once __DIR__ . '/../../src/Autoloader.php';
17
+include_once __DIR__.'/../../src/Autoloader.php';
18 18
 PhpXmlRpc\Autoloader::register();
Please login to merge, or discard this patch.
demo/client/_prepend.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 }
15 15
 
16 16
 // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer
17
-include_once __DIR__ . '/../../src/Autoloader.php';
17
+include_once __DIR__.'/../../src/Autoloader.php';
18 18
 PhpXmlRpc\Autoloader::register();
19 19
 
20 20
 // Let unit tests run against localhost, 'plain' demos against a known public server
Please login to merge, or discard this patch.
demo/client/proxy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-require_once __DIR__ . "/_prepend.php";
2
+require_once __DIR__."/_prepend.php";
3 3
 
4 4
 output('<html lang="en">
5 5
 <head><title>xmlrpc - Proxy demo</title></head>
Please login to merge, or discard this patch.
tests/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
16 16
     }
17 17
 
18
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
18
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
19 19
 }
20 20
 
21 21
 $targetFile = null;
@@ -38,5 +38,5 @@  discard block
 block discarded – undo
38 38
 }
39 39
 
40 40
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
41
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
41
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
42 42
 }
Please login to merge, or discard this patch.
src/Response.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -151,35 +151,35 @@  discard block
 block discarded – undo
151 151
     public function serialize($charsetEncoding = '')
152 152
     {
153 153
         if ($charsetEncoding != '') {
154
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
154
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
155 155
         } else {
156 156
             $this->content_type = 'text/xml';
157 157
         }
158 158
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
159
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
159
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
160 160
         } else {
161 161
             $result = "<methodResponse>\n";
162 162
         }
163 163
         if ($this->errno) {
164 164
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
165
-            $result .= "<fault>\n" .
166
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
167
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
168
-                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
165
+            $result .= "<fault>\n".
166
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
167
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
168
+                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
169 169
                 "</struct>\n</value>\n</fault>";
170 170
         } else {
171 171
             if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) {
172 172
                 if (is_string($this->val) && $this->valtyp == 'xml') {
173
-                    $result .= "<params>\n<param>\n" .
174
-                        $this->val .
173
+                    $result .= "<params>\n<param>\n".
174
+                        $this->val.
175 175
                         "</param>\n</params>";
176 176
                 } else {
177 177
                     /// @todo try to build something serializable using the Encoder...
178 178
                     throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
179 179
                 }
180 180
             } else {
181
-                $result .= "<params>\n<param>\n" .
182
-                    $this->val->serialize($charsetEncoding) .
181
+                $result .= "<params>\n<param>\n".
182
+                    $this->val->serialize($charsetEncoding).
183 183
                     "</param>\n</params>";
184 184
             }
185 185
         }
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
                 return $this->httpResponse['raw_data'];
205 205
             default:
206 206
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
207
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
207
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
208 208
                 return null;
209 209
         }
210 210
     }
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
                 break;
226 226
             default:
227 227
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
228
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
228
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
229 229
         }
230 230
     }
231 231
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
                 break;
258 258
             default:
259 259
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
260
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
260
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
261 261
         }
262 262
     }
263 263
 }
Please login to merge, or discard this patch.
src/Helper/XMLParser.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
         $this->accept = $accept;
155 155
 
156 156
         // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors
157
-        for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
157
+        for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
158 158
             $chunk = substr($data, $offset, $this->maxChunkLength);
159 159
             // error handling: xml not well formed
160
-            if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
160
+            if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
161 161
                 $errCode = xml_get_error_code($parser);
162 162
                 $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
163 163
                     xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
183 183
     {
184 184
         // if invalid xmlrpc already detected, skip all processing
185
-        if ($this->_xh['isf'] < 2) {
185
+        if ($this->_xh['isf']<2) {
186 186
 
187 187
             // check for correct element nesting
188 188
             if (count($this->_xh['stack']) == 0) {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
                     $this->_xh['rt'] = strtolower($name);
203 203
                 } else {
204 204
                     $this->_xh['isf'] = 2;
205
-                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
205
+                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
206 206
 
207 207
                     return;
208 208
                 }
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
                     break;
297 297
                 case 'MEMBER':
298 298
                     // set member name to null, in case we do not find in the xml later on
299
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
299
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
300 300
                     //$this->_xh['ac']='';
301 301
                 // Drop trough intentionally
302 302
                 case 'PARAM':
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
      */
358 358
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
359 359
     {
360
-        if ($this->_xh['isf'] < 2) {
360
+        if ($this->_xh['isf']<2) {
361 361
             // push this element name from stack
362 362
             // NB: if XML validates, correct opening/closing is guaranteed and
363 363
             // we do not have to check for $name == $currElem.
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
                         $this->_xh['vt'] = Value::$xmlrpcString;
373 373
                     }
374 374
 
375
-                    if ($rebuildXmlrpcvals > 0) {
375
+                    if ($rebuildXmlrpcvals>0) {
376 376
                         // build the xmlrpc val out of the data received, and substitute it
377 377
                         $temp = new Value($this->_xh['value'], $this->_xh['vt']);
378 378
                         // in case we got info about underlying php class, save it
@@ -381,15 +381,15 @@  discard block
 block discarded – undo
381 381
                             $temp->_php_class = $this->_xh['php_class'];
382 382
                         }
383 383
                         $this->_xh['value'] = $temp;
384
-                    } elseif ($rebuildXmlrpcvals < 0) {
384
+                    } elseif ($rebuildXmlrpcvals<0) {
385 385
                         if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
386
-                            $this->_xh['value'] = (object)array(
386
+                            $this->_xh['value'] = (object) array(
387 387
                                 'xmlrpc_type' => 'datetime',
388 388
                                 'scalar' => $this->_xh['value'],
389 389
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
390 390
                             );
391 391
                         } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
392
-                            $this->_xh['value'] = (object)array(
392
+                            $this->_xh['value'] = (object) array(
393 393
                                 'xmlrpc_type' => 'base64',
394 394
                                 'scalar' => $this->_xh['value']
395 395
                             );
@@ -405,8 +405,8 @@  discard block
 block discarded – undo
405 405
                     // check if we are inside an array or struct:
406 406
                     // if value just built is inside an array, let's move it into array on the stack
407 407
                     $vscount = count($this->_xh['valuestack']);
408
-                    if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
409
-                        $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
408
+                    if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
409
+                        $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
410 410
                     }
411 411
                     break;
412 412
                 case 'BOOLEAN':
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
                         $this->_xh['value'] = $this->_xh['ac'];
426 426
                     } elseif ($name == 'DATETIME.ISO8601') {
427 427
                         if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
428
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
428
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
429 429
                         }
430 430
                         $this->_xh['vt'] = Value::$xmlrpcDateTime;
431 431
                         $this->_xh['value'] = $this->_xh['ac'];
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
                         } else {
445 445
                             // log if receiving something strange, even though we set the value to false anyway
446 446
                             if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
447
-                                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
447
+                                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
448 448
                             }
449 449
                             $this->_xh['value'] = false;
450 450
                         }
@@ -454,37 +454,37 @@  discard block
 block discarded – undo
454 454
                         // NOTE: regexp could be much stricter than this...
455 455
                         if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
456 456
                             /// @todo: find a better way of throwing an error than this!
457
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
457
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
458 458
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
459 459
                         } else {
460 460
                             // it's ok, add it on
461
-                            $this->_xh['value'] = (double)$this->_xh['ac'];
461
+                            $this->_xh['value'] = (double) $this->_xh['ac'];
462 462
                         }
463 463
                     } else {
464 464
                         // we have an I4/I8/INT
465 465
                         // we must check that only 0123456789-<space> are characters here
466 466
                         if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
467 467
                             /// @todo find a better way of throwing an error than this!
468
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
468
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
469 469
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
470 470
                         } else {
471 471
                             // it's ok, add it on
472
-                            $this->_xh['value'] = (int)$this->_xh['ac'];
472
+                            $this->_xh['value'] = (int) $this->_xh['ac'];
473 473
                         }
474 474
                     }
475 475
                     $this->_xh['lv'] = 3; // indicate we've found a value
476 476
                     break;
477 477
                 case 'NAME':
478
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
478
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
479 479
                     break;
480 480
                 case 'MEMBER':
481 481
                     // add to array in the stack the last element built,
482 482
                     // unless no VALUE was found
483 483
                     if ($this->_xh['vt']) {
484 484
                         $vscount = count($this->_xh['valuestack']);
485
-                        $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
485
+                        $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
486 486
                     } else {
487
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
487
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
488 488
                     }
489 489
                     break;
490 490
                 case 'DATA':
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
                         $this->_xh['params'][] = $this->_xh['value'];
508 508
                         $this->_xh['pt'][] = $this->_xh['vt'];
509 509
                     } else {
510
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
510
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
511 511
                     }
512 512
                     break;
513 513
                 case 'METHODNAME':
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
     public function xmlrpc_cd($parser, $data)
567 567
     {
568 568
         // skip processing if xml fault already detected
569
-        if ($this->_xh['isf'] < 2) {
569
+        if ($this->_xh['isf']<2) {
570 570
             // "lookforvalue==3" means that we've found an entire value
571 571
             // and should discard any further character data
572 572
             if ($this->_xh['lv'] != 3) {
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
     public function xmlrpc_dh($parser, $data)
586 586
     {
587 587
         // skip processing if xml fault already detected
588
-        if ($this->_xh['isf'] < 2) {
588
+        if ($this->_xh['isf']<2) {
589 589
             if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
590 590
                 $this->_xh['ac'] .= $data;
591 591
             }
@@ -659,8 +659,8 @@  discard block
 block discarded – undo
659 659
         // Details:
660 660
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
661 661
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
662
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
663
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
662
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
663
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
664 664
             $xmlChunk, $matches)) {
665 665
             return strtoupper(substr($matches[2], 1, -1));
666 666
         }
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
679 679
             // IANA also likes better US-ASCII, so go with it
680 680
             if ($enc == 'ASCII') {
681
-                $enc = 'US-' . $enc;
681
+                $enc = 'US-'.$enc;
682 682
             }
683 683
 
684 684
             return $enc;
@@ -713,8 +713,8 @@  discard block
 block discarded – undo
713 713
         // Details:
714 714
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
715 715
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
716
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
717
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
716
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
717
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
718 718
             $xmlChunk, $matches)) {
719 719
             return true;
720 720
         }
Please login to merge, or discard this patch.