@@ -23,24 +23,24 @@ discard block |
||
23 | 23 | */ |
24 | 24 | class URLInfo_Parser |
25 | 25 | { |
26 | - /** |
|
27 | - * @var string |
|
28 | - */ |
|
26 | + /** |
|
27 | + * @var string |
|
28 | + */ |
|
29 | 29 | protected $url; |
30 | 30 | |
31 | - /** |
|
32 | - * @var bool |
|
33 | - */ |
|
31 | + /** |
|
32 | + * @var bool |
|
33 | + */ |
|
34 | 34 | protected $isValid = false; |
35 | 35 | |
36 | - /** |
|
37 | - * @var array |
|
38 | - */ |
|
36 | + /** |
|
37 | + * @var array |
|
38 | + */ |
|
39 | 39 | protected $info; |
40 | 40 | |
41 | - /** |
|
42 | - * @var array|NULL |
|
43 | - */ |
|
41 | + /** |
|
42 | + * @var array|NULL |
|
43 | + */ |
|
44 | 44 | protected $error; |
45 | 45 | |
46 | 46 | /** |
@@ -56,25 +56,25 @@ discard block |
||
56 | 56 | 'file' |
57 | 57 | ); |
58 | 58 | |
59 | - /** |
|
60 | - * Stores a list of all unicode characters in the URL |
|
61 | - * that have been filtered out before parsing it with |
|
62 | - * parse_url. |
|
63 | - * |
|
64 | - * @var string[]string |
|
65 | - */ |
|
59 | + /** |
|
60 | + * Stores a list of all unicode characters in the URL |
|
61 | + * that have been filtered out before parsing it with |
|
62 | + * parse_url. |
|
63 | + * |
|
64 | + * @var string[]string |
|
65 | + */ |
|
66 | 66 | protected $unicodeChars = array(); |
67 | 67 | |
68 | - /** |
|
69 | - * @var bool |
|
70 | - */ |
|
68 | + /** |
|
69 | + * @var bool |
|
70 | + */ |
|
71 | 71 | protected $encodeUTF = false; |
72 | 72 | |
73 | - /** |
|
74 | - * |
|
75 | - * @param string $url The target URL. |
|
76 | - * @param bool $encodeUTF Whether to URL encode any plain text unicode characters. |
|
77 | - */ |
|
73 | + /** |
|
74 | + * |
|
75 | + * @param string $url The target URL. |
|
76 | + * @param bool $encodeUTF Whether to URL encode any plain text unicode characters. |
|
77 | + */ |
|
78 | 78 | public function __construct(string $url, bool $encodeUTF) |
79 | 79 | { |
80 | 80 | $this->url = $url; |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | - /** |
|
91 | - * Retrieves the array as parsed by PHP's parse_url, |
|
92 | - * filtered and adjusted as necessary. |
|
93 | - * |
|
94 | - * @return array |
|
95 | - */ |
|
90 | + /** |
|
91 | + * Retrieves the array as parsed by PHP's parse_url, |
|
92 | + * filtered and adjusted as necessary. |
|
93 | + * |
|
94 | + * @return array |
|
95 | + */ |
|
96 | 96 | public function getInfo() : array |
97 | 97 | { |
98 | 98 | return $this->info; |
@@ -114,11 +114,11 @@ discard block |
||
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
117 | - /** |
|
118 | - * Finds any non-url encoded unicode characters in |
|
119 | - * the URL, and encodes them before the URL is |
|
120 | - * passed to parse_url. |
|
121 | - */ |
|
117 | + /** |
|
118 | + * Finds any non-url encoded unicode characters in |
|
119 | + * the URL, and encodes them before the URL is |
|
120 | + * passed to parse_url. |
|
121 | + */ |
|
122 | 122 | protected function filterUnicodeChars() : void |
123 | 123 | { |
124 | 124 | $chars = \AppUtils\ConvertHelper::string2array($this->url); |
@@ -236,11 +236,11 @@ discard block |
||
236 | 236 | return false; |
237 | 237 | } |
238 | 238 | |
239 | - /** |
|
240 | - * Goes through all information in the parse_url result |
|
241 | - * array, and attempts to fix any user errors in formatting |
|
242 | - * that can be recovered from, mostly regarding stray spaces. |
|
243 | - */ |
|
239 | + /** |
|
240 | + * Goes through all information in the parse_url result |
|
241 | + * array, and attempts to fix any user errors in formatting |
|
242 | + * that can be recovered from, mostly regarding stray spaces. |
|
243 | + */ |
|
244 | 244 | protected function filterParsed() |
245 | 245 | { |
246 | 246 | $this->info['params'] = array(); |
@@ -269,13 +269,13 @@ discard block |
||
269 | 269 | } |
270 | 270 | } |
271 | 271 | |
272 | - /** |
|
273 | - * Recursively goes through the array, and converts all previously |
|
274 | - * URL encoded characters with their unicode character counterparts. |
|
275 | - * |
|
276 | - * @param array $subject |
|
277 | - * @return array |
|
278 | - */ |
|
272 | + /** |
|
273 | + * Recursively goes through the array, and converts all previously |
|
274 | + * URL encoded characters with their unicode character counterparts. |
|
275 | + * |
|
276 | + * @param array $subject |
|
277 | + * @return array |
|
278 | + */ |
|
279 | 279 | protected function restoreUnicodeChars(array $subject) : array |
280 | 280 | { |
281 | 281 | $result = array(); |
@@ -299,13 +299,13 @@ discard block |
||
299 | 299 | return $result; |
300 | 300 | } |
301 | 301 | |
302 | - /** |
|
303 | - * Replaces all URL encoded unicode characters |
|
304 | - * in the string with the unicode character. |
|
305 | - * |
|
306 | - * @param string $string |
|
307 | - * @return string |
|
308 | - */ |
|
302 | + /** |
|
303 | + * Replaces all URL encoded unicode characters |
|
304 | + * in the string with the unicode character. |
|
305 | + * |
|
306 | + * @param string $string |
|
307 | + * @return string |
|
308 | + */ |
|
309 | 309 | protected function restoreUnicodeChar(string $string) : string |
310 | 310 | { |
311 | 311 | if(strstr($string, '%')) |
@@ -363,21 +363,21 @@ discard block |
||
363 | 363 | ); |
364 | 364 | } |
365 | 365 | |
366 | - /** |
|
367 | - * Checks whether the URL that was parsed is valid. |
|
368 | - * @return bool |
|
369 | - */ |
|
366 | + /** |
|
367 | + * Checks whether the URL that was parsed is valid. |
|
368 | + * @return bool |
|
369 | + */ |
|
370 | 370 | public function isValid() : bool |
371 | 371 | { |
372 | 372 | return $this->isValid; |
373 | 373 | } |
374 | 374 | |
375 | - /** |
|
376 | - * If the validation failed, retrieves the validation |
|
377 | - * error message. |
|
378 | - * |
|
379 | - * @return string |
|
380 | - */ |
|
375 | + /** |
|
376 | + * If the validation failed, retrieves the validation |
|
377 | + * error message. |
|
378 | + * |
|
379 | + * @return string |
|
380 | + */ |
|
381 | 381 | public function getErrorMessage() : string |
382 | 382 | { |
383 | 383 | if(isset($this->error)) { |
@@ -387,12 +387,12 @@ discard block |
||
387 | 387 | return ''; |
388 | 388 | } |
389 | 389 | |
390 | - /** |
|
391 | - * If the validation failed, retrieves the validation |
|
392 | - * error code. |
|
393 | - * |
|
394 | - * @return int |
|
395 | - */ |
|
390 | + /** |
|
391 | + * If the validation failed, retrieves the validation |
|
392 | + * error code. |
|
393 | + * |
|
394 | + * @return int |
|
395 | + */ |
|
396 | 396 | public function getErrorCode() : int |
397 | 397 | { |
398 | 398 | if(isset($this->error)) { |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | $this->parse(); |
84 | 84 | |
85 | - if(!$this->detectType()) { |
|
85 | + if (!$this->detectType()) { |
|
86 | 86 | $this->validate(); |
87 | 87 | } |
88 | 88 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | // if the URL contains any URL characters, and we |
110 | 110 | // do not want them URL encoded, restore them. |
111 | - if(!$this->encodeUTF && !empty($this->unicodeChars)) |
|
111 | + if (!$this->encodeUTF && !empty($this->unicodeChars)) |
|
112 | 112 | { |
113 | 113 | $this->info = $this->restoreUnicodeChars($this->info); |
114 | 114 | } |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | |
126 | 126 | $keep = array(); |
127 | 127 | |
128 | - foreach($chars as $char) |
|
128 | + foreach ($chars as $char) |
|
129 | 129 | { |
130 | - if(preg_match('/\p{L}/usix', $char)) |
|
130 | + if (preg_match('/\p{L}/usix', $char)) |
|
131 | 131 | { |
132 | 132 | $encoded = rawurlencode($char); |
133 | 133 | |
134 | - if($encoded != $char) |
|
134 | + if ($encoded != $char) |
|
135 | 135 | { |
136 | 136 | $this->unicodeChars[$encoded] = $char; |
137 | 137 | $char = $encoded; |
@@ -152,11 +152,11 @@ discard block |
||
152 | 152 | 'phoneLink' |
153 | 153 | ); |
154 | 154 | |
155 | - foreach($types as $type) |
|
155 | + foreach ($types as $type) |
|
156 | 156 | { |
157 | 157 | $method = 'detectType_'.$type; |
158 | 158 | |
159 | - if($this->$method() === true) |
|
159 | + if ($this->$method() === true) |
|
160 | 160 | { |
161 | 161 | $this->isValid = true; |
162 | 162 | return true; |
@@ -174,11 +174,11 @@ discard block |
||
174 | 174 | 'hostIsPresent' |
175 | 175 | ); |
176 | 176 | |
177 | - foreach($validations as $validation) |
|
177 | + foreach ($validations as $validation) |
|
178 | 178 | { |
179 | 179 | $method = 'validate_'.$validation; |
180 | 180 | |
181 | - if($this->$method() !== true) { |
|
181 | + if ($this->$method() !== true) { |
|
182 | 182 | return; |
183 | 183 | } |
184 | 184 | } |
@@ -191,13 +191,13 @@ discard block |
||
191 | 191 | // every link needs a host. This case can happen for ex, if |
192 | 192 | // the link starts with a typo with only one slash, like: |
193 | 193 | // "http:/hostname" |
194 | - if(isset($this->info['host'])) { |
|
194 | + if (isset($this->info['host'])) { |
|
195 | 195 | return true; |
196 | 196 | } |
197 | 197 | |
198 | 198 | $this->setError( |
199 | 199 | URLInfo::ERROR_MISSING_HOST, |
200 | - t('Cannot determine the link\'s host name.') . ' ' . |
|
200 | + t('Cannot determine the link\'s host name.').' '. |
|
201 | 201 | t('This usually happens when there\'s a typo somewhere.') |
202 | 202 | ); |
203 | 203 | |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | |
207 | 207 | protected function validate_schemeIsSet() : bool |
208 | 208 | { |
209 | - if(isset($this->info['scheme'])) { |
|
209 | + if (isset($this->info['scheme'])) { |
|
210 | 210 | return true; |
211 | 211 | } |
212 | 212 | |
@@ -223,13 +223,13 @@ discard block |
||
223 | 223 | |
224 | 224 | protected function validate_schemeIsKnown() : bool |
225 | 225 | { |
226 | - if(in_array($this->info['scheme'], $this->knownSchemes)) { |
|
226 | + if (in_array($this->info['scheme'], $this->knownSchemes)) { |
|
227 | 227 | return true; |
228 | 228 | } |
229 | 229 | |
230 | 230 | $this->setError( |
231 | 231 | URLInfo::ERROR_INVALID_SCHEME, |
232 | - t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' . |
|
232 | + t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '. |
|
233 | 233 | t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes)) |
234 | 234 | ); |
235 | 235 | |
@@ -246,23 +246,23 @@ discard block |
||
246 | 246 | $this->info['params'] = array(); |
247 | 247 | $this->info['type'] = URLInfo::TYPE_URL; |
248 | 248 | |
249 | - if(isset($this->info['user'])) { |
|
249 | + if (isset($this->info['user'])) { |
|
250 | 250 | $this->info['user'] = urldecode($this->info['user']); |
251 | 251 | } |
252 | 252 | |
253 | - if(isset($this->info['pass'])) { |
|
253 | + if (isset($this->info['pass'])) { |
|
254 | 254 | $this->info['pass'] = urldecode($this->info['pass']); |
255 | 255 | } |
256 | 256 | |
257 | - if(isset($this->info['host'])) { |
|
257 | + if (isset($this->info['host'])) { |
|
258 | 258 | $this->info['host'] = str_replace(' ', '', $this->info['host']); |
259 | 259 | } |
260 | 260 | |
261 | - if(isset($this->info['path'])) { |
|
261 | + if (isset($this->info['path'])) { |
|
262 | 262 | $this->info['path'] = str_replace(' ', '', $this->info['path']); |
263 | 263 | } |
264 | 264 | |
265 | - if(isset($this->info['query']) && !empty($this->info['query'])) |
|
265 | + if (isset($this->info['query']) && !empty($this->info['query'])) |
|
266 | 266 | { |
267 | 267 | $this->info['params'] = \AppUtils\ConvertHelper::parseQueryString($this->info['query']); |
268 | 268 | ksort($this->info['params']); |
@@ -280,9 +280,9 @@ discard block |
||
280 | 280 | { |
281 | 281 | $result = array(); |
282 | 282 | |
283 | - foreach($subject as $key => $val) |
|
283 | + foreach ($subject as $key => $val) |
|
284 | 284 | { |
285 | - if(is_array($val)) |
|
285 | + if (is_array($val)) |
|
286 | 286 | { |
287 | 287 | $val = $this->restoreUnicodeChars($val); |
288 | 288 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | protected function restoreUnicodeChar(string $string) : string |
310 | 310 | { |
311 | - if(strstr($string, '%')) |
|
311 | + if (strstr($string, '%')) |
|
312 | 312 | { |
313 | 313 | return str_replace(array_keys($this->unicodeChars), array_values($this->unicodeChars), $string); |
314 | 314 | } |
@@ -318,12 +318,12 @@ discard block |
||
318 | 318 | |
319 | 319 | protected function detectType_email() : bool |
320 | 320 | { |
321 | - if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') { |
|
321 | + if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') { |
|
322 | 322 | $this->info['type'] = URLInfo::TYPE_EMAIL; |
323 | 323 | return true; |
324 | 324 | } |
325 | 325 | |
326 | - if(isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path'])) |
|
326 | + if (isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path'])) |
|
327 | 327 | { |
328 | 328 | $this->info['scheme'] = 'mailto'; |
329 | 329 | $this->info['type'] = URLInfo::TYPE_EMAIL; |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | |
336 | 336 | protected function detectType_fragmentLink() : bool |
337 | 337 | { |
338 | - if(isset($this->info['fragment']) && !isset($this->info['scheme'])) { |
|
338 | + if (isset($this->info['fragment']) && !isset($this->info['scheme'])) { |
|
339 | 339 | $this->info['type'] = URLInfo::TYPE_FRAGMENT; |
340 | 340 | return true; |
341 | 341 | } |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | |
346 | 346 | protected function detectType_phoneLink() : bool |
347 | 347 | { |
348 | - if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') { |
|
348 | + if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') { |
|
349 | 349 | $this->info['type'] = URLInfo::TYPE_PHONE; |
350 | 350 | return true; |
351 | 351 | } |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | */ |
381 | 381 | public function getErrorMessage() : string |
382 | 382 | { |
383 | - if(isset($this->error)) { |
|
383 | + if (isset($this->error)) { |
|
384 | 384 | return $this->error['message']; |
385 | 385 | } |
386 | 386 | |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | */ |
396 | 396 | public function getErrorCode() : int |
397 | 397 | { |
398 | - if(isset($this->error)) { |
|
398 | + if (isset($this->error)) { |
|
399 | 399 | return $this->error['code']; |
400 | 400 | } |
401 | 401 |
@@ -285,8 +285,7 @@ |
||
285 | 285 | if(is_array($val)) |
286 | 286 | { |
287 | 287 | $val = $this->restoreUnicodeChars($val); |
288 | - } |
|
289 | - else |
|
288 | + } else |
|
290 | 289 | { |
291 | 290 | $val = $this->restoreUnicodeChar($val); |
292 | 291 | } |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | { |
23 | 23 | const ERROR_MALFORMATTED_STRING = 53801; |
24 | 24 | |
25 | - /** |
|
26 | - * @var string[] |
|
27 | - */ |
|
25 | + /** |
|
26 | + * @var string[] |
|
27 | + */ |
|
28 | 28 | protected static $controlChars = array( |
29 | 29 | '0000-0008', // control chars |
30 | 30 | '000E-000F', // control chars |
@@ -32,19 +32,19 @@ discard block |
||
32 | 32 | '2000-200F', // non-breaking space and co |
33 | 33 | ); |
34 | 34 | |
35 | - /** |
|
36 | - * @var string|NULL |
|
37 | - */ |
|
35 | + /** |
|
36 | + * @var string|NULL |
|
37 | + */ |
|
38 | 38 | protected static $controlCharsRegex; |
39 | 39 | |
40 | - /** |
|
41 | - * @var string[] |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var string[] |
|
42 | + */ |
|
43 | 43 | protected static $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); |
44 | 44 | |
45 | - /** |
|
46 | - * @var string[]|NULL |
|
47 | - */ |
|
45 | + /** |
|
46 | + * @var string[]|NULL |
|
47 | + */ |
|
48 | 48 | protected static $charsAsHex; |
49 | 49 | |
50 | 50 | public function __construct() |
@@ -67,13 +67,13 @@ discard block |
||
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | - /** |
|
71 | - * Retrieves the HEX character codes for all control |
|
72 | - * characters that the {@link stripControlCharacters()} |
|
73 | - * method will remove. |
|
74 | - * |
|
75 | - * @return string[] |
|
76 | - */ |
|
70 | + /** |
|
71 | + * Retrieves the HEX character codes for all control |
|
72 | + * characters that the {@link stripControlCharacters()} |
|
73 | + * method will remove. |
|
74 | + * |
|
75 | + * @return string[] |
|
76 | + */ |
|
77 | 77 | public function getCharsAsHex() : array |
78 | 78 | { |
79 | 79 | if (isset(self::$charsAsHex)) |
@@ -120,13 +120,13 @@ discard block |
||
120 | 120 | return $stack; |
121 | 121 | } |
122 | 122 | |
123 | - /** |
|
124 | - * Retrieves an array of all control characters that |
|
125 | - * the {@link stripControlCharacters()} method will |
|
126 | - * remove, as the actual UTF-8 characters. |
|
127 | - * |
|
128 | - * @return string[] |
|
129 | - */ |
|
123 | + /** |
|
124 | + * Retrieves an array of all control characters that |
|
125 | + * the {@link stripControlCharacters()} method will |
|
126 | + * remove, as the actual UTF-8 characters. |
|
127 | + * |
|
128 | + * @return string[] |
|
129 | + */ |
|
130 | 130 | public function getCharsAsUTF8() : array |
131 | 131 | { |
132 | 132 | $chars = $this->getCharsAsHex(); |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | return $result; |
140 | 140 | } |
141 | 141 | |
142 | - /** |
|
143 | - * Retrieves all control characters as JSON encoded |
|
144 | - * characters, e.g. "\u200b". |
|
145 | - * |
|
146 | - * @return string[] |
|
147 | - */ |
|
142 | + /** |
|
143 | + * Retrieves all control characters as JSON encoded |
|
144 | + * characters, e.g. "\u200b". |
|
145 | + * |
|
146 | + * @return string[] |
|
147 | + */ |
|
148 | 148 | public function getCharsAsJSON() : array |
149 | 149 | { |
150 | 150 | $chars = $this->getCharsAsHex(); |
@@ -157,17 +157,17 @@ discard block |
||
157 | 157 | return $result; |
158 | 158 | } |
159 | 159 | |
160 | - /** |
|
161 | - * Removes all control characters from the specified string |
|
162 | - * that can cause problems in some cases, like creating |
|
163 | - * valid XML documents. This includes invisible non-breaking |
|
164 | - * spaces. |
|
165 | - * |
|
166 | - * @param string $string |
|
167 | - * @return string |
|
168 | - * @see https://stackoverflow.com/a/8171868/2298192 |
|
169 | - * @see https://unicode-table.com/en |
|
170 | - */ |
|
160 | + /** |
|
161 | + * Removes all control characters from the specified string |
|
162 | + * that can cause problems in some cases, like creating |
|
163 | + * valid XML documents. This includes invisible non-breaking |
|
164 | + * spaces. |
|
165 | + * |
|
166 | + * @param string $string |
|
167 | + * @return string |
|
168 | + * @see https://stackoverflow.com/a/8171868/2298192 |
|
169 | + * @see https://unicode-table.com/en |
|
170 | + */ |
|
171 | 171 | public function stripControlCharacters(string $string) : string |
172 | 172 | { |
173 | 173 | if(empty($string)) |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | /** |
26 | 26 | * @var string[] |
27 | 27 | */ |
28 | - protected static $controlChars = array( |
|
28 | + protected static $controlChars = array( |
|
29 | 29 | '0000-0008', // control chars |
30 | 30 | '000E-000F', // control chars |
31 | 31 | '0010-001F', // control chars |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | public function __construct() |
51 | 51 | { |
52 | 52 | // create the regex from the unicode characters list |
53 | - if(!isset(self::$controlCharsRegex)) |
|
53 | + if (!isset(self::$controlCharsRegex)) |
|
54 | 54 | { |
55 | 55 | $chars = $this->getCharsAsHex(); |
56 | 56 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | // in the regular expression. |
59 | 59 | $stack = array(); |
60 | 60 | |
61 | - foreach($chars as $char) |
|
61 | + foreach ($chars as $char) |
|
62 | 62 | { |
63 | 63 | $stack[] = '\x{'.$char.'}'; |
64 | 64 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | $stack = array(); |
85 | 85 | |
86 | - foreach(self::$controlChars as $char) |
|
86 | + foreach (self::$controlChars as $char) |
|
87 | 87 | { |
88 | 88 | $tokens = explode('-', $char); |
89 | 89 | $start = $tokens[0]; |
@@ -92,24 +92,24 @@ discard block |
||
92 | 92 | |
93 | 93 | $range = array(); |
94 | 94 | |
95 | - foreach(self::$hexAlphabet as $number) |
|
95 | + foreach (self::$hexAlphabet as $number) |
|
96 | 96 | { |
97 | 97 | $range[] = $prefix.$number; |
98 | 98 | } |
99 | 99 | |
100 | 100 | $use = false; |
101 | 101 | |
102 | - foreach($range as $number) |
|
102 | + foreach ($range as $number) |
|
103 | 103 | { |
104 | - if($number == $start) { |
|
104 | + if ($number == $start) { |
|
105 | 105 | $use = true; |
106 | 106 | } |
107 | 107 | |
108 | - if($use) { |
|
108 | + if ($use) { |
|
109 | 109 | $stack[] = $number; |
110 | 110 | } |
111 | 111 | |
112 | - if($number == $end) { |
|
112 | + if ($number == $end) { |
|
113 | 113 | break; |
114 | 114 | } |
115 | 115 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $chars = $this->getCharsAsHex(); |
133 | 133 | |
134 | 134 | $result = array(); |
135 | - foreach($chars as $char) { |
|
135 | + foreach ($chars as $char) { |
|
136 | 136 | $result[] = hex2bin($char); |
137 | 137 | } |
138 | 138 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $chars = $this->getCharsAsHex(); |
151 | 151 | |
152 | 152 | $result = array(); |
153 | - foreach($chars as $char) { |
|
153 | + foreach ($chars as $char) { |
|
154 | 154 | $result[] = '\u'.strtolower($char); |
155 | 155 | } |
156 | 156 | |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function stripControlCharacters(string $string) : string |
172 | 172 | { |
173 | - if(empty($string)) |
|
173 | + if (empty($string)) |
|
174 | 174 | { |
175 | 175 | return $string; |
176 | 176 | } |
@@ -178,13 +178,13 @@ discard block |
||
178 | 178 | $result = preg_replace(self::$controlCharsRegex, '', $string); |
179 | 179 | |
180 | 180 | // can happen if the text contains invalid UTF8 |
181 | - if($result === null) |
|
181 | + if ($result === null) |
|
182 | 182 | { |
183 | 183 | $string = ConvertHelper::string2utf8($string); |
184 | 184 | |
185 | 185 | $result = preg_replace(self::$controlCharsRegex, '', $string); |
186 | 186 | |
187 | - if($result === null) |
|
187 | + if ($result === null) |
|
188 | 188 | { |
189 | 189 | throw new ConvertHelper_Exception( |
190 | 190 | 'Cannot strip control characters: malformatted string encountered.', |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | * @param mixed $value |
15 | 15 | * @return \AppUtils\NumberInfo |
16 | 16 | */ |
17 | -function parseNumber($value, $forceNew=false) |
|
17 | +function parseNumber($value, $forceNew = false) |
|
18 | 18 | { |
19 | - if($value instanceof NumberInfo && $forceNew !== true) { |
|
19 | + if ($value instanceof NumberInfo && $forceNew !== true) { |
|
20 | 20 | return $value; |
21 | 21 | } |
22 | 22 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $args = func_get_args(); |
98 | 98 | |
99 | 99 | // is the localization package installed? |
100 | - if(class_exists('\AppLocalize\Localization')) |
|
100 | + if (class_exists('\AppLocalize\Localization')) |
|
101 | 101 | { |
102 | 102 | return call_user_func_array('\AppLocalize\t', $args); |
103 | 103 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | */ |
116 | 116 | function requireCURL() : void |
117 | 117 | { |
118 | - if(function_exists('curl_init')) { |
|
118 | + if (function_exists('curl_init')) { |
|
119 | 119 | return; |
120 | 120 | } |
121 | 121 | |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @param bool $initial The initial boolean value to use. |
133 | 133 | * @return Value_Bool |
134 | 134 | */ |
135 | -function valBool(bool $initial=false) : Value_Bool |
|
135 | +function valBool(bool $initial = false) : Value_Bool |
|
136 | 136 | { |
137 | 137 | return new Value_Bool($initial); |
138 | 138 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * @param bool $initial |
146 | 146 | * @return Value_Bool_True |
147 | 147 | */ |
148 | -function valBoolTrue(bool $initial=false) : Value_Bool_True |
|
148 | +function valBoolTrue(bool $initial = false) : Value_Bool_True |
|
149 | 149 | { |
150 | 150 | return new Value_Bool_True($initial); |
151 | 151 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * @param bool $initial |
159 | 159 | * @return Value_Bool_False |
160 | 160 | */ |
161 | -function valBoolFalse(bool $initial=true) : Value_Bool_False |
|
161 | +function valBoolFalse(bool $initial = true) : Value_Bool_False |
|
162 | 162 | { |
163 | 163 | return new Value_Bool_False($initial); |
164 | 164 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | function init() |
172 | 172 | { |
173 | - if(!class_exists('\AppLocalize\Localization')) { |
|
173 | + if (!class_exists('\AppLocalize\Localization')) { |
|
174 | 174 | return; |
175 | 175 | } |
176 | 176 |
@@ -21,7 +21,7 @@ |
||
21 | 21 | { |
22 | 22 | protected $value = false; |
23 | 23 | |
24 | - public function __construct(bool $value=false) |
|
24 | + public function __construct(bool $value = false) |
|
25 | 25 | { |
26 | 26 | $this->value = $value; |
27 | 27 | } |
@@ -22,14 +22,14 @@ |
||
22 | 22 | */ |
23 | 23 | class Value_Bool_False extends Value_Bool |
24 | 24 | { |
25 | - public function __construct(bool $value=true) |
|
25 | + public function __construct(bool $value = true) |
|
26 | 26 | { |
27 | 27 | parent::__construct($value); |
28 | 28 | } |
29 | 29 | |
30 | 30 | public function set(bool $value) : Value_Bool |
31 | 31 | { |
32 | - if($value === false) |
|
32 | + if ($value === false) |
|
33 | 33 | { |
34 | 34 | parent::set($value); |
35 | 35 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | { |
25 | 25 | public function set(bool $value) : Value_Bool |
26 | 26 | { |
27 | - if($value === true) |
|
27 | + if ($value === true) |
|
28 | 28 | { |
29 | 29 | parent::set($value); |
30 | 30 | } |
@@ -22,14 +22,14 @@ discard block |
||
22 | 22 | */ |
23 | 23 | class ConvertHelper_URLFinder |
24 | 24 | { |
25 | - /** |
|
26 | - * @var string |
|
27 | - */ |
|
25 | + /** |
|
26 | + * @var string |
|
27 | + */ |
|
28 | 28 | protected $subject; |
29 | 29 | |
30 | - /** |
|
31 | - * @var boolean |
|
32 | - */ |
|
30 | + /** |
|
31 | + * @var boolean |
|
32 | + */ |
|
33 | 33 | protected $sorting = false; |
34 | 34 | |
35 | 35 | protected $schemes = array( |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | $this->subject = $subject; |
49 | 49 | } |
50 | 50 | |
51 | - /** |
|
52 | - * Whether to enable sorting the URLs alphabetically (disabled by default). |
|
53 | - * |
|
54 | - * @param bool $enabled |
|
55 | - * @return ConvertHelper_URLFinder |
|
56 | - */ |
|
51 | + /** |
|
52 | + * Whether to enable sorting the URLs alphabetically (disabled by default). |
|
53 | + * |
|
54 | + * @param bool $enabled |
|
55 | + * @return ConvertHelper_URLFinder |
|
56 | + */ |
|
57 | 57 | public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder |
58 | 58 | { |
59 | 59 | $this->sorting = $enabled; |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - /** |
|
65 | - * Prepares the subject string by adding a newline before all URL schemes, |
|
66 | - * to make it possible to parse even lists of links separated by commas or |
|
67 | - * the like (http://domain.com,http://domain2.com). |
|
68 | - */ |
|
64 | + /** |
|
65 | + * Prepares the subject string by adding a newline before all URL schemes, |
|
66 | + * to make it possible to parse even lists of links separated by commas or |
|
67 | + * the like (http://domain.com,http://domain2.com). |
|
68 | + */ |
|
69 | 69 | protected function prepareSubject() : void |
70 | 70 | { |
71 | 71 | $replaces = array(); |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | $this->subject = str_replace(array_keys($replaces), array_values($replaces), $this->subject); |
79 | 79 | } |
80 | 80 | |
81 | - /** |
|
82 | - * Fetches all URLs that can be found in the subject string. |
|
83 | - * |
|
84 | - * @return string[] |
|
85 | - * |
|
86 | - * @see https://gist.github.com/gruber/249502 |
|
87 | - */ |
|
81 | + /** |
|
82 | + * Fetches all URLs that can be found in the subject string. |
|
83 | + * |
|
84 | + * @return string[] |
|
85 | + * |
|
86 | + * @see https://gist.github.com/gruber/249502 |
|
87 | + */ |
|
88 | 88 | public function getURLs() : array |
89 | 89 | { |
90 | 90 | $this->prepareSubject(); |
@@ -115,11 +115,11 @@ discard block |
||
115 | 115 | return $result; |
116 | 116 | } |
117 | 117 | |
118 | - /** |
|
119 | - * Retrieves all URLs as URLInfo instances. |
|
120 | - * |
|
121 | - * @return URLInfo[] |
|
122 | - */ |
|
118 | + /** |
|
119 | + * Retrieves all URLs as URLInfo instances. |
|
120 | + * |
|
121 | + * @return URLInfo[] |
|
122 | + */ |
|
123 | 123 | public function getInfos() |
124 | 124 | { |
125 | 125 | $urls = $this->getURLs(); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param bool $enabled |
55 | 55 | * @return ConvertHelper_URLFinder |
56 | 56 | */ |
57 | - public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder |
|
57 | + public function enableSorting(bool $enabled = true) : ConvertHelper_URLFinder |
|
58 | 58 | { |
59 | 59 | $this->sorting = $enabled; |
60 | 60 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | { |
71 | 71 | $replaces = array(); |
72 | 72 | |
73 | - foreach($this->schemes as $scheme) |
|
73 | + foreach ($this->schemes as $scheme) |
|
74 | 74 | { |
75 | 75 | $replaces[$scheme.':'] = PHP_EOL.$scheme.':'; |
76 | 76 | } |
@@ -94,18 +94,18 @@ discard block |
||
94 | 94 | |
95 | 95 | $result = array(); |
96 | 96 | |
97 | - if(is_array($matches)) |
|
97 | + if (is_array($matches)) |
|
98 | 98 | { |
99 | - foreach($matches[0] as $match) |
|
99 | + foreach ($matches[0] as $match) |
|
100 | 100 | { |
101 | - if(strstr($match, '://') && !in_array($match, $result)) |
|
101 | + if (strstr($match, '://') && !in_array($match, $result)) |
|
102 | 102 | { |
103 | 103 | $result[] = $match; |
104 | 104 | } |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | - if($this->sorting) |
|
108 | + if ($this->sorting) |
|
109 | 109 | { |
110 | 110 | usort($result, function(string $a, string $b) { |
111 | 111 | return strnatcasecmp($a, $b); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | |
127 | 127 | $result = array(); |
128 | 128 | |
129 | - foreach($urls as $url) |
|
129 | + foreach ($urls as $url) |
|
130 | 130 | { |
131 | 131 | $result[] = parseURL($url); |
132 | 132 | } |
@@ -13,15 +13,15 @@ |
||
13 | 13 | return print_r($result, true); |
14 | 14 | } |
15 | 15 | |
16 | - protected function traverseArray(array $array, int $level=0) : array |
|
16 | + protected function traverseArray(array $array, int $level = 0) : array |
|
17 | 17 | { |
18 | 18 | $result = array(); |
19 | 19 | |
20 | - foreach($array as $key => $val) |
|
20 | + foreach ($array as $key => $val) |
|
21 | 21 | { |
22 | - if(is_array($val)) |
|
22 | + if (is_array($val)) |
|
23 | 23 | { |
24 | - $result[$key] = $this->traverseArray($val, ($level+1)); |
|
24 | + $result[$key] = $this->traverseArray($val, ($level + 1)); |
|
25 | 25 | } |
26 | 26 | else |
27 | 27 | { |
@@ -22,8 +22,7 @@ |
||
22 | 22 | if(is_array($val)) |
23 | 23 | { |
24 | 24 | $result[$key] = $this->traverseArray($val, ($level+1)); |
25 | - } |
|
26 | - else |
|
25 | + } else |
|
27 | 26 | { |
28 | 27 | $result[$key] = parseVariable($val)->toString(); |
29 | 28 | } |