@@ -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 | } |