gggeek /
phpxmlrpc
@@ -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>phpxmlrpc - Getstatename demo</title></head> |
@@ -17,13 +17,13 @@ discard block |
||
| 17 | 17 | $stateNo = ""; |
| 18 | 18 | |
| 19 | 19 | if (isset($_POST['stateno']) && $_POST['stateno'] != "") { |
| 20 | - $stateNo = (int)$_POST['stateno']; |
|
| 20 | + $stateNo = (int) $_POST['stateno']; |
|
| 21 | 21 | $method = 'examples.getStateName'; |
| 22 | 22 | $arguments = array( |
| 23 | 23 | new Value($stateNo, Value::$xmlrpcInt), |
| 24 | 24 | ); |
| 25 | 25 | $req = new Request($method, $arguments); |
| 26 | - output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . |
|
| 26 | + output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()). |
|
| 27 | 27 | "\n\n</pre>Debug info of server data follows...\n\n"); |
| 28 | 28 | $client = new Client(XMLRPCSERVER); |
| 29 | 29 | $client->setOption(Client::OPT_DEBUG, 1); |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | $val = $resp->value(); |
| 33 | 33 | // NB: we are _assuming_ that the server did return a scalar xml-rpc value here. |
| 34 | 34 | // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'` |
| 35 | - output('<br/>State number <b>' . $stateNo . '</b> is <b>' |
|
| 36 | - . htmlspecialchars($val->scalarVal()) . '</b><br/><br/>'); |
|
| 35 | + output('<br/>State number <b>'.$stateNo.'</b> is <b>' |
|
| 36 | + . htmlspecialchars($val->scalarVal()).'</b><br/><br/>'); |
|
| 37 | 37 | } else { |
| 38 | 38 | output('An error occurred: '); |
| 39 | - output('<pre>Code: ' . htmlspecialchars($resp->faultCode()) |
|
| 40 | - . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>"); |
|
| 39 | + output('<pre>Code: '.htmlspecialchars($resp->faultCode()) |
|
| 40 | + . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>"); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @license code licensed under the BSD License: see file license.txt |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | -require_once __DIR__ . "/_prepend.php"; |
|
| 19 | +require_once __DIR__."/_prepend.php"; |
|
| 20 | 20 | |
| 21 | 21 | // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE *** |
| 22 | 22 | // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!! |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | // fe. any url using the 'file://' protocol might be considered a hacking attempt |
| 48 | 48 | $client = new Client($url); |
| 49 | 49 | |
| 50 | - if ($req->getNumParams() > 3) { |
|
| 50 | + if ($req->getNumParams()>3) { |
|
| 51 | 51 | // We have to set some options onto the client. |
| 52 | 52 | // Note that if we do not untaint the received values, warnings might be generated... |
| 53 | 53 | $options = $encoder->decode($req->getParam(3)); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $client->setOption(Client::OPT_VERIFY_PEER, $val); |
| 88 | 88 | break; |
| 89 | 89 | case 'Timeout': |
| 90 | - $timeout = (int)$val; |
|
| 90 | + $timeout = (int) $val; |
|
| 91 | 91 | break; |
| 92 | 92 | } // switch |
| 93 | 93 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | /// X-forwarded-for anyway, unless they consider this server as trusted...) |
| 101 | 101 | $reqMethod = $req->getParam(1)->scalarVal(); |
| 102 | 102 | $req = new Request($reqMethod); |
| 103 | - if ($req->getNumParams() > 1) { |
|
| 103 | + if ($req->getNumParams()>1) { |
|
| 104 | 104 | $pars = $req->getParam(2); |
| 105 | 105 | foreach ($pars as $par) { |
| 106 | 106 | $req->addParam($par); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | // add debug info into response we give back to caller |
| 111 | - Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
| 111 | + Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
| 112 | 112 | |
| 113 | 113 | return $client->send($req, $timeout); |
| 114 | 114 | } |
@@ -187,12 +187,12 @@ discard block |
||
| 187 | 187 | // q: can php be built without ctype? should we use a regexp? |
| 188 | 188 | if (is_string($key) && !ctype_digit($key)) { |
| 189 | 189 | /// @todo on invalid options, throw/error-out instead of logging an error message? |
| 190 | - switch($key) { |
|
| 190 | + switch ($key) { |
|
| 191 | 191 | case 'target_charset': |
| 192 | 192 | if (function_exists('mb_convert_encoding')) { |
| 193 | 193 | $this->current_parsing_options['target_charset'] = $val; |
| 194 | 194 | } else { |
| 195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring"); |
|
| 195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring"); |
|
| 196 | 196 | } |
| 197 | 197 | break; |
| 198 | 198 | |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | if (is_callable($val)) { |
| 201 | 201 | $this->current_parsing_options['methodname_callback'] = $val; |
| 202 | 202 | } else { |
| 203 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable"); |
|
| 203 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable"); |
|
| 204 | 204 | } |
| 205 | 205 | break; |
| 206 | 206 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | break; |
| 212 | 212 | |
| 213 | 213 | default: |
| 214 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": unsupported option: $key"); |
|
| 214 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.": unsupported option: $key"); |
|
| 215 | 215 | } |
| 216 | 216 | unset($mergedOptions[$key]); |
| 217 | 217 | } |
@@ -255,10 +255,10 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | try { |
| 257 | 257 | // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors |
| 258 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 258 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 259 | 259 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 260 | 260 | // error handling: xml not well formed |
| 261 | - if (!@xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 261 | + if (!@xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 262 | 262 | $errCode = xml_get_error_code($parser); |
| 263 | 263 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 264 | 264 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -266,25 +266,25 @@ discard block |
||
| 266 | 266 | $this->_xh['isf_reason'] = $errStr; |
| 267 | 267 | } |
| 268 | 268 | // no need to parse further if we already have a fatal error |
| 269 | - if ($this->_xh['isf'] >= 2) { |
|
| 269 | + if ($this->_xh['isf']>=2) { |
|
| 270 | 270 | break; |
| 271 | 271 | } |
| 272 | 272 | } |
| 273 | 273 | /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times |
| 274 | 274 | } catch (\Exception $e) { |
| 275 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
| 275 | + if (PHP_MAJOR_VERSION<8) xml_parser_free($parser); |
|
| 276 | 276 | $this->current_parsing_options = array(); |
| 277 | 277 | /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ? |
| 278 | 278 | throw $e; |
| 279 | 279 | } catch (\Error $e) { |
| 280 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
| 280 | + if (PHP_MAJOR_VERSION<8) xml_parser_free($parser); |
|
| 281 | 281 | $this->current_parsing_options = array(); |
| 282 | 282 | //$this->accept = $prevAccept; |
| 283 | 283 | /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ? |
| 284 | 284 | throw $e; |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
| 287 | + if (PHP_MAJOR_VERSION<8) xml_parser_free($parser); |
|
| 288 | 288 | $this->current_parsing_options = array(); |
| 289 | 289 | |
| 290 | 290 | // BC |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 312 | 312 | { |
| 313 | 313 | // if invalid xml-rpc already detected, skip all processing |
| 314 | - if ($this->_xh['isf'] >= 2) { |
|
| 314 | + if ($this->_xh['isf']>=2) { |
|
| 315 | 315 | return; |
| 316 | 316 | } |
| 317 | 317 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | if ($acceptSingleVals === false) { |
| 326 | 326 | $accept = $this->current_parsing_options['accept']; |
| 327 | 327 | } else { |
| 328 | - $this->logDeprecation('Using argument $acceptSingleVals for method ' . __METHOD__ . ' is deprecated'); |
|
| 328 | + $this->logDeprecation('Using argument $acceptSingleVals for method '.__METHOD__.' is deprecated'); |
|
| 329 | 329 | $accept = self::ACCEPT_REQUEST | self::ACCEPT_RESPONSE | self::ACCEPT_VALUE; |
| 330 | 330 | } |
| 331 | 331 | if (($name == 'METHODCALL' && ($accept & self::ACCEPT_REQUEST)) || |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $this->_xh['rt'] = strtolower($name); |
| 336 | 336 | } else { |
| 337 | 337 | $this->_xh['isf'] = 2; |
| 338 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 338 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 339 | 339 | |
| 340 | 340 | return; |
| 341 | 341 | } |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | |
| 441 | 441 | case 'MEMBER': |
| 442 | 442 | // set member name to null, in case we do not find in the xml later on |
| 443 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = null; |
|
| 443 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = null; |
|
| 444 | 444 | //$this->_xh['ac']=''; |
| 445 | 445 | // Drop trough intentionally |
| 446 | 446 | |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | */ |
| 504 | 504 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 505 | 505 | { |
| 506 | - if ($this->_xh['isf'] >= 2) { |
|
| 506 | + if ($this->_xh['isf']>=2) { |
|
| 507 | 507 | return; |
| 508 | 508 | } |
| 509 | 509 | |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8'); |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | - if ($rebuildXmlrpcvals > 0) { |
|
| 528 | + if ($rebuildXmlrpcvals>0) { |
|
| 529 | 529 | // build the xml-rpc val out of the data received, and substitute it |
| 530 | 530 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 531 | 531 | // in case we got info about underlying php class, save it in the object we're rebuilding |
@@ -533,15 +533,15 @@ discard block |
||
| 533 | 533 | $temp->_php_class = $this->_xh['php_class']; |
| 534 | 534 | } |
| 535 | 535 | $this->_xh['value'] = $temp; |
| 536 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 536 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 537 | 537 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 538 | - $this->_xh['value'] = (object)array( |
|
| 538 | + $this->_xh['value'] = (object) array( |
|
| 539 | 539 | 'xmlrpc_type' => 'datetime', |
| 540 | 540 | 'scalar' => $this->_xh['value'], |
| 541 | 541 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 542 | 542 | ); |
| 543 | 543 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 544 | - $this->_xh['value'] = (object)array( |
|
| 544 | + $this->_xh['value'] = (object) array( |
|
| 545 | 545 | 'xmlrpc_type' => 'base64', |
| 546 | 546 | 'scalar' => $this->_xh['value'] |
| 547 | 547 | ); |
@@ -556,8 +556,8 @@ discard block |
||
| 556 | 556 | // check if we are inside an array or struct: |
| 557 | 557 | // if value just built is inside an array, let's move it into array on the stack |
| 558 | 558 | $vscount = count($this->_xh['valuestack']); |
| 559 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 560 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 559 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 560 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 561 | 561 | } |
| 562 | 562 | break; |
| 563 | 563 | |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | // log if receiving something strange, even though we set the value to false anyway |
| 585 | 585 | /// @todo to be consistent with the other types, we should return a value outside the good-value domain, e.g. NULL |
| 586 | 586 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') !== 0) { |
| 587 | - if (!$this->handleParsingError('invalid data received in BOOLEAN value: ' . |
|
| 587 | + if (!$this->handleParsingError('invalid data received in BOOLEAN value: '. |
|
| 588 | 588 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 589 | 589 | return; |
| 590 | 590 | } |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | $this->_xh['vt'] = strtolower($name); |
| 605 | 605 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 606 | 606 | if (!preg_match(PhpXmlRpc::$xmlrpc_int_format, $this->_xh['ac'])) { |
| 607 | - if (!$this->handleParsingError('non numeric data received in INT value: ' . |
|
| 607 | + if (!$this->handleParsingError('non numeric data received in INT value: '. |
|
| 608 | 608 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 609 | 609 | return; |
| 610 | 610 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 613 | 613 | } else { |
| 614 | 614 | // it's ok, add it on |
| 615 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 615 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 616 | 616 | } |
| 617 | 617 | break; |
| 618 | 618 | |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | $this->_xh['vt'] = Value::$xmlrpcDouble; |
| 621 | 621 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 622 | 622 | if (!preg_match(PhpXmlRpc::$xmlrpc_double_format, $this->_xh['ac'])) { |
| 623 | - if (!$this->handleParsingError('non numeric data received in DOUBLE value: ' . |
|
| 623 | + if (!$this->handleParsingError('non numeric data received in DOUBLE value: '. |
|
| 624 | 624 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 625 | 625 | return; |
| 626 | 626 | } |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 629 | 629 | } else { |
| 630 | 630 | // it's ok, add it on |
| 631 | - $this->_xh['value'] = (float)$this->_xh['ac']; |
|
| 631 | + $this->_xh['value'] = (float) $this->_xh['ac']; |
|
| 632 | 632 | } |
| 633 | 633 | break; |
| 634 | 634 | |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 637 | 637 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 638 | 638 | if (!preg_match(PhpXmlRpc::$xmlrpc_datetime_format, $this->_xh['ac'])) { |
| 639 | - if (!$this->handleParsingError('invalid data received in DATETIME value: ' . |
|
| 639 | + if (!$this->handleParsingError('invalid data received in DATETIME value: '. |
|
| 640 | 640 | $this->truncateValueForLog($this->_xh['ac']), __METHOD__)) { |
| 641 | 641 | return; |
| 642 | 642 | } |
@@ -647,9 +647,9 @@ discard block |
||
| 647 | 647 | |
| 648 | 648 | // the default regex used to validate the date string a few lines above should make this case impossible, |
| 649 | 649 | // but one never knows... |
| 650 | - } catch(\Exception $e) { |
|
| 650 | + } catch (\Exception $e) { |
|
| 651 | 651 | // what to do? We can not guarantee that a valid date can be created. We return null... |
| 652 | - if (!$this->handleParsingError('invalid data received in DATETIME value. Error ' . |
|
| 652 | + if (!$this->handleParsingError('invalid data received in DATETIME value. Error '. |
|
| 653 | 653 | $e->getMessage(), __METHOD__)) { |
| 654 | 654 | return; |
| 655 | 655 | } |
@@ -666,14 +666,14 @@ discard block |
||
| 666 | 666 | $v = base64_decode($this->_xh['ac'], true); |
| 667 | 667 | if ($v === false) { |
| 668 | 668 | $this->_xh['isf'] = 2; |
| 669 | - $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '. $this->truncateValueForLog($this->_xh['ac']); |
|
| 669 | + $this->_xh['isf_reason'] = 'Invalid data received in BASE64 value: '.$this->truncateValueForLog($this->_xh['ac']); |
|
| 670 | 670 | return; |
| 671 | 671 | } |
| 672 | 672 | } else { |
| 673 | 673 | $v = base64_decode($this->_xh['ac']); |
| 674 | 674 | if ($v === '' && $this->_xh['ac'] !== '') { |
| 675 | 675 | // only the empty string should decode to the empty string |
| 676 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid data received in BASE64 value: ' . |
|
| 676 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid data received in BASE64 value: '. |
|
| 677 | 677 | $this->truncateValueForLog($this->_xh['ac'])); |
| 678 | 678 | } |
| 679 | 679 | } |
@@ -681,20 +681,20 @@ discard block |
||
| 681 | 681 | break; |
| 682 | 682 | |
| 683 | 683 | case 'NAME': |
| 684 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 684 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 685 | 685 | break; |
| 686 | 686 | |
| 687 | 687 | case 'MEMBER': |
| 688 | 688 | // add to array in the stack the last element built, unless no VALUE or no NAME were found |
| 689 | 689 | if ($this->_xh['vt']) { |
| 690 | 690 | $vscount = count($this->_xh['valuestack']); |
| 691 | - if ($this->_xh['valuestack'][$vscount - 1]['name'] === null) { |
|
| 691 | + if ($this->_xh['valuestack'][$vscount-1]['name'] === null) { |
|
| 692 | 692 | if (!$this->handleParsingError('missing NAME inside STRUCT in received xml', __METHOD__)) { |
| 693 | 693 | return; |
| 694 | 694 | } |
| 695 | - $this->_xh['valuestack'][$vscount - 1]['name'] = ''; |
|
| 695 | + $this->_xh['valuestack'][$vscount-1]['name'] = ''; |
|
| 696 | 696 | } |
| 697 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 697 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 698 | 698 | } else { |
| 699 | 699 | if (!$this->handleParsingError('missing VALUE inside STRUCT in received xml', __METHOD__)) { |
| 700 | 700 | return; |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | public function xmlrpc_cd($parser, $data) |
| 829 | 829 | { |
| 830 | 830 | // skip processing if xml fault already detected |
| 831 | - if ($this->_xh['isf'] >= 2) { |
|
| 831 | + if ($this->_xh['isf']>=2) { |
|
| 832 | 832 | return; |
| 833 | 833 | } |
| 834 | 834 | |
@@ -850,7 +850,7 @@ discard block |
||
| 850 | 850 | public function xmlrpc_dh($parser, $data) |
| 851 | 851 | { |
| 852 | 852 | // skip processing if xml fault already detected |
| 853 | - if ($this->_xh['isf'] >= 2) { |
|
| 853 | + if ($this->_xh['isf']>=2) { |
|
| 854 | 854 | return; |
| 855 | 855 | } |
| 856 | 856 | |
@@ -930,8 +930,8 @@ discard block |
||
| 930 | 930 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 931 | 931 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 932 | 932 | // We could be stricter on version number: VersionNum ::= '1.' [0-9]+ |
| 933 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 934 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 933 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 934 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 935 | 935 | $xmlChunk, $matches)) { |
| 936 | 936 | return strtoupper(substr($matches[2], 1, -1)); |
| 937 | 937 | } |
@@ -949,7 +949,7 @@ discard block |
||
| 949 | 949 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 950 | 950 | // IANA also likes better US-ASCII, so go with it |
| 951 | 951 | if ($enc == 'ASCII') { |
| 952 | - $enc = 'US-' . $enc; |
|
| 952 | + $enc = 'US-'.$enc; |
|
| 953 | 953 | } |
| 954 | 954 | |
| 955 | 955 | return $enc; |
@@ -990,8 +990,8 @@ discard block |
||
| 990 | 990 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 991 | 991 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 992 | 992 | // We could be stricter on version number: VersionNum ::= '1.' [0-9]+ |
| 993 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 994 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 993 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 994 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 995 | 995 | $xmlChunk)) { |
| 996 | 996 | return true; |
| 997 | 997 | } |
@@ -1011,7 +1011,7 @@ discard block |
||
| 1011 | 1011 | $this->_xh['isf_reason'] = ucfirst($message); |
| 1012 | 1012 | return false; |
| 1013 | 1013 | } else { |
| 1014 | - $this->getLogger()->error('XML-RPC: ' . ($method != '' ? $method . ': ' : '') . $message); |
|
| 1014 | + $this->getLogger()->error('XML-RPC: '.($method != '' ? $method.': ' : '').$message); |
|
| 1015 | 1015 | return true; |
| 1016 | 1016 | } |
| 1017 | 1017 | } |
@@ -1023,8 +1023,8 @@ discard block |
||
| 1023 | 1023 | */ |
| 1024 | 1024 | protected function truncateValueForLog($data) |
| 1025 | 1025 | { |
| 1026 | - if (strlen($data) > $this->maxLogValueLength) { |
|
| 1027 | - return substr($data, 0, $this->maxLogValueLength - 3) . '...'; |
|
| 1026 | + if (strlen($data)>$this->maxLogValueLength) { |
|
| 1027 | + return substr($data, 0, $this->maxLogValueLength-3).'...'; |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | return $data; |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | public function xmlrpc_se_any($parser, $name, $attrs) |
| 1046 | 1046 | { |
| 1047 | 1047 | // this will be spamming the log if this method is in use... |
| 1048 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1048 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1049 | 1049 | |
| 1050 | 1050 | $this->xmlrpc_se($parser, $name, $attrs, true); |
| 1051 | 1051 | } |
@@ -1055,12 +1055,12 @@ discard block |
||
| 1055 | 1055 | switch ($name) { |
| 1056 | 1056 | case '_xh': |
| 1057 | 1057 | case 'xmlrpc_valid_parents': |
| 1058 | - $this->logDeprecation('Getting property XMLParser::' . $name . ' is deprecated'); |
|
| 1058 | + $this->logDeprecation('Getting property XMLParser::'.$name.' is deprecated'); |
|
| 1059 | 1059 | return $this->$name; |
| 1060 | 1060 | default: |
| 1061 | 1061 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1062 | 1062 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1063 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1063 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1064 | 1064 | $result = null; |
| 1065 | 1065 | return $result; |
| 1066 | 1066 | } |
@@ -1071,18 +1071,18 @@ discard block |
||
| 1071 | 1071 | switch ($name) { |
| 1072 | 1072 | // this should only ever be called by subclasses which overtook `parse()` |
| 1073 | 1073 | case 'accept': |
| 1074 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1074 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1075 | 1075 | $this->current_parsing_options['accept'] = $value; |
| 1076 | 1076 | break; |
| 1077 | 1077 | case '_xh': |
| 1078 | 1078 | case 'xmlrpc_valid_parents': |
| 1079 | - $this->logDeprecation('Setting property XMLParser::' . $name . ' is deprecated'); |
|
| 1079 | + $this->logDeprecation('Setting property XMLParser::'.$name.' is deprecated'); |
|
| 1080 | 1080 | $this->$name = $value; |
| 1081 | 1081 | break; |
| 1082 | 1082 | default: |
| 1083 | 1083 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1084 | 1084 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1085 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1085 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1086 | 1086 | } |
| 1087 | 1087 | } |
| 1088 | 1088 | |
@@ -1090,11 +1090,11 @@ discard block |
||
| 1090 | 1090 | { |
| 1091 | 1091 | switch ($name) { |
| 1092 | 1092 | case 'accept': |
| 1093 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1093 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1094 | 1094 | return isset($this->current_parsing_options['accept']); |
| 1095 | 1095 | case '_xh': |
| 1096 | 1096 | case 'xmlrpc_valid_parents': |
| 1097 | - $this->logDeprecation('Checking property XMLParser::' . $name . ' is deprecated'); |
|
| 1097 | + $this->logDeprecation('Checking property XMLParser::'.$name.' is deprecated'); |
|
| 1098 | 1098 | return isset($this->$name); |
| 1099 | 1099 | default: |
| 1100 | 1100 | return false; |
@@ -1106,18 +1106,18 @@ discard block |
||
| 1106 | 1106 | switch ($name) { |
| 1107 | 1107 | // q: does this make sense at all? |
| 1108 | 1108 | case 'accept': |
| 1109 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1109 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1110 | 1110 | unset($this->current_parsing_options['accept']); |
| 1111 | 1111 | break; |
| 1112 | 1112 | case '_xh': |
| 1113 | 1113 | case 'xmlrpc_valid_parents': |
| 1114 | - $this->logDeprecation('Unsetting property XMLParser::' . $name . ' is deprecated'); |
|
| 1114 | + $this->logDeprecation('Unsetting property XMLParser::'.$name.' is deprecated'); |
|
| 1115 | 1115 | unset($this->$name); |
| 1116 | 1116 | break; |
| 1117 | 1117 | default: |
| 1118 | 1118 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1119 | 1119 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1120 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1120 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1121 | 1121 | } |
| 1122 | 1122 | } |
| 1123 | 1123 | } |
@@ -272,19 +272,25 @@ |
||
| 272 | 272 | } |
| 273 | 273 | /// @todo bump minimum php version to 5.5 and use a finally clause instead of doing cleanup 3 times |
| 274 | 274 | } catch (\Exception $e) { |
| 275 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
| 275 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 276 | + xml_parser_free($parser); |
|
| 277 | + } |
|
| 276 | 278 | $this->current_parsing_options = array(); |
| 277 | 279 | /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ? |
| 278 | 280 | throw $e; |
| 279 | 281 | } catch (\Error $e) { |
| 280 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
| 282 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 283 | + xml_parser_free($parser); |
|
| 284 | + } |
|
| 281 | 285 | $this->current_parsing_options = array(); |
| 282 | 286 | //$this->accept = $prevAccept; |
| 283 | 287 | /// @todo should we set $this->_xh['isf'] and $this->_xh['isf_reason'] ? |
| 284 | 288 | throw $e; |
| 285 | 289 | } |
| 286 | 290 | |
| 287 | - if (PHP_MAJOR_VERSION < 8) xml_parser_free($parser); |
|
| 291 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 292 | + xml_parser_free($parser); |
|
| 293 | + } |
|
| 288 | 294 | $this->current_parsing_options = array(); |
| 289 | 295 | |
| 290 | 296 | // BC |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 3 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase |
| 6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | protected function request($path, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 17 | 17 | { |
| 18 | - $url = $this->baseUrl . $path; |
|
| 18 | + $url = $this->baseUrl.$path; |
|
| 19 | 19 | |
| 20 | 20 | $ch = curl_init($url); |
| 21 | 21 | curl_setopt_array($ch, array( |
@@ -29,21 +29,21 @@ discard block |
||
| 29 | 29 | CURLOPT_POSTFIELDS => $payload |
| 30 | 30 | )); |
| 31 | 31 | } |
| 32 | - $cookie = 'PHPUNIT_RANDOM_TEST_ID=' . static::$randId; |
|
| 32 | + $cookie = 'PHPUNIT_RANDOM_TEST_ID='.static::$randId; |
|
| 33 | 33 | if ($this->collectCodeCoverageInformation) |
| 34 | 34 | { |
| 35 | - $cookie .= '; PHPUNIT_SELENIUM_TEST_ID=' . $this->testId; |
|
| 35 | + $cookie .= '; PHPUNIT_SELENIUM_TEST_ID='.$this->testId; |
|
| 36 | 36 | } |
| 37 | 37 | curl_setopt($ch, CURLOPT_COOKIE, $cookie); |
| 38 | 38 | |
| 39 | - if ($this->args['DEBUG'] > 0) { |
|
| 39 | + if ($this->args['DEBUG']>0) { |
|
| 40 | 40 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 41 | 41 | } |
| 42 | 42 | $page = curl_exec($ch); |
| 43 | 43 | $info = curl_getinfo($ch); |
| 44 | - if (PHP_MAJOR_VERSION < 8) curl_close($ch); |
|
| 44 | + if (PHP_MAJOR_VERSION<8) curl_close($ch); |
|
| 45 | 45 | |
| 46 | - $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']); |
|
| 46 | + $this->assertNotFalse($page, 'Curl request should not fail. Url: '.@$info['url'].', Http code: '.@$info['http_code']); |
|
| 47 | 47 | if (!$emptyPageOk) { |
| 48 | 48 | $this->assertNotEquals('', $page, 'Retrieved web page should not be empty'); |
| 49 | 49 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | protected function newClient($path) |
| 64 | 64 | { |
| 65 | - $client = new \PhpXmlRpc\Client($this->baseUrl . $path); |
|
| 65 | + $client = new \PhpXmlRpc\Client($this->baseUrl.$path); |
|
| 66 | 66 | $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId); |
| 67 | 67 | if ($this->collectCodeCoverageInformation) { |
| 68 | 68 | $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId); |
@@ -41,7 +41,9 @@ |
||
| 41 | 41 | } |
| 42 | 42 | $page = curl_exec($ch); |
| 43 | 43 | $info = curl_getinfo($ch); |
| 44 | - if (PHP_MAJOR_VERSION < 8) curl_close($ch); |
|
| 44 | + if (PHP_MAJOR_VERSION < 8) { |
|
| 45 | + curl_close($ch); |
|
| 46 | + } |
|
| 45 | 47 | |
| 46 | 48 | $this->assertNotFalse($page, 'Curl request should not fail. Url: ' . @$info['url'] . ', Http code: ' . @$info['http_code']); |
| 47 | 49 | if (!$emptyPageOk) { |
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | use PhpXmlRpc\Encoder; |
| 20 | 20 | |
| 21 | 21 | /// @todo allow autoloading when the library is installed as dependency |
| 22 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 22 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 23 | 23 | |
| 24 | -include __DIR__ . '/../tests/parse_args.php'; |
|
| 24 | +include __DIR__.'/../tests/parse_args.php'; |
|
| 25 | 25 | $args = argParser::getArgs(); |
| 26 | 26 | |
| 27 | 27 | function begin_test($test_name, $test_case) |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if (!isset($test_results[$test_name][$test_case])) { |
| 42 | 42 | trigger_error('ending test that was not started'); |
| 43 | 43 | } |
| 44 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 44 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 45 | 45 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 46 | 46 | echo '.'; |
| 47 | 47 | flush(); |
@@ -75,24 +75,24 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if ($is_web) { |
| 78 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 78 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 79 | 79 | if ($xd) { |
| 80 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 80 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 81 | 81 | } |
| 82 | 82 | flush(); |
| 83 | 83 | ob_flush(); |
| 84 | 84 | } else { |
| 85 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 85 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 86 | 86 | if ($xd) { |
| 87 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 87 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 92 | 92 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 93 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 93 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 94 | 94 | $vals = array(); |
| 95 | - for ($j = 0; $j < 10; $j++) { |
|
| 95 | + for ($j = 0; $j<10; $j++) { |
|
| 96 | 96 | $valArray = array(); |
| 97 | 97 | foreach ($data[$j] as $key => $val) { |
| 98 | 98 | $values = array(); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 119 | 119 | $encoder = new Encoder(); |
| 120 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 120 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 121 | 121 | $value = $encoder->encode($data, array('auto_dates')); |
| 122 | 122 | $out = $value->serialize(); |
| 123 | 123 | } |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | if (function_exists('xmlrpc_set_type')) { |
| 127 | 127 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 128 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 129 | - for ($j = 0; $j < 10; $j++) { |
|
| 128 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 129 | + for ($j = 0; $j<10; $j++) { |
|
| 130 | 130 | foreach ($keys as $k) { |
| 131 | 131 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 132 | 132 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -140,18 +140,18 @@ discard block |
||
| 140 | 140 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 141 | 141 | $dummy = new Request(''); |
| 142 | 142 | $out = new Response($data); |
| 143 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 143 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 144 | 144 | |
| 145 | 145 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 146 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 146 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 147 | 147 | $response = $dummy->parseResponse($in, true); |
| 148 | 148 | $value = $response->value(); |
| 149 | 149 | $result = array(); |
| 150 | - foreach($value as $val1) { |
|
| 150 | + foreach ($value as $val1) { |
|
| 151 | 151 | $out = array(); |
| 152 | - foreach($val1 as $name => $val) { |
|
| 152 | + foreach ($val1 as $name => $val) { |
|
| 153 | 153 | $out[$name] = array(); |
| 154 | - foreach($val as $data) { |
|
| 154 | + foreach ($val as $data) { |
|
| 155 | 155 | $out[$name][] = $data->scalarVal(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -161,18 +161,18 @@ discard block |
||
| 161 | 161 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 162 | 162 | |
| 163 | 163 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 164 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 164 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 165 | 165 | $response = $dummy->ParseResponse($in, true); |
| 166 | 166 | $value = $response->value(); |
| 167 | 167 | $result = array(); |
| 168 | 168 | $l = $value->arraySize(); |
| 169 | - for ($k = 0; $k < $l; $k++) { |
|
| 169 | + for ($k = 0; $k<$l; $k++) { |
|
| 170 | 170 | $val1 = $value->arrayMem($k); |
| 171 | 171 | $out = array(); |
| 172 | - foreach($val1 as $name => $val) { |
|
| 172 | + foreach ($val1 as $name => $val) { |
|
| 173 | 173 | $out[$name] = array(); |
| 174 | 174 | $m = $val->arraySize(); |
| 175 | - for ($j = 0; $j < $m; $j++) { |
|
| 175 | + for ($j = 0; $j<$m; $j++) { |
|
| 176 | 176 | $data = $val->arrayMem($j); |
| 177 | 177 | $out[$name][] = $data->scalarVal(); |
| 178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 184 | 184 | |
| 185 | 185 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 186 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 186 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 187 | 187 | $response = $dummy->parseResponse($in, true, 'phpvals'); |
| 188 | 188 | $value = $response->value(); |
| 189 | 189 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | if (function_exists('xmlrpc_decode')) { |
| 193 | 193 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 194 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 194 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 195 | 195 | $response = $dummy->parseResponse($in, true, 'xml'); |
| 196 | 196 | $value = xmlrpc_decode($response->value()); |
| 197 | 197 | } |
@@ -208,16 +208,16 @@ discard block |
||
| 208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
| 209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 210 | 210 | $reqs = array(); |
| 211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 212 | 212 | $reqs[] = $req; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | $server = explode(':', $args['HTTPSERVER']); |
| 216 | - if (count($server) > 1) { |
|
| 217 | - $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI']; |
|
| 216 | + if (count($server)>1) { |
|
| 217 | + $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI']; |
|
| 218 | 218 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
| 219 | 219 | } else { |
| 220 | - $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI']; |
|
| 220 | + $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI']; |
|
| 221 | 221 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | begin_test($testName, 'http 10'); |
| 231 | 231 | $response = array(); |
| 232 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 232 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 233 | 233 | $resp = $c->send($req); |
| 234 | 234 | $response[] = $resp->value(); |
| 235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 240 | 240 | begin_test($testName, 'http 11 no keepalive'); |
| 241 | 241 | $response = array(); |
| 242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 243 | 243 | $resp = $c->send($req, 10, 'http11'); |
| 244 | 244 | $response[] = $resp->value(); |
| 245 | 245 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | begin_test($testName, 'http 11 w. keep-alive'); |
| 249 | 249 | $response = array(); |
| 250 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 250 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 251 | 251 | $resp = $c->send($req, 10, 'http11'); |
| 252 | 252 | $response[] = $resp->value(); |
| 253 | 253 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | begin_test($testName, 'http 10 w. compression'); |
| 271 | 271 | $response = array(); |
| 272 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 272 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 273 | 273 | $resp = $c->send($req); |
| 274 | 274 | $response[] = $resp->value(); |
| 275 | 275 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 280 | 280 | begin_test($testName, 'http 11 w. compression and no keepalive'); |
| 281 | 281 | $response = array(); |
| 282 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 282 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 283 | 283 | $resp = $c->send($req, 10, 'http11'); |
| 284 | 284 | $response[] = $resp->value(); |
| 285 | 285 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 289 | 289 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 290 | 290 | $response = array(); |
| 291 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 291 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 292 | 292 | $resp = $c->send($req, 10, 'http11'); |
| 293 | 293 | $response[] = $resp->value(); |
| 294 | 294 | } |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | /// test multicall vs. many calls vs. keep-alives - HTTPS |
| 310 | 310 | |
| 311 | 311 | $server = explode(':', $args['HTTPSSERVER']); |
| 312 | - if (count($server) > 1) { |
|
| 313 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 312 | + if (count($server)>1) { |
|
| 313 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 314 | 314 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 315 | 315 | } else { |
| 316 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 316 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 317 | 317 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https'); |
| 318 | 318 | } |
| 319 | 319 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 328 | 328 | begin_test($testName, 'https no keep-alive'); |
| 329 | 329 | $response = array(); |
| 330 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 330 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 331 | 331 | $resp = $c->send($req); |
| 332 | 332 | $response[] = $resp->value(); |
| 333 | 333 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 337 | 337 | begin_test($testName, 'https w. keep-alive'); |
| 338 | 338 | $response = array(); |
| 339 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 339 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 340 | 340 | $resp = $c->send($req, 10); |
| 341 | 341 | $response[] = $resp->value(); |
| 342 | 342 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 358 | 358 | begin_test($testName, 'https w. compression and no keepalive'); |
| 359 | 359 | $response = array(); |
| 360 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 360 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 361 | 361 | $resp = $c->send($req); |
| 362 | 362 | $response[] = $resp->value(); |
| 363 | 363 | } |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 367 | 367 | begin_test($testName, 'https w. keep-alive and compression'); |
| 368 | 368 | $response = array(); |
| 369 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 369 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 370 | 370 | $resp = $c->send($req, 10); |
| 371 | 371 | $response[] = $resp->value(); |
| 372 | 372 | } |
@@ -387,11 +387,11 @@ discard block |
||
| 387 | 387 | /// test multicall vs. many calls vs. keep-alives - HTTP/2 |
| 388 | 388 | |
| 389 | 389 | $server = explode(':', $args['HTTPSSERVER']); |
| 390 | - if (count($server) > 1) { |
|
| 391 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 390 | + if (count($server)>1) { |
|
| 391 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 392 | 392 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 393 | 393 | } else { |
| 394 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 394 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 395 | 395 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2'); |
| 396 | 396 | } |
| 397 | 397 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 406 | 406 | begin_test($testName, 'http2 no keep-alive'); |
| 407 | 407 | $response = array(); |
| 408 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 408 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 409 | 409 | $resp = $c->send($req); |
| 410 | 410 | $response[] = $resp->value(); |
| 411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 415 | 415 | begin_test($testName, 'http2 w. keep-alive'); |
| 416 | 416 | $response = array(); |
| 417 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 417 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 418 | 418 | $resp = $c->send($req, 10); |
| 419 | 419 | $response[] = $resp->value(); |
| 420 | 420 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 436 | 436 | begin_test($testName, 'http2 w. compression and no keepalive'); |
| 437 | 437 | $response = array(); |
| 438 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 438 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 439 | 439 | $resp = $c->send($req); |
| 440 | 440 | $response[] = $resp->value(); |
| 441 | 441 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 445 | 445 | begin_test($testName, 'http2 w. keep-alive and compression'); |
| 446 | 446 | $response = array(); |
| 447 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 447 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 448 | 448 | $resp = $c->send($req, 10); |
| 449 | 449 | $response[] = $resp->value(); |
| 450 | 450 | } |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | foreach ($test_results as $test => $results) { |
| 467 | 467 | echo "\nTEST: $test\n"; |
| 468 | 468 | foreach ($results as $case => $data) { |
| 469 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 469 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 79 | 79 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 80 | 80 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 81 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 81 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -165,34 +165,34 @@ discard block |
||
| 165 | 165 | public function serialize($charsetEncoding = '') |
| 166 | 166 | { |
| 167 | 167 | if ($charsetEncoding != '') { |
| 168 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 168 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 169 | 169 | } else { |
| 170 | 170 | $this->content_type = 'text/xml'; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 174 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 174 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 175 | 175 | } else { |
| 176 | 176 | $result = "<methodResponse>\n"; |
| 177 | 177 | } |
| 178 | 178 | if ($this->errno) { |
| 179 | 179 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 180 | - $result .= "<fault>\n" . |
|
| 181 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 182 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 183 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 180 | + $result .= "<fault>\n". |
|
| 181 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 182 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 183 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 184 | 184 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 185 | 185 | } else { |
| 186 | 186 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 187 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 187 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 188 | 188 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 189 | - $result .= "<params>\n<param>\n" . |
|
| 190 | - $this->val . |
|
| 189 | + $result .= "<params>\n<param>\n". |
|
| 190 | + $this->val. |
|
| 191 | 191 | "</param>\n</params>"; |
| 192 | 192 | } else if ($this->valtyp == 'phpvals') { |
| 193 | 193 | $encoder = new Encoder(); |
| 194 | 194 | $val = $encoder->encode($this->val); |
| 195 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 195 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 196 | 196 | } else { |
| 197 | 197 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 198 | 198 | } |
@@ -211,9 +211,9 @@ discard block |
||
| 211 | 211 | public function xml_header($charsetEncoding = '') |
| 212 | 212 | { |
| 213 | 213 | if ($charsetEncoding != '') { |
| 214 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 214 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 215 | 215 | } else { |
| 216 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 216 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | case 'errstr': |
| 230 | 230 | case 'payload': |
| 231 | 231 | case 'content_type': |
| 232 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 232 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 233 | 233 | return $this->$name; |
| 234 | 234 | case 'hdrs': |
| 235 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 235 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 236 | 236 | return $this->httpResponse['headers']; |
| 237 | 237 | case '_cookies': |
| 238 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 238 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 239 | 239 | return $this->httpResponse['cookies']; |
| 240 | 240 | case 'raw_data': |
| 241 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 241 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 242 | 242 | return $this->httpResponse['raw_data']; |
| 243 | 243 | default: |
| 244 | 244 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 245 | 245 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 246 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 246 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 247 | 247 | $result = null; |
| 248 | 248 | return $result; |
| 249 | 249 | } |
@@ -258,25 +258,25 @@ discard block |
||
| 258 | 258 | case 'errstr': |
| 259 | 259 | case 'payload': |
| 260 | 260 | case 'content_type': |
| 261 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 261 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 262 | 262 | $this->$name = $value; |
| 263 | 263 | break; |
| 264 | 264 | case 'hdrs': |
| 265 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 265 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 266 | 266 | $this->httpResponse['headers'] = $value; |
| 267 | 267 | break; |
| 268 | 268 | case '_cookies': |
| 269 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 269 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 270 | 270 | $this->httpResponse['cookies'] = $value; |
| 271 | 271 | break; |
| 272 | 272 | case 'raw_data': |
| 273 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 273 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 274 | 274 | $this->httpResponse['raw_data'] = $value; |
| 275 | 275 | break; |
| 276 | 276 | default: |
| 277 | 277 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 278 | 278 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 279 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 279 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | case 'errstr': |
| 290 | 290 | case 'payload': |
| 291 | 291 | case 'content_type': |
| 292 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 292 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 293 | 293 | return isset($this->$name); |
| 294 | 294 | case 'hdrs': |
| 295 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 295 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 296 | 296 | return isset($this->httpResponse['headers']); |
| 297 | 297 | case '_cookies': |
| 298 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 298 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 299 | 299 | return isset($this->httpResponse['cookies']); |
| 300 | 300 | case 'raw_data': |
| 301 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 301 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 302 | 302 | return isset($this->httpResponse['raw_data']); |
| 303 | 303 | default: |
| 304 | 304 | return false; |
@@ -314,25 +314,25 @@ discard block |
||
| 314 | 314 | case 'errstr': |
| 315 | 315 | case 'payload': |
| 316 | 316 | case 'content_type': |
| 317 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 317 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 318 | 318 | unset($this->$name); |
| 319 | 319 | break; |
| 320 | 320 | case 'hdrs': |
| 321 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 321 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 322 | 322 | unset($this->httpResponse['headers']); |
| 323 | 323 | break; |
| 324 | 324 | case '_cookies': |
| 325 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 325 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 326 | 326 | unset($this->httpResponse['cookies']); |
| 327 | 327 | break; |
| 328 | 328 | case 'raw_data': |
| 329 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 329 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 330 | 330 | unset($this->httpResponse['raw_data']); |
| 331 | 331 | break; |
| 332 | 332 | default: |
| 333 | 333 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 334 | 334 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 335 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 335 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | } |
