@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @author JoakimLofgren |
|
4 | - */ |
|
3 | + * @author JoakimLofgren |
|
4 | + */ |
|
5 | 5 | |
6 | 6 | use PhpXmlRpc\Helper\Charset; |
7 | 7 |
@@ -26,10 +26,10 @@ |
||
26 | 26 | { |
27 | 27 | // construct a latin string with all chars (except control ones) |
28 | 28 | $this->latinString = "\n\r\t"; |
29 | - for($i = 32; $i < 127; $i++) { |
|
29 | + for ($i = 32; $i<127; $i++) { |
|
30 | 30 | $this->latinString .= chr($i); |
31 | 31 | } |
32 | - for($i = 160; $i < 256; $i++) { |
|
32 | + for ($i = 160; $i<256; $i++) { |
|
33 | 33 | $this->latinString .= chr($i); |
34 | 34 | } |
35 | 35 | } |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | |
53 | 53 | private function __construct() |
54 | 54 | { |
55 | - for ($i = 0; $i < 32; $i++) { |
|
55 | + for ($i = 0; $i<32; $i++) { |
|
56 | 56 | $this->xml_iso88591_Entities["in"][] = chr($i); |
57 | 57 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
58 | 58 | } |
59 | 59 | |
60 | - for ($i = 160; $i < 256; $i++) { |
|
60 | + for ($i = 160; $i<256; $i++) { |
|
61 | 61 | $this->xml_iso88591_Entities["in"][] = chr($i); |
62 | 62 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
63 | 63 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $srcEncoding = PhpXmlRpc::$xmlrpc_internalencoding; |
95 | 95 | } |
96 | 96 | |
97 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
97 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
98 | 98 | switch ($conversion) { |
99 | 99 | case 'ISO-8859-1_': |
100 | 100 | case 'ISO-8859-1_US-ASCII': |
@@ -123,13 +123,13 @@ discard block |
||
123 | 123 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
124 | 124 | $escapedData = ''; |
125 | 125 | // be kind to users creating string xmlrpc values out of different php types |
126 | - $data = (string)$data; |
|
126 | + $data = (string) $data; |
|
127 | 127 | $ns = strlen($data); |
128 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
128 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
129 | 129 | $ch = $data[$nn]; |
130 | 130 | $ii = ord($ch); |
131 | 131 | // 7 bits: 0bbbbbbb (127) |
132 | - if ($ii < 128) { |
|
132 | + if ($ii<128) { |
|
133 | 133 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
134 | 134 | switch ($ii) { |
135 | 135 | case 34: |
@@ -153,33 +153,33 @@ discard block |
||
153 | 153 | } // 11 bits: 110bbbbb 10bbbbbb (2047) |
154 | 154 | elseif ($ii >> 5 == 6) { |
155 | 155 | $b1 = ($ii & 31); |
156 | - $ii = ord($data[$nn + 1]); |
|
156 | + $ii = ord($data[$nn+1]); |
|
157 | 157 | $b2 = ($ii & 63); |
158 | - $ii = ($b1 * 64) + $b2; |
|
158 | + $ii = ($b1 * 64)+$b2; |
|
159 | 159 | $ent = sprintf('&#%d;', $ii); |
160 | 160 | $escapedData .= $ent; |
161 | 161 | $nn += 1; |
162 | 162 | } // 16 bits: 1110bbbb 10bbbbbb 10bbbbbb |
163 | 163 | elseif ($ii >> 4 == 14) { |
164 | 164 | $b1 = ($ii & 15); |
165 | - $ii = ord($data[$nn + 1]); |
|
165 | + $ii = ord($data[$nn+1]); |
|
166 | 166 | $b2 = ($ii & 63); |
167 | - $ii = ord($data[$nn + 2]); |
|
167 | + $ii = ord($data[$nn+2]); |
|
168 | 168 | $b3 = ($ii & 63); |
169 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
169 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
170 | 170 | $ent = sprintf('&#%d;', $ii); |
171 | 171 | $escapedData .= $ent; |
172 | 172 | $nn += 2; |
173 | 173 | } // 21 bits: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
174 | 174 | elseif ($ii >> 3 == 30) { |
175 | 175 | $b1 = ($ii & 7); |
176 | - $ii = ord($data[$nn + 1]); |
|
176 | + $ii = ord($data[$nn+1]); |
|
177 | 177 | $b2 = ($ii & 63); |
178 | - $ii = ord($data[$nn + 2]); |
|
178 | + $ii = ord($data[$nn+2]); |
|
179 | 179 | $b3 = ($ii & 63); |
180 | - $ii = ord($data[$nn + 3]); |
|
180 | + $ii = ord($data[$nn+3]); |
|
181 | 181 | $b4 = ($ii & 63); |
182 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
182 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
183 | 183 | $ent = sprintf('&#%d;', $ii); |
184 | 184 | $escapedData .= $ent; |
185 | 185 | $nn += 3; |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | |
215 | 215 | default: |
216 | 216 | $escapedData = ''; |
217 | - error_log('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
217 | + error_log('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | return $escapedData; |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | case 'iso88591': |
267 | 267 | return $this->xml_iso88591_Entities; |
268 | 268 | default: |
269 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
269 | + throw new \Exception('Unsupported charset: '.$charset); |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 |