@@ -155,35 +155,35 @@ discard block |
||
155 | 155 | public function serialize($charsetEncoding = '') |
156 | 156 | { |
157 | 157 | if ($charsetEncoding != '') { |
158 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
158 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
159 | 159 | } else { |
160 | 160 | $this->content_type = 'text/xml'; |
161 | 161 | } |
162 | 162 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
163 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
163 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
164 | 164 | } else { |
165 | 165 | $result = "<methodResponse>\n"; |
166 | 166 | } |
167 | 167 | if ($this->errno) { |
168 | 168 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
169 | - $result .= "<fault>\n" . |
|
170 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
171 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
172 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
169 | + $result .= "<fault>\n". |
|
170 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
171 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
172 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
173 | 173 | "</struct>\n</value>\n</fault>"; |
174 | 174 | } else { |
175 | 175 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
176 | 176 | if (is_string($this->val) && $this->valtyp == 'xml') { |
177 | - $result .= "<params>\n<param>\n" . |
|
178 | - $this->val . |
|
177 | + $result .= "<params>\n<param>\n". |
|
178 | + $this->val. |
|
179 | 179 | "</param>\n</params>"; |
180 | 180 | } else { |
181 | 181 | /// @todo try to build something serializable using the Encoder... |
182 | 182 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
183 | 183 | } |
184 | 184 | } else { |
185 | - $result .= "<params>\n<param>\n" . |
|
186 | - $this->val->serialize($charsetEncoding) . |
|
185 | + $result .= "<params>\n<param>\n". |
|
186 | + $this->val->serialize($charsetEncoding). |
|
187 | 187 | "</param>\n</params>"; |
188 | 188 | } |
189 | 189 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | return $this->httpResponse['raw_data']; |
209 | 209 | default: |
210 | 210 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
211 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
211 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
212 | 212 | return null; |
213 | 213 | } |
214 | 214 | } |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | break; |
230 | 230 | default: |
231 | 231 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
232 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
232 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
233 | 233 | } |
234 | 234 | } |
235 | 235 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | break; |
264 | 264 | default: |
265 | 265 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
266 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
266 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
267 | 267 | } |
268 | 268 | } |
269 | 269 | } |
@@ -173,12 +173,12 @@ discard block |
||
173 | 173 | |
174 | 174 | foreach ($mergedOptions as $key => $val) { |
175 | 175 | if (is_string($key) && !ctype_digit($key)) { |
176 | - switch($key) { |
|
176 | + switch ($key) { |
|
177 | 177 | case 'target_charset': |
178 | 178 | if (function_exists('mb_convert_encoding')) { |
179 | 179 | $this->current_parsing_options['target_charset'] = $val; |
180 | 180 | } else { |
181 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": 'target_charset' option is unsupported without mbstring"); |
|
181 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": 'target_charset' option is unsupported without mbstring"); |
|
182 | 182 | } |
183 | 183 | break; |
184 | 184 | |
@@ -189,12 +189,12 @@ discard block |
||
189 | 189 | //$this->_xh['isf'] = 4; |
190 | 190 | //$this->_xh['isf_reason'] = "Callback passed as 'methodname_callback' is not callable"; |
191 | 191 | //return; |
192 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": Callback passed as 'methodname_callback' is not callable"); |
|
192 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": Callback passed as 'methodname_callback' is not callable"); |
|
193 | 193 | } |
194 | 194 | break; |
195 | 195 | |
196 | 196 | default: |
197 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": unsupported option: $key"); |
|
197 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": unsupported option: $key"); |
|
198 | 198 | } |
199 | 199 | unset($mergedOptions[$key]); |
200 | 200 | } |
@@ -230,10 +230,10 @@ discard block |
||
230 | 230 | |
231 | 231 | try { |
232 | 232 | // @see ticket #70 - we have to parse big xml docs in chunks to avoid errors |
233 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
233 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
234 | 234 | $chunk = substr($data, $offset, $this->maxChunkLength); |
235 | 235 | // error handling: xml not well formed |
236 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
236 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
237 | 237 | $errCode = xml_get_error_code($parser); |
238 | 238 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
239 | 239 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | break; |
244 | 244 | } |
245 | 245 | // no need to parse further if we already have a fatal error |
246 | - if ($this->_xh['isf'] >= 2) { |
|
246 | + if ($this->_xh['isf']>=2) { |
|
247 | 247 | break; |
248 | 248 | } |
249 | 249 | } |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
276 | 276 | { |
277 | 277 | // if invalid xmlrpc already detected, skip all processing |
278 | - if ($this->_xh['isf'] >= 2) { |
|
278 | + if ($this->_xh['isf']>=2) { |
|
279 | 279 | return; |
280 | 280 | } |
281 | 281 | |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | $this->_xh['rt'] = strtolower($name); |
299 | 299 | } else { |
300 | 300 | $this->_xh['isf'] = 2; |
301 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
301 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
302 | 302 | |
303 | 303 | return; |
304 | 304 | } |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | |
401 | 401 | case 'MEMBER': |
402 | 402 | // set member name to null, in case we do not find in the xml later on |
403 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; |
|
403 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; |
|
404 | 404 | //$this->_xh['ac']=''; |
405 | 405 | // Drop trough intentionally |
406 | 406 | |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | */ |
473 | 473 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
474 | 474 | { |
475 | - if ($this->_xh['isf'] >= 2) { |
|
475 | + if ($this->_xh['isf']>=2) { |
|
476 | 476 | return; |
477 | 477 | |
478 | 478 | } |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | $this->_xh['value'] = mb_convert_encoding($this->_xh['value'], $this->current_parsing_options['target_charset'], 'UTF-8'); |
495 | 495 | } |
496 | 496 | |
497 | - if ($rebuildXmlrpcvals > 0) { |
|
497 | + if ($rebuildXmlrpcvals>0) { |
|
498 | 498 | // build the xmlrpc val out of the data received, and substitute it |
499 | 499 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
500 | 500 | // in case we got info about underlying php class, save it in the object we're rebuilding |
@@ -502,15 +502,15 @@ discard block |
||
502 | 502 | $temp->_php_class = $this->_xh['php_class']; |
503 | 503 | } |
504 | 504 | $this->_xh['value'] = $temp; |
505 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
505 | + } elseif ($rebuildXmlrpcvals<0) { |
|
506 | 506 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
507 | - $this->_xh['value'] = (object)array( |
|
507 | + $this->_xh['value'] = (object) array( |
|
508 | 508 | 'xmlrpc_type' => 'datetime', |
509 | 509 | 'scalar' => $this->_xh['value'], |
510 | 510 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
511 | 511 | ); |
512 | 512 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
513 | - $this->_xh['value'] = (object)array( |
|
513 | + $this->_xh['value'] = (object) array( |
|
514 | 514 | 'xmlrpc_type' => 'base64', |
515 | 515 | 'scalar' => $this->_xh['value'] |
516 | 516 | ); |
@@ -525,8 +525,8 @@ discard block |
||
525 | 525 | // check if we are inside an array or struct: |
526 | 526 | // if value just built is inside an array, let's move it into array on the stack |
527 | 527 | $vscount = count($this->_xh['valuestack']); |
528 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
529 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
528 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
529 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
530 | 530 | } |
531 | 531 | break; |
532 | 532 | |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | $this->_xh['value'] = $this->_xh['ac']; |
547 | 547 | } elseif ($name == 'DATETIME.ISO8601') { |
548 | 548 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
549 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
549 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
550 | 550 | } |
551 | 551 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
552 | 552 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | } else { |
564 | 564 | // log if receiving something strange, even though we set the value to false anyway |
565 | 565 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
566 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
566 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
567 | 567 | } |
568 | 568 | $this->_xh['value'] = false; |
569 | 569 | } |
@@ -573,38 +573,38 @@ discard block |
||
573 | 573 | // NOTE: regexp could be much stricter than this... |
574 | 574 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
575 | 575 | /// @todo: find a better way of throwing an error than this! |
576 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
576 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
577 | 577 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
578 | 578 | } else { |
579 | 579 | // it's ok, add it on |
580 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
580 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
581 | 581 | } |
582 | 582 | } else { |
583 | 583 | // we have an I4/I8/INT |
584 | 584 | // we must check that only 0123456789-<space> are characters here |
585 | 585 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
586 | 586 | /// @todo find a better way of throwing an error than this! |
587 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
587 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
588 | 588 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
589 | 589 | } else { |
590 | 590 | // it's ok, add it on |
591 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
591 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
592 | 592 | } |
593 | 593 | } |
594 | 594 | $this->_xh['lv'] = 3; // indicate we've found a value |
595 | 595 | break; |
596 | 596 | |
597 | 597 | case 'NAME': |
598 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
598 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
599 | 599 | break; |
600 | 600 | |
601 | 601 | case 'MEMBER': |
602 | 602 | // add to array in the stack the last element built, unless no VALUE was found |
603 | 603 | if ($this->_xh['vt']) { |
604 | 604 | $vscount = count($this->_xh['valuestack']); |
605 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
605 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
606 | 606 | } else { |
607 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
607 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
608 | 608 | } |
609 | 609 | break; |
610 | 610 | |
@@ -629,7 +629,7 @@ discard block |
||
629 | 629 | $this->_xh['params'][] = $this->_xh['value']; |
630 | 630 | $this->_xh['pt'][] = $this->_xh['vt']; |
631 | 631 | } else { |
632 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
632 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
633 | 633 | } |
634 | 634 | break; |
635 | 635 | |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | public function xmlrpc_cd($parser, $data) |
705 | 705 | { |
706 | 706 | // skip processing if xml fault already detected |
707 | - if ($this->_xh['isf'] >= 2) { |
|
707 | + if ($this->_xh['isf']>=2) { |
|
708 | 708 | return; |
709 | 709 | } |
710 | 710 | |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | public function xmlrpc_dh($parser, $data) |
727 | 727 | { |
728 | 728 | // skip processing if xml fault already detected |
729 | - if ($this->_xh['isf'] >= 2) { |
|
729 | + if ($this->_xh['isf']>=2) { |
|
730 | 730 | return; |
731 | 731 | } |
732 | 732 | |
@@ -800,8 +800,8 @@ discard block |
||
800 | 800 | // Details: |
801 | 801 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
802 | 802 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
803 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
804 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
803 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
804 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
805 | 805 | $xmlChunk, $matches)) { |
806 | 806 | return strtoupper(substr($matches[2], 1, -1)); |
807 | 807 | } |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
820 | 820 | // IANA also likes better US-ASCII, so go with it |
821 | 821 | if ($enc == 'ASCII') { |
822 | - $enc = 'US-' . $enc; |
|
822 | + $enc = 'US-'.$enc; |
|
823 | 823 | } |
824 | 824 | |
825 | 825 | return $enc; |
@@ -856,8 +856,8 @@ discard block |
||
856 | 856 | // Details: |
857 | 857 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
858 | 858 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
859 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
860 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
859 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
860 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
861 | 861 | $xmlChunk, $matches)) { |
862 | 862 | return true; |
863 | 863 | } |
@@ -877,7 +877,7 @@ discard block |
||
877 | 877 | break; |
878 | 878 | default: |
879 | 879 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
880 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
880 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
881 | 881 | } |
882 | 882 | } |
883 | 883 | |
@@ -901,7 +901,7 @@ discard block |
||
901 | 901 | break; |
902 | 902 | default: |
903 | 903 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
904 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
904 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
905 | 905 | } |
906 | 906 | } |
907 | 907 | } |