@@ -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 | } |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | * @param mixed $value |
57 | 57 | * @param array|null $serialized |
58 | 58 | */ |
59 | - public function __construct($value, $serialized=null) |
|
59 | + public function __construct($value, $serialized = null) |
|
60 | 60 | { |
61 | - if(is_array($serialized)) |
|
61 | + if (is_array($serialized)) |
|
62 | 62 | { |
63 | 63 | $this->parseSerialized($serialized); |
64 | 64 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | */ |
105 | 105 | protected function parseSerialized(array $serialized) : void |
106 | 106 | { |
107 | - if(!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
|
107 | + if (!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
|
108 | 108 | { |
109 | 109 | throw new BaseException( |
110 | 110 | 'Invalid variable info serialized data.', |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $this->value = $value; |
125 | 125 | $this->type = strtolower(gettype($value)); |
126 | 126 | |
127 | - if(is_array($value) && is_callable($value)) { |
|
127 | + if (is_array($value) && is_callable($value)) { |
|
128 | 128 | $this->type = self::TYPE_CALLABLE; |
129 | 129 | } |
130 | 130 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | * @param bool $enable |
163 | 163 | * @return VariableInfo |
164 | 164 | */ |
165 | - public function enableType(bool $enable=true) : VariableInfo |
|
165 | + public function enableType(bool $enable = true) : VariableInfo |
|
166 | 166 | { |
167 | 167 | return $this->setOption('prepend-type', $enable); |
168 | 168 | } |
@@ -171,9 +171,9 @@ discard block |
||
171 | 171 | { |
172 | 172 | $converted = $this->string; |
173 | 173 | |
174 | - if($this->getOption('prepend-type') === true && !$this->isNull()) |
|
174 | + if ($this->getOption('prepend-type') === true && !$this->isNull()) |
|
175 | 175 | { |
176 | - if($this->isString()) |
|
176 | + if ($this->isString()) |
|
177 | 177 | { |
178 | 178 | $converted = '"'.$converted.'"'; |
179 | 179 | } |
@@ -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 | { |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | public function getParam($name, $default = null) |
91 | 91 | { |
92 | 92 | $value = $default; |
93 | - if(isset($_REQUEST[$name])) { |
|
93 | + if (isset($_REQUEST[$name])) { |
|
94 | 94 | $value = $_REQUEST[$name]; |
95 | 95 | } |
96 | 96 | |
97 | - if(isset($this->knownParams[$name])) { |
|
97 | + if (isset($this->knownParams[$name])) { |
|
98 | 98 | $value = $this->knownParams[$name]->validate($value); |
99 | 99 | } |
100 | 100 | |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | |
144 | 144 | $exclude = array_merge($exclude, $this->getExcludeParams()); |
145 | 145 | |
146 | - foreach($exclude as $name) |
|
146 | + foreach ($exclude as $name) |
|
147 | 147 | { |
148 | - if(isset($vars[$name])) |
|
148 | + if (isset($vars[$name])) |
|
149 | 149 | { |
150 | 150 | unset($vars[$name]); |
151 | 151 | } |
@@ -156,9 +156,9 @@ discard block |
||
156 | 156 | // remove the HTML_QuickForm2 form variable if present, to |
157 | 157 | // avoid redirect loops when using the refresh URL in |
158 | 158 | // a page in which a form has been submitted. |
159 | - foreach($names as $name) |
|
159 | + foreach ($names as $name) |
|
160 | 160 | { |
161 | - if(strstr($name, '_qf__')) |
|
161 | + if (strstr($name, '_qf__')) |
|
162 | 162 | { |
163 | 163 | unset($vars[$name]); |
164 | 164 | break; |
@@ -186,13 +186,13 @@ discard block |
||
186 | 186 | * @param string $dispatcher Relative path to script to use for the URL. Append trailing slash if needed. |
187 | 187 | * @return string |
188 | 188 | */ |
189 | - public function buildURL($params = array(), string $dispatcher='') |
|
189 | + public function buildURL($params = array(), string $dispatcher = '') |
|
190 | 190 | { |
191 | - $url = rtrim($this->getBaseURL(), '/') . '/' . $dispatcher; |
|
191 | + $url = rtrim($this->getBaseURL(), '/').'/'.$dispatcher; |
|
192 | 192 | |
193 | 193 | // append any leftover parameters to the end of the URL |
194 | 194 | if (!empty($params)) { |
195 | - $url .= '?' . http_build_query($params, '', '&'); |
|
195 | + $url .= '?'.http_build_query($params, '', '&'); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | return $url; |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | */ |
224 | 224 | public function registerParam($name) |
225 | 225 | { |
226 | - if(!isset($this->knownParams[$name])) { |
|
226 | + if (!isset($this->knownParams[$name])) { |
|
227 | 227 | $param = new Request_Param($this, $name); |
228 | 228 | $this->knownParams[$name] = $param; |
229 | 229 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | */ |
241 | 241 | public function getRegisteredParam(string $name) : Request_Param |
242 | 242 | { |
243 | - if(isset($this->knownParams[$name])) { |
|
243 | + if (isset($this->knownParams[$name])) { |
|
244 | 244 | return $this->knownParams[$name]; |
245 | 245 | } |
246 | 246 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | { |
301 | 301 | static $accept; |
302 | 302 | |
303 | - if(!isset($accept)) { |
|
303 | + if (!isset($accept)) { |
|
304 | 304 | $accept = new Request_AcceptHeaders(); |
305 | 305 | } |
306 | 306 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | { |
320 | 320 | $_REQUEST[$name] = $value; |
321 | 321 | |
322 | - if(isset($this->knownParams[$name])) { |
|
322 | + if (isset($this->knownParams[$name])) { |
|
323 | 323 | unset($this->knownParams[$name]); |
324 | 324 | } |
325 | 325 | |
@@ -353,11 +353,11 @@ discard block |
||
353 | 353 | */ |
354 | 354 | public function removeParam(string $name) : Request |
355 | 355 | { |
356 | - if(isset($_REQUEST[$name])) { |
|
356 | + if (isset($_REQUEST[$name])) { |
|
357 | 357 | unset($_REQUEST[$name]); |
358 | 358 | } |
359 | 359 | |
360 | - if(isset($this->knownParams[$name])) { |
|
360 | + if (isset($this->knownParams[$name])) { |
|
361 | 361 | unset($this->knownParams[$name]); |
362 | 362 | } |
363 | 363 | |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | */ |
373 | 373 | public function removeParams(array $names) : Request |
374 | 374 | { |
375 | - foreach($names as $name) { |
|
375 | + foreach ($names as $name) { |
|
376 | 376 | $this->removeParam($name); |
377 | 377 | } |
378 | 378 | |
@@ -388,10 +388,10 @@ discard block |
||
388 | 388 | * @param string $name |
389 | 389 | * @return bool |
390 | 390 | */ |
391 | - public function getBool($name, $default=false) |
|
391 | + public function getBool($name, $default = false) |
|
392 | 392 | { |
393 | 393 | $value = $this->getParam($name, $default); |
394 | - if(ConvertHelper::isBoolean($value)) { |
|
394 | + if (ConvertHelper::isBoolean($value)) { |
|
395 | 395 | return ConvertHelper::string2bool($value); |
396 | 396 | } |
397 | 397 | |
@@ -400,11 +400,11 @@ discard block |
||
400 | 400 | |
401 | 401 | public function validate() |
402 | 402 | { |
403 | - foreach($this->knownParams as $param) |
|
403 | + foreach ($this->knownParams as $param) |
|
404 | 404 | { |
405 | 405 | $name = $param->getName(); |
406 | 406 | |
407 | - if($param->isRequired() && !$this->hasParam($name)) |
|
407 | + if ($param->isRequired() && !$this->hasParam($name)) |
|
408 | 408 | { |
409 | 409 | throw new Request_Exception( |
410 | 410 | 'Missing request parameter '.$name, |
@@ -426,10 +426,10 @@ discard block |
||
426 | 426 | * @param mixed $default |
427 | 427 | * @return string |
428 | 428 | */ |
429 | - public function getFilteredParam($name, $default=null) |
|
429 | + public function getFilteredParam($name, $default = null) |
|
430 | 430 | { |
431 | 431 | $val = $this->getParam($name, $default); |
432 | - if(is_string($val)) { |
|
432 | + if (is_string($val)) { |
|
433 | 433 | $val = htmlspecialchars(trim(strip_tags($val)), ENT_QUOTES, 'UTF-8'); |
434 | 434 | } |
435 | 435 | |
@@ -448,24 +448,24 @@ discard block |
||
448 | 448 | * @see Request::getJSONAssoc() |
449 | 449 | * @see Request::getJSONObject() |
450 | 450 | */ |
451 | - public function getJSON(string $name, bool $assoc=true) |
|
451 | + public function getJSON(string $name, bool $assoc = true) |
|
452 | 452 | { |
453 | 453 | $value = $this->getParam($name); |
454 | 454 | |
455 | - if(!empty($value) && is_string($value)) |
|
455 | + if (!empty($value) && is_string($value)) |
|
456 | 456 | { |
457 | 457 | $data = json_decode($value, $assoc); |
458 | 458 | |
459 | - if($assoc && is_array($data)) { |
|
459 | + if ($assoc && is_array($data)) { |
|
460 | 460 | return $data; |
461 | 461 | } |
462 | 462 | |
463 | - if(is_object($data)) { |
|
463 | + if (is_object($data)) { |
|
464 | 464 | return $data; |
465 | 465 | } |
466 | 466 | } |
467 | 467 | |
468 | - if($assoc) { |
|
468 | + if ($assoc) { |
|
469 | 469 | return array(); |
470 | 470 | } |
471 | 471 | |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | public function getJSONAssoc(string $name) : array |
483 | 483 | { |
484 | 484 | $result = $this->getJSON($name); |
485 | - if(is_array($result)) { |
|
485 | + if (is_array($result)) { |
|
486 | 486 | return $result; |
487 | 487 | } |
488 | 488 | |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | public function getJSONObject(string $name) : object |
500 | 500 | { |
501 | 501 | $result = $this->getJSON($name, false); |
502 | - if(is_object($result)) { |
|
502 | + if (is_object($result)) { |
|
503 | 503 | return $result; |
504 | 504 | } |
505 | 505 | |
@@ -512,10 +512,10 @@ discard block |
||
512 | 512 | * @param array|string $data |
513 | 513 | * @param bool $exit Whether to exit the script afterwards. |
514 | 514 | */ |
515 | - public static function sendJSON($data, bool $exit=true) |
|
515 | + public static function sendJSON($data, bool $exit = true) |
|
516 | 516 | { |
517 | 517 | $payload = $data; |
518 | - if(!is_string($payload)) { |
|
518 | + if (!is_string($payload)) { |
|
519 | 519 | $payload = json_encode($payload); |
520 | 520 | } |
521 | 521 | |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | |
526 | 526 | echo $payload; |
527 | 527 | |
528 | - if($exit) |
|
528 | + if ($exit) |
|
529 | 529 | { |
530 | 530 | exit; |
531 | 531 | } |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | * @param string $html |
538 | 538 | * @param bool $exit Whether to exit the script afterwards. |
539 | 539 | */ |
540 | - public static function sendHTML(string $html, bool $exit=true) |
|
540 | + public static function sendHTML(string $html, bool $exit = true) |
|
541 | 541 | { |
542 | 542 | header('Cache-Control: no-cache, must-revalidate'); |
543 | 543 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
@@ -545,7 +545,7 @@ discard block |
||
545 | 545 | |
546 | 546 | echo $html; |
547 | 547 | |
548 | - if($exit) |
|
548 | + if ($exit) |
|
549 | 549 | { |
550 | 550 | exit; |
551 | 551 | } |
@@ -561,7 +561,7 @@ discard block |
||
561 | 561 | * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present) |
562 | 562 | * @return Request_URLComparer |
563 | 563 | */ |
564 | - public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer |
|
564 | + public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams = array()) : Request_URLComparer |
|
565 | 565 | { |
566 | 566 | $comparer = new Request_URLComparer($this, $sourceURL, $targetURL); |
567 | 567 | $comparer->addLimitParams($limitParams); |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | $interval = $d2->diff($d1); |
59 | 59 | |
60 | - if(!$interval instanceof \DateInterval) |
|
60 | + if (!$interval instanceof \DateInterval) |
|
61 | 61 | { |
62 | 62 | throw new ConvertHelper_Exception( |
63 | 63 | 'Cannot create interval', |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | // error wrappers. |
84 | 84 | $errors = libxml_get_errors(); |
85 | 85 | |
86 | - foreach($errors as $error) |
|
86 | + foreach ($errors as $error) |
|
87 | 87 | { |
88 | 88 | $this->errors[] = new XMLHelper_SimpleXML_Error($this, $error); |
89 | 89 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | $xml = $function($subject); |
99 | 99 | |
100 | - if($xml instanceof \SimpleXMLElement) |
|
100 | + if ($xml instanceof \SimpleXMLElement) |
|
101 | 101 | { |
102 | 102 | return $xml; |
103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | public function getConverter() : XMLHelper_Converter |
109 | 109 | { |
110 | - if($this->element instanceof \SimpleXMLElement) |
|
110 | + if ($this->element instanceof \SimpleXMLElement) |
|
111 | 111 | { |
112 | 112 | return XMLHelper::convertElement($this->element); |
113 | 113 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | $data = @json_decode($serialized, true); |
48 | 48 | |
49 | - if(!is_array($data)) |
|
49 | + if (!is_array($data)) |
|
50 | 50 | { |
51 | 51 | throw new XMLHelper_Exception( |
52 | 52 | 'Could not unserialize error data', |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | |
73 | 73 | private static function checkErrorData(array $data) : void |
74 | 74 | { |
75 | - foreach(self::$requiredKeys as $key) |
|
75 | + foreach (self::$requiredKeys as $key) |
|
76 | 76 | { |
77 | - if(!array_key_exists($key, $data)) |
|
77 | + if (!array_key_exists($key, $data)) |
|
78 | 78 | { |
79 | 79 | throw new XMLHelper_Exception( |
80 | 80 | 'Required key missing in error data', |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | private static function checkFragment(string $fragment) : void |
109 | 109 | { |
110 | - if(!stristr($fragment, '<body') && !stristr($fragment, 'doctype')) |
|
110 | + if (!stristr($fragment, '<body') && !stristr($fragment, 'doctype')) |
|
111 | 111 | { |
112 | 112 | return; |
113 | 113 | } |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | // capture all elements except the body tag itself |
209 | 209 | $xml = ''; |
210 | - foreach($nodes as $child) |
|
210 | + foreach ($nodes as $child) |
|
211 | 211 | { |
212 | 212 | $xml .= $this->dom->saveXML($child); |
213 | 213 | } |