@@ -1,5 +1,5 @@ discard block |
||
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 - Introspect demo</title></head> |
@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | function display_error($r) |
14 | 14 | { |
15 | 15 | output("An error occurred: "); |
16 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
16 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | $client = new PhpXmlRpc\Client(XMLRPCSERVER); |
20 | 20 | |
21 | 21 | // First off, let's retrieve the list of methods available on the remote server |
22 | -output("<h3>methods available at http://" . $client->server . $client->path . "</h3>\n"); |
|
22 | +output("<h3>methods available at http://".$client->server.$client->path."</h3>\n"); |
|
23 | 23 | $req = new PhpXmlRpc\Request('system.listMethods'); |
24 | 24 | $resp = $client->send($req); |
25 | 25 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | // Then, retrieve the signature and help text of each available method |
32 | 32 | foreach ($v as $methodName) { |
33 | - output("<h4>" . htmlspecialchars($methodName->scalarval()) . "</h4>\n"); |
|
33 | + output("<h4>".htmlspecialchars($methodName->scalarval())."</h4>\n"); |
|
34 | 34 | // build messages first, add params later |
35 | 35 | $m1 = new PhpXmlRpc\Request('system.methodHelp'); |
36 | 36 | $m2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | if ($val->kindOf() == "array") { |
62 | 62 | foreach ($val as $x) { |
63 | 63 | $ret = $x[0]; |
64 | - output("<code>" . htmlspecialchars($ret->scalarval()) . " " |
|
65 | - . htmlspecialchars($methodName->scalarval()) . "("); |
|
66 | - if ($x->count() > 1) { |
|
67 | - for ($k = 1; $k < $x->count(); $k++) { |
|
64 | + output("<code>".htmlspecialchars($ret->scalarval())." " |
|
65 | + . htmlspecialchars($methodName->scalarval())."("); |
|
66 | + if ($x->count()>1) { |
|
67 | + for ($k = 1; $k<$x->count(); $k++) { |
|
68 | 68 | $y = $x[$k]; |
69 | 69 | output(htmlspecialchars($y->scalarval())); |
70 | - if ($k < $x->count() - 1) { |
|
70 | + if ($k<$x->count()-1) { |
|
71 | 71 | output(", "); |
72 | 72 | } |
73 | 73 | } |
@@ -1,5 +1,5 @@ |
||
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> |
@@ -1,5 +1,5 @@ discard block |
||
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 - Mail demo</title></head> |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | output("<font color=\"red\">"); |
36 | 36 | output("Mail send failed<br/>\n"); |
37 | 37 | output("Fault: "); |
38 | - output("Code: " . htmlspecialchars($resp->faultCode()) . |
|
39 | - " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>"); |
|
38 | + output("Code: ".htmlspecialchars($resp->faultCode()). |
|
39 | + " Reason: '".htmlspecialchars($resp->faultString())."'<br/>"); |
|
40 | 40 | output("</font><br/>"); |
41 | 41 | } |
42 | 42 | } |
@@ -15,7 +15,7 @@ discard block |
||
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 |
||
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 | } |
@@ -151,35 +151,35 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -154,10 +154,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -68,14 +68,14 @@ discard block |
||
68 | 68 | if (count($this->xml_iso88591_Entities['in'])) { |
69 | 69 | return; |
70 | 70 | } |
71 | - for ($i = 0; $i < 32; $i++) { |
|
71 | + for ($i = 0; $i<32; $i++) { |
|
72 | 72 | $this->xml_iso88591_Entities["in"][] = chr($i); |
73 | 73 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
74 | 74 | } |
75 | 75 | |
76 | 76 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
77 | 77 | |
78 | - for ($i = 160; $i < 256; $i++) { |
|
78 | + for ($i = 160; $i<256; $i++) { |
|
79 | 79 | $this->xml_iso88591_Entities["in"][] = chr($i); |
80 | 80 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
81 | 81 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | break;*/ |
104 | 104 | |
105 | 105 | default: |
106 | - throw new \Exception('Unsupported table: ' . $tableName); |
|
106 | + throw new \Exception('Unsupported table: '.$tableName); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $destEncoding = 'US-ASCII'; |
147 | 147 | } |
148 | 148 | |
149 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
149 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
150 | 150 | |
151 | 151 | // list ordered with (expected) most common scenarios first |
152 | 152 | switch ($conversion) { |
@@ -164,20 +164,20 @@ discard block |
||
164 | 164 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
165 | 165 | $escapedData = ''; |
166 | 166 | // be kind to users creating string xmlrpc values out of different php types |
167 | - $data = (string)$data; |
|
167 | + $data = (string) $data; |
|
168 | 168 | $ns = strlen($data); |
169 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
169 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
170 | 170 | $ch = $data[$nn]; |
171 | 171 | $ii = ord($ch); |
172 | 172 | // 7 bits in 1 byte: 0bbbbbbb (127) |
173 | - if ($ii < 32) { |
|
173 | + if ($ii<32) { |
|
174 | 174 | if ($conversion == 'UTF-8_US-ASCII') { |
175 | 175 | $escapedData .= sprintf('&#%d;', $ii); |
176 | 176 | } else { |
177 | 177 | $escapedData .= $ch; |
178 | 178 | } |
179 | 179 | } |
180 | - else if ($ii < 128) { |
|
180 | + else if ($ii<128) { |
|
181 | 181 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
182 | 182 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
183 | 183 | switch ($ii) { |
@@ -202,25 +202,25 @@ discard block |
||
202 | 202 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
203 | 203 | elseif ($ii >> 5 == 6) { |
204 | 204 | $b1 = ($ii & 31); |
205 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
206 | - $ii = ($b1 * 64) + $b2; |
|
205 | + $b2 = (ord($data[$nn+1]) & 63); |
|
206 | + $ii = ($b1 * 64)+$b2; |
|
207 | 207 | $escapedData .= sprintf('&#%d;', $ii); |
208 | 208 | $nn += 1; |
209 | 209 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
210 | 210 | elseif ($ii >> 4 == 14) { |
211 | 211 | $b1 = ($ii & 15); |
212 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
213 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
214 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
212 | + $b2 = (ord($data[$nn+1]) & 63); |
|
213 | + $b3 = (ord($data[$nn+2]) & 63); |
|
214 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
215 | 215 | $escapedData .= sprintf('&#%d;', $ii); |
216 | 216 | $nn += 2; |
217 | 217 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
218 | 218 | elseif ($ii >> 3 == 30) { |
219 | 219 | $b1 = ($ii & 7); |
220 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
221 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
222 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
223 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
220 | + $b2 = (ord($data[$nn+1]) & 63); |
|
221 | + $b3 = (ord($data[$nn+2]) & 63); |
|
222 | + $b4 = (ord($data[$nn+3]) & 63); |
|
223 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
224 | 224 | $escapedData .= sprintf('&#%d;', $ii); |
225 | 225 | $nn += 3; |
226 | 226 | } |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | |
269 | 269 | default: |
270 | 270 | $escapedData = ''; |
271 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
271 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
272 | 272 | } |
273 | 273 | |
274 | 274 | return $escapedData; |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | case 'iso88591': |
323 | 323 | return $this->xml_iso88591_Entities; |
324 | 324 | default: |
325 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
325 | + throw new \Exception('Unsupported charset: '.$charset); |
|
326 | 326 | } |
327 | 327 | } |
328 | 328 | } |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | * It uses a Berkeley DB database for storage. |
5 | 5 | */ |
6 | 6 | |
7 | -require_once __DIR__ . "/_prepend.php"; |
|
7 | +require_once __DIR__."/_prepend.php"; |
|
8 | 8 | |
9 | 9 | use PhpXmlRpc\Value; |
10 | 10 | |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | $count = 0; |
36 | 36 | } |
37 | 37 | // add the new comment in |
38 | - dba_insert($msgID . "_comment_{$count}", $comment, $dbh); |
|
39 | - dba_insert($msgID . "_name_{$count}", $name, $dbh); |
|
38 | + dba_insert($msgID."_comment_{$count}", $comment, $dbh); |
|
39 | + dba_insert($msgID."_name_{$count}", $name, $dbh); |
|
40 | 40 | $count++; |
41 | 41 | dba_replace($countID, $count, $dbh); |
42 | 42 | dba_close($dbh); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $countID = "{$msgID}_count"; |
70 | 70 | if (dba_exists($countID, $dbh)) { |
71 | 71 | $count = dba_fetch($countID, $dbh); |
72 | - for ($i = 0; $i < $count; $i++) { |
|
72 | + for ($i = 0; $i<$count; $i++) { |
|
73 | 73 | $name = dba_fetch("{$msgID}_name_{$i}", $dbh); |
74 | 74 | $comment = dba_fetch("{$msgID}_comment_{$i}", $dbh); |
75 | 75 | // push a new struct onto the return array |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | +include_once __DIR__.'/../lib/xmlrpcs.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\Runner\BaseTestRunner; |
11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | public function testI8() |
105 | 105 | { |
106 | - if (PHP_INT_SIZE == 4 ) { |
|
106 | + if (PHP_INT_SIZE == 4) { |
|
107 | 107 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
108 | 108 | return; |
109 | 109 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | public function testUnicodeInMemberName() |
135 | 135 | { |
136 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
136 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
137 | 137 | $v = array($str => new xmlrpcval(1)); |
138 | 138 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
139 | 139 | $r = $r->serialize(); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | '<?xml version="1.0"?> |
151 | 151 | <!-- $Id --> |
152 | 152 | <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments --> |
153 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
153 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
154 | 154 | <methodResponse> |
155 | 155 | <fault> |
156 | 156 | <value> |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | </member> |
162 | 162 | <member> |
163 | 163 | <name>faultString</name> |
164 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
164 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
165 | 165 | </member> |
166 | 166 | </struct> |
167 | 167 | </value> |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $m = $this->newMsg('dummy'); |
171 | 171 | $r = $m->parseResponse($response); |
172 | 172 | $v = $r->faultString(); |
173 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
173 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | public function testBrokenRequests() |
@@ -410,11 +410,11 @@ discard block |
||
410 | 410 | |
411 | 411 | public function testUTF8Response() |
412 | 412 | { |
413 | - $string = chr(224) . chr(252) . chr(232); |
|
413 | + $string = chr(224).chr(252).chr(232); |
|
414 | 414 | |
415 | 415 | $s = $this->newMsg('dummy'); |
416 | - $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> |
|
417 | -<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> |
|
416 | + $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> |
|
417 | +<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> |
|
418 | 418 | '; |
419 | 419 | $r = $s->parseResponse($f, false, 'phpvals'); |
420 | 420 | $v = $r->value(); |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $this->assertEquals($string, $v); |
423 | 423 | |
424 | 424 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
425 | -<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> |
|
425 | +<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> |
|
426 | 426 | '; |
427 | 427 | $r = $s->parseResponse($f, false, 'phpvals'); |
428 | 428 | $v = $r->value(); |
@@ -438,11 +438,11 @@ discard block |
||
438 | 438 | |
439 | 439 | public function testLatin1Response() |
440 | 440 | { |
441 | - $string = chr(224) . chr(252) . chr(232); |
|
441 | + $string = chr(224).chr(252).chr(232); |
|
442 | 442 | |
443 | 443 | $s = $this->newMsg('dummy'); |
444 | - $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> |
|
445 | -<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> |
|
444 | + $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> |
|
445 | +<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> |
|
446 | 446 | '; |
447 | 447 | $r = $s->parseResponse($f, false, 'phpvals'); |
448 | 448 | $v = $r->value(); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $this->assertEquals($string, $v); |
451 | 451 | |
452 | 452 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
453 | -<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> |
|
453 | +<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> |
|
454 | 454 | '; |
455 | 455 | $r = $s->parseResponse($f, false, 'phpvals'); |
456 | 456 | $v = $r->value(); |