@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | use \PhpXmlRpc\Request; |
6 | 6 | |
@@ -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 | } |
109 | 109 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | public function testUnicodeInMemberName() |
179 | 179 | { |
180 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
180 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
181 | 181 | $v = array($str => new xmlrpcval(1)); |
182 | 182 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
183 | 183 | $r = $r->serialize(); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $response = @utf8_encode( |
194 | 194 | '<?xml version="1.0"?> |
195 | 195 | <!-- covers what happens when lib receives UTF8 chars in response text and comments --> |
196 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
196 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
197 | 197 | <methodResponse> |
198 | 198 | <fault> |
199 | 199 | <value> |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | </member> |
205 | 205 | <member> |
206 | 206 | <name>faultString</name> |
207 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
207 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
208 | 208 | </member> |
209 | 209 | </struct> |
210 | 210 | </value> |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | $m = $this->newRequest('dummy'); |
214 | 214 | $r = $m->parseResponse($response); |
215 | 215 | $v = $r->faultString(); |
216 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
216 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | public function testBrokenRequests() |
@@ -470,8 +470,8 @@ discard block |
||
470 | 470 | $i = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values; |
471 | 471 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_reject_invalid_values = true; |
472 | 472 | |
473 | - foreach($values as $value) { |
|
474 | - $f = '<?xml version="1.0"?><methodResponse><params><param><value>' . $value . '</value></param></params></methodResponse> '; |
|
473 | + foreach ($values as $value) { |
|
474 | + $f = '<?xml version="1.0"?><methodResponse><params><param><value>'.$value.'</value></param></params></methodResponse> '; |
|
475 | 475 | $r = $s->parseResponse($f); |
476 | 476 | $v = $r->faultCode(); |
477 | 477 | $this->assertEquals(2, $v, "Testing $value"); |
@@ -576,11 +576,11 @@ discard block |
||
576 | 576 | |
577 | 577 | public function testUTF8Response() |
578 | 578 | { |
579 | - $string = chr(224) . chr(252) . chr(232); |
|
579 | + $string = chr(224).chr(252).chr(232); |
|
580 | 580 | |
581 | 581 | $s = $this->newRequest('dummy'); |
582 | - $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> |
|
583 | -<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> |
|
582 | + $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> |
|
583 | +<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> |
|
584 | 584 | '; |
585 | 585 | $r = $s->parseResponse($f, false, 'phpvals'); |
586 | 586 | $v = $r->value(); |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | $this->assertEquals($string, $v); |
589 | 589 | |
590 | 590 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
591 | -<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> |
|
591 | +<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> |
|
592 | 592 | '; |
593 | 593 | $r = $s->parseResponse($f, false, 'phpvals'); |
594 | 594 | $v = $r->value(); |
@@ -604,11 +604,11 @@ discard block |
||
604 | 604 | |
605 | 605 | public function testLatin1Response() |
606 | 606 | { |
607 | - $string = chr(224) . chr(252) . chr(232); |
|
607 | + $string = chr(224).chr(252).chr(232); |
|
608 | 608 | |
609 | 609 | $s = $this->newRequest('dummy'); |
610 | - $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> |
|
611 | -<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> |
|
610 | + $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> |
|
611 | +<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> |
|
612 | 612 | '; |
613 | 613 | $r = $s->parseResponse($f, false, 'phpvals'); |
614 | 614 | $v = $r->value(); |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | $this->assertEquals($string, $v); |
617 | 617 | |
618 | 618 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
619 | -<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> |
|
619 | +<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> |
|
620 | 620 | '; |
621 | 621 | $r = $s->parseResponse($f, false, 'phpvals'); |
622 | 622 | $v = $r->value(); |
@@ -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 | use PhpXmlRpc\Client; |
6 | 6 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $this->client->server .= 'XXX'; |
65 | 65 | $dnsinfo = @dns_get_record($this->client->server); |
66 | 66 | if ($dnsinfo) { |
67 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
67 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
68 | 68 | } else { |
69 | 69 | $m = new xmlrpcmsg('examples.echo', array( |
70 | 70 | new xmlrpcval('hello', 'string'), |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | // now test a successful connection |
95 | 95 | $server = explode(':', $this->args['HTTPSERVER']); |
96 | - if (count($server) > 1) { |
|
96 | + if (count($server)>1) { |
|
97 | 97 | $this->client->port = $server[1]; |
98 | 98 | } |
99 | 99 | $this->client->server = $server[0]; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | use PhpXmlRpc\Encoder; |
6 | 6 | use PhpXmlRpc\Helper\XMLParser; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | if (version_compare(PHP_VERSION, '8.0', '>=')) { |
144 | 144 | $str = sprintf("%f", $v->scalarval()); |
145 | 145 | } else { |
146 | - $str = (string)$v->scalarval(); |
|
146 | + $str = (string) $v->scalarval(); |
|
147 | 147 | } |
148 | 148 | if (strpos($str, ',') == 1) { |
149 | 149 | $r = $v->serialize(); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $this->assertequals(1, count($v1)); |
165 | 165 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
166 | 166 | |
167 | - foreach($v1 as $key => $val) |
|
167 | + foreach ($v1 as $key => $val) |
|
168 | 168 | { |
169 | 169 | $this->assertArrayHasKey($key, $out); |
170 | 170 | $expected = $out[$key]; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $this->assertequals(2, count($v2)); |
180 | 180 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
181 | 181 | $i = 0; |
182 | - foreach($v2 as $key => $val) |
|
182 | + foreach ($v2 as $key => $val) |
|
183 | 183 | { |
184 | 184 | $expected = $out[$i]; |
185 | 185 | $this->assertequals($expected['key'], $key); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | { |
207 | 207 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
208 | 208 | $data = array(); |
209 | - for ($i = 0; $i < 500000; $i++ ) { |
|
209 | + for ($i = 0; $i<500000; $i++) { |
|
210 | 210 | $data[] = 'hello world'; |
211 | 211 | } |
212 | 212 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
4 | 4 | |
5 | 5 | use PhpXmlRpc\Response; |
6 | 6 |
@@ -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($value); |
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 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | return true; |
86 | 86 | } else { |
87 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value'); |
|
87 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value'); |
|
88 | 88 | return false; |
89 | 89 | } |
90 | 90 | } |
@@ -134,17 +134,17 @@ discard block |
||
134 | 134 | $this->logDeprecationUnlessCalledBy('serialize'); |
135 | 135 | |
136 | 136 | if ($charsetEncoding != '') { |
137 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
137 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
138 | 138 | } else { |
139 | 139 | $this->content_type = 'text/xml'; |
140 | 140 | } |
141 | 141 | |
142 | 142 | $result = $this->xml_header($charsetEncoding); |
143 | - $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
144 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
143 | + $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
144 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
145 | 145 | $result .= "<params>\n"; |
146 | 146 | foreach ($this->params as $p) { |
147 | - $result .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
147 | + $result .= "<param>\n".$p->serialize($charsetEncoding). |
|
148 | 148 | "</param>\n"; |
149 | 149 | } |
150 | 150 | $result .= "</params>\n"; |
@@ -164,9 +164,9 @@ discard block |
||
164 | 164 | $this->logDeprecationUnlessCalledBy('createPayload'); |
165 | 165 | |
166 | 166 | if ($charsetEncoding != '') { |
167 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
167 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
168 | 168 | } else { |
169 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
169 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | */ |
229 | 229 | public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS) |
230 | 230 | { |
231 | - if ($this->debug > 0) { |
|
231 | + if ($this->debug>0) { |
|
232 | 232 | $this->getLogger()->debug("---GOT---\n$data\n---END---"); |
233 | 233 | } |
234 | 234 | |
235 | 235 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
236 | 236 | |
237 | 237 | if ($data == '') { |
238 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
238 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
239 | 239 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
240 | 240 | } |
241 | 241 | |
@@ -243,12 +243,12 @@ discard block |
||
243 | 243 | if (substr($data, 0, 4) == 'HTTP') { |
244 | 244 | $httpParser = new Http(); |
245 | 245 | try { |
246 | - $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0); |
|
246 | + $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0); |
|
247 | 247 | } catch (HttpException $e) { |
248 | 248 | // failed processing of HTTP response headers |
249 | 249 | // save into response obj the full payload received, for debugging |
250 | 250 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code' => $e->statusCode())); |
251 | - } catch(\Exception $e) { |
|
251 | + } catch (\Exception $e) { |
|
252 | 252 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
253 | 253 | } |
254 | 254 | } else { |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | // idea from Luca Mariano, originally in PEARified version of the lib |
265 | 265 | $pos = strrpos($data, '</methodResponse>'); |
266 | 266 | if ($pos !== false) { |
267 | - $data = substr($data, 0, $pos + 17); |
|
267 | + $data = substr($data, 0, $pos+17); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | // try to 'guestimate' the character encoding of the received response |
@@ -273,21 +273,21 @@ discard block |
||
273 | 273 | $data |
274 | 274 | ); |
275 | 275 | |
276 | - if ($this->debug >= 0) { |
|
276 | + if ($this->debug>=0) { |
|
277 | 277 | $this->httpResponse = $httpResponse; |
278 | 278 | } else { |
279 | 279 | $httpResponse = null; |
280 | 280 | } |
281 | 281 | |
282 | - if ($this->debug > 0) { |
|
282 | + if ($this->debug>0) { |
|
283 | 283 | $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
284 | 284 | if ($start) { |
285 | 285 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
286 | 286 | /// @todo what if there is no end tag? |
287 | 287 | $end = strpos($data, '-->', $start); |
288 | - $comments = substr($data, $start, $end - $start); |
|
289 | - $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" . |
|
290 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding)); |
|
288 | + $comments = substr($data, $start, $end-$start); |
|
289 | + $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t". |
|
290 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding)); |
|
291 | 291 | } |
292 | 292 | } |
293 | 293 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | if ($respEncoding == 'ISO-8859-1') { |
310 | 310 | $data = utf8_encode($data); |
311 | 311 | } else { |
312 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding); |
|
312 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding); |
|
313 | 313 | } |
314 | 314 | } |
315 | 315 | } |
@@ -339,16 +339,16 @@ discard block |
||
339 | 339 | // there could be proxies meddling with the request, or network data corruption... |
340 | 340 | |
341 | 341 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
342 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
342 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
343 | 343 | |
344 | - if ($this->debug > 0) { |
|
344 | + if ($this->debug>0) { |
|
345 | 345 | $this->getLogger()->debug($_xh['isf_reason']); |
346 | 346 | } |
347 | 347 | } |
348 | 348 | // second error check: xml well-formed but not xml-rpc compliant |
349 | 349 | elseif ($_xh['isf'] == 2) { |
350 | 350 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
351 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
351 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
352 | 352 | |
353 | 353 | /// @todo echo something for the user? check if it was already done by the parser... |
354 | 354 | //if ($this->debug > 0) { |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | // third error check: parsing of the response has somehow gone boink. |
359 | 359 | /// @todo shall we omit the 2nd part of this check, since we trust the parsing code? |
360 | 360 | /// Either that, or check the fault results too... |
361 | - elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
361 | + elseif ($_xh['isf']>3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
362 | 362 | // something odd has happened and it's time to generate a client side error indicating something odd went on |
363 | 363 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'], |
364 | 364 | '', $httpResponse |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | |
367 | 367 | /// @todo echo something for the user? |
368 | 368 | } else { |
369 | - if ($this->debug > 1) { |
|
369 | + if ($this->debug>1) { |
|
370 | 370 | $this->getLogger()->debug( |
371 | 371 | "---PARSED---\n".var_export($_xh['value'], true)."\n---END---" |
372 | 372 | ); |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | if ($errNo == 0) { |
391 | 391 | // FAULT returned, errno needs to reflect that |
392 | 392 | /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr |
393 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1'); |
|
393 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1'); |
|
394 | 394 | /// @todo in Encoder::decodeXML, we use PhpXmlRpc::$xmlrpcerr['invalid_return'] for this case (see |
395 | 395 | /// also the todo 17 lines above) |
396 | 396 | $errNo = -1; |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | case '_php_class': |
439 | 439 | case 'payload': |
440 | 440 | case 'content_type': |
441 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
441 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
442 | 442 | return $this->$name; |
443 | 443 | case 'httpResponse': |
444 | 444 | // manually implement the 'protected property' behaviour |
@@ -450,16 +450,16 @@ discard block |
||
450 | 450 | } |
451 | 451 | } |
452 | 452 | if ($canAccess) { |
453 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
453 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
454 | 454 | return $this->httpResponse; |
455 | 455 | } else { |
456 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
456 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
457 | 457 | } |
458 | 458 | break; |
459 | 459 | default: |
460 | 460 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
461 | 461 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
462 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
462 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
463 | 463 | $result = null; |
464 | 464 | return $result; |
465 | 465 | } |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | case 'debug': |
474 | 474 | case 'payload': |
475 | 475 | case 'content_type': |
476 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
476 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
477 | 477 | $this->$name = $value; |
478 | 478 | break; |
479 | 479 | case 'httpResponse': |
@@ -486,16 +486,16 @@ discard block |
||
486 | 486 | } |
487 | 487 | } |
488 | 488 | if ($canAccess) { |
489 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
489 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
490 | 490 | $this->httpResponse = $value; |
491 | 491 | } else { |
492 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
492 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
493 | 493 | } |
494 | 494 | break; |
495 | 495 | default: |
496 | 496 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
497 | 497 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
498 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
498 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
499 | 499 | } |
500 | 500 | } |
501 | 501 | |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | case 'debug': |
508 | 508 | case 'payload': |
509 | 509 | case 'content_type': |
510 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
510 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
511 | 511 | return isset($this->$name); |
512 | 512 | case 'httpResponse': |
513 | 513 | // manually implement the 'protected property' behaviour |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | } |
520 | 520 | } |
521 | 521 | if ($canAccess) { |
522 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
522 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
523 | 523 | return isset($this->httpResponse); |
524 | 524 | } |
525 | 525 | // break through voluntarily |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | case 'debug': |
537 | 537 | case 'payload': |
538 | 538 | case 'content_type': |
539 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
539 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
540 | 540 | unset($this->$name); |
541 | 541 | break; |
542 | 542 | case 'httpResponse': |
@@ -549,16 +549,16 @@ discard block |
||
549 | 549 | } |
550 | 550 | } |
551 | 551 | if ($canAccess) { |
552 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
552 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
553 | 553 | unset($this->httpResponse); |
554 | 554 | } else { |
555 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
555 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
556 | 556 | } |
557 | 557 | break; |
558 | 558 | default: |
559 | 559 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
560 | 560 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
561 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
561 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
562 | 562 | } |
563 | 563 | } |
564 | 564 | } |