@@ -22,7 +22,7 @@ |
||
22 | 22 | $lines = explode("\n", $list); |
23 | 23 | $reverseArray = array(); |
24 | 24 | |
25 | - foreach($lines as $line) |
|
25 | + foreach ($lines as $line) |
|
26 | 26 | { |
27 | 27 | $parts = explode('=', $line); |
28 | 28 | $name = trim(str_replace('XML_ERR_', '', $parts[0])); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * @param string $message Should not contain a date, just the system specific info. |
143 | 143 | * @return OperationResult |
144 | 144 | */ |
145 | - public function makeSuccess(string $message, int $code=0) : OperationResult |
|
145 | + public function makeSuccess(string $message, int $code = 0) : OperationResult |
|
146 | 146 | { |
147 | 147 | return $this->setMessage(self::TYPE_SUCCESS, $message, $code, true); |
148 | 148 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @param string $message Should be as detailed as possible. |
154 | 154 | * @return OperationResult |
155 | 155 | */ |
156 | - public function makeError(string $message, int $code=0) : OperationResult |
|
156 | + public function makeError(string $message, int $code = 0) : OperationResult |
|
157 | 157 | { |
158 | 158 | return $this->setMessage(self::TYPE_ERROR, $message, $code, false); |
159 | 159 | } |
@@ -233,11 +233,11 @@ discard block |
||
233 | 233 | return $this->code; |
234 | 234 | } |
235 | 235 | |
236 | - public function getMessage(string $type='') : string |
|
236 | + public function getMessage(string $type = '') : string |
|
237 | 237 | { |
238 | - if(!empty($type)) |
|
238 | + if (!empty($type)) |
|
239 | 239 | { |
240 | - if($this->type === $type) |
|
240 | + if ($this->type === $type) |
|
241 | 241 | { |
242 | 242 | return $this->message; |
243 | 243 | } |
@@ -31,27 +31,27 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected $results = array(); |
33 | 33 | |
34 | - public function makeError(string $message, int $code=0) : OperationResult |
|
34 | + public function makeError(string $message, int $code = 0) : OperationResult |
|
35 | 35 | { |
36 | 36 | return $this->add('makeError', $message, $code); |
37 | 37 | } |
38 | 38 | |
39 | - public function makeSuccess(string $message, int $code=0) : OperationResult |
|
39 | + public function makeSuccess(string $message, int $code = 0) : OperationResult |
|
40 | 40 | { |
41 | 41 | return $this->add('makeSuccess', $message, $code); |
42 | 42 | } |
43 | 43 | |
44 | - public function makeWarning(string $message, int $code=0) : OperationResult |
|
44 | + public function makeWarning(string $message, int $code = 0) : OperationResult |
|
45 | 45 | { |
46 | 46 | return $this->add('makeWarning', $message, $code); |
47 | 47 | } |
48 | 48 | |
49 | - public function makeNotice(string $message, int $code=0) : OperationResult |
|
49 | + public function makeNotice(string $message, int $code = 0) : OperationResult |
|
50 | 50 | { |
51 | 51 | return $this->add('makeNotice', $message, $code); |
52 | 52 | } |
53 | 53 | |
54 | - protected function add(string $method, string $message, int $code=0) : OperationResult |
|
54 | + protected function add(string $method, string $message, int $code = 0) : OperationResult |
|
55 | 55 | { |
56 | 56 | $result = new OperationResult($this->subject); |
57 | 57 | $result->$method($message, $code); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | public function addResult(OperationResult $result) : OperationResult_Collection |
65 | 65 | { |
66 | - if($result instanceof OperationResult_Collection) |
|
66 | + if ($result instanceof OperationResult_Collection) |
|
67 | 67 | { |
68 | 68 | return $this->importCollection($result); |
69 | 69 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | { |
76 | 76 | $results = $collection->getResults(); |
77 | 77 | |
78 | - foreach($results as $result) |
|
78 | + foreach ($results as $result) |
|
79 | 79 | { |
80 | 80 | $this->addResult($result); |
81 | 81 | } |
@@ -111,9 +111,9 @@ discard block |
||
111 | 111 | |
112 | 112 | public function isValid() : bool |
113 | 113 | { |
114 | - foreach($this->results as $result) |
|
114 | + foreach ($this->results as $result) |
|
115 | 115 | { |
116 | - if(!$result->isValid()) |
|
116 | + if (!$result->isValid()) |
|
117 | 117 | { |
118 | 118 | return false; |
119 | 119 | } |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | |
125 | 125 | public function hasCode() : bool |
126 | 126 | { |
127 | - foreach($this->results as $result) |
|
127 | + foreach ($this->results as $result) |
|
128 | 128 | { |
129 | - if($result->hasCode()) |
|
129 | + if ($result->hasCode()) |
|
130 | 130 | { |
131 | 131 | return true; |
132 | 132 | } |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | |
138 | 138 | public function getCode() : int |
139 | 139 | { |
140 | - foreach($this->results as $result) |
|
140 | + foreach ($this->results as $result) |
|
141 | 141 | { |
142 | - if($result->hasCode()) |
|
142 | + if ($result->hasCode()) |
|
143 | 143 | { |
144 | 144 | return $result->getCode(); |
145 | 145 | } |
@@ -148,13 +148,13 @@ discard block |
||
148 | 148 | return 0; |
149 | 149 | } |
150 | 150 | |
151 | - public function getMessage(string $type='') : string |
|
151 | + public function getMessage(string $type = '') : string |
|
152 | 152 | { |
153 | - foreach($this->results as $result) |
|
153 | + foreach ($this->results as $result) |
|
154 | 154 | { |
155 | 155 | $msg = $result->getMessage($type); |
156 | 156 | |
157 | - if(!empty($msg)) |
|
157 | + if (!empty($msg)) |
|
158 | 158 | { |
159 | 159 | return $msg; |
160 | 160 | } |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | |
166 | 166 | public function containsCode(int $code) : bool |
167 | 167 | { |
168 | - foreach($this->results as $result) |
|
168 | + foreach ($this->results as $result) |
|
169 | 169 | { |
170 | - if($result->getCode() === $code) |
|
170 | + if ($result->getCode() === $code) |
|
171 | 171 | { |
172 | 172 | return true; |
173 | 173 | } |
@@ -200,9 +200,9 @@ discard block |
||
200 | 200 | { |
201 | 201 | $amount = 0; |
202 | 202 | |
203 | - foreach($this->results as $result) |
|
203 | + foreach ($this->results as $result) |
|
204 | 204 | { |
205 | - if($result->isType($type)) |
|
205 | + if ($result->isType($type)) |
|
206 | 206 | { |
207 | 207 | $amount++; |
208 | 208 | } |
@@ -240,9 +240,9 @@ discard block |
||
240 | 240 | { |
241 | 241 | $results = array(); |
242 | 242 | |
243 | - foreach($this->results as $result) |
|
243 | + foreach ($this->results as $result) |
|
244 | 244 | { |
245 | - if($result->isType($type)) |
|
245 | + if ($result->isType($type)) |
|
246 | 246 | { |
247 | 247 | $results[] = $result; |
248 | 248 | } |
@@ -253,9 +253,9 @@ discard block |
||
253 | 253 | |
254 | 254 | public function isType(string $type) : bool |
255 | 255 | { |
256 | - foreach($this->results as $result) |
|
256 | + foreach ($this->results as $result) |
|
257 | 257 | { |
258 | - if($result->isType($type)) |
|
258 | + if ($result->isType($type)) |
|
259 | 259 | { |
260 | 260 | return true; |
261 | 261 | } |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $lines[] = 'Collection #'.$this->getID(); |
272 | 272 | $lines[] = 'Subject: '.get_class($this->subject); |
273 | 273 | |
274 | - foreach($this->results as $result) |
|
274 | + foreach ($this->results as $result) |
|
275 | 275 | { |
276 | 276 | $lines[] = ' - '.$result->getType().' #'.$result->getCode().' "'.$result->getMessage($result->getType()).'"'; |
277 | 277 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | public function addClass(string $name) |
34 | 34 | { |
35 | - if(!in_array($name, $this->classes)) { |
|
35 | + if (!in_array($name, $this->classes)) { |
|
36 | 36 | $this->classes[] = $name; |
37 | 37 | } |
38 | 38 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | public function addClasses(array $names) |
43 | 43 | { |
44 | - foreach($names as $name) { |
|
44 | + foreach ($names as $name) { |
|
45 | 45 | $this->addClass($name); |
46 | 46 | } |
47 | 47 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | $idx = array_search($name, $this->classes); |
59 | 59 | |
60 | - if($idx !== false) { |
|
60 | + if ($idx !== false) { |
|
61 | 61 | unset($this->classes[$idx]); |
62 | 62 | sort($this->classes); |
63 | 63 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function classesToAttribute() : string |
93 | 93 | { |
94 | - if(!empty($this->classes)) |
|
94 | + if (!empty($this->classes)) |
|
95 | 95 | { |
96 | 96 | return sprintf( |
97 | 97 | ' class="%s" ', |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param bool $enabled |
69 | 69 | * @return ConvertHelper_URLFinder |
70 | 70 | */ |
71 | - public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder |
|
71 | + public function enableSorting(bool $enabled = true) : ConvertHelper_URLFinder |
|
72 | 72 | { |
73 | 73 | $this->setOption('sorting', $enabled); |
74 | 74 | return $this; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @param bool $include |
83 | 83 | * @return ConvertHelper_URLFinder |
84 | 84 | */ |
85 | - public function includeEmails(bool $include=true) : ConvertHelper_URLFinder |
|
85 | + public function includeEmails(bool $include = true) : ConvertHelper_URLFinder |
|
86 | 86 | { |
87 | 87 | $this->setOption('include-emails', $include); |
88 | 88 | return $this; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param bool $omit |
95 | 95 | * @return ConvertHelper_URLFinder |
96 | 96 | */ |
97 | - public function omitMailto(bool $omit=true) : ConvertHelper_URLFinder |
|
97 | + public function omitMailto(bool $omit = true) : ConvertHelper_URLFinder |
|
98 | 98 | { |
99 | 99 | $this->setOption('omit-mailto', $omit); |
100 | 100 | return $this; |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | { |
110 | 110 | $replaces = array(); |
111 | 111 | |
112 | - foreach($this->schemes as $scheme) |
|
112 | + foreach ($this->schemes as $scheme) |
|
113 | 113 | { |
114 | 114 | $replaces[$scheme.':'] = PHP_EOL.$scheme.':'; |
115 | 115 | } |
@@ -131,20 +131,20 @@ discard block |
||
131 | 131 | |
132 | 132 | $result = array(); |
133 | 133 | |
134 | - foreach($matches[0] as $match) |
|
134 | + foreach ($matches[0] as $match) |
|
135 | 135 | { |
136 | - if(strstr($match, '://') && !in_array($match, $result)) |
|
136 | + if (strstr($match, '://') && !in_array($match, $result)) |
|
137 | 137 | { |
138 | 138 | $result[] = $match; |
139 | 139 | } |
140 | 140 | } |
141 | 141 | |
142 | - if($this->getBoolOption('include-emails')) |
|
142 | + if ($this->getBoolOption('include-emails')) |
|
143 | 143 | { |
144 | 144 | $result = array_merge($result, $this->getEmails()); |
145 | 145 | } |
146 | 146 | |
147 | - if($this->getBoolOption('sorting')) |
|
147 | + if ($this->getBoolOption('sorting')) |
|
148 | 148 | { |
149 | 149 | usort($result, function(string $a, string $b) { |
150 | 150 | return strnatcasecmp($a, $b); |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | $result = array(); |
170 | 170 | $prefix = $this->getEmailPrefix(); |
171 | 171 | |
172 | - foreach($matches[0] as $email) |
|
172 | + foreach ($matches[0] as $email) |
|
173 | 173 | { |
174 | 174 | $result[] = $prefix.$email; |
175 | 175 | } |
176 | 176 | |
177 | - if($this->getBoolOption('sorting')) |
|
177 | + if ($this->getBoolOption('sorting')) |
|
178 | 178 | { |
179 | 179 | usort($result, function(string $a, string $b) { |
180 | 180 | return strnatcasecmp($a, $b); |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | private function getEmailPrefix() : string |
188 | 188 | { |
189 | - if($this->getBoolOption('omit-mailto')) |
|
189 | + if ($this->getBoolOption('omit-mailto')) |
|
190 | 190 | { |
191 | 191 | return ''; |
192 | 192 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | |
206 | 206 | $result = array(); |
207 | 207 | |
208 | - foreach($urls as $url) |
|
208 | + foreach ($urls as $url) |
|
209 | 209 | { |
210 | 210 | $result[] = parseURL($url); |
211 | 211 | } |
@@ -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 | |
@@ -185,13 +185,13 @@ discard block |
||
185 | 185 | * @param string $dispatcher Relative path to script to use for the URL. Append trailing slash if needed. |
186 | 186 | * @return string |
187 | 187 | */ |
188 | - public function buildURL($params = array(), string $dispatcher='') |
|
188 | + public function buildURL($params = array(), string $dispatcher = '') |
|
189 | 189 | { |
190 | - $url = rtrim($this->getBaseURL(), '/') . '/' . $dispatcher; |
|
190 | + $url = rtrim($this->getBaseURL(), '/').'/'.$dispatcher; |
|
191 | 191 | |
192 | 192 | // append any leftover parameters to the end of the URL |
193 | 193 | if (!empty($params)) { |
194 | - $url .= '?' . http_build_query($params, '', '&'); |
|
194 | + $url .= '?'.http_build_query($params, '', '&'); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | return $url; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | */ |
223 | 223 | public function registerParam($name) |
224 | 224 | { |
225 | - if(!isset($this->knownParams[$name])) { |
|
225 | + if (!isset($this->knownParams[$name])) { |
|
226 | 226 | $param = new Request_Param($this, $name); |
227 | 227 | $this->knownParams[$name] = $param; |
228 | 228 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | */ |
240 | 240 | public function getRegisteredParam(string $name) : Request_Param |
241 | 241 | { |
242 | - if(isset($this->knownParams[$name])) { |
|
242 | + if (isset($this->knownParams[$name])) { |
|
243 | 243 | return $this->knownParams[$name]; |
244 | 244 | } |
245 | 245 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | { |
300 | 300 | static $accept; |
301 | 301 | |
302 | - if(!isset($accept)) { |
|
302 | + if (!isset($accept)) { |
|
303 | 303 | $accept = new Request_AcceptHeaders(); |
304 | 304 | } |
305 | 305 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | { |
319 | 319 | $_REQUEST[$name] = $value; |
320 | 320 | |
321 | - if(isset($this->knownParams[$name])) { |
|
321 | + if (isset($this->knownParams[$name])) { |
|
322 | 322 | unset($this->knownParams[$name]); |
323 | 323 | } |
324 | 324 | |
@@ -352,11 +352,11 @@ discard block |
||
352 | 352 | */ |
353 | 353 | public function removeParam(string $name) : Request |
354 | 354 | { |
355 | - if(isset($_REQUEST[$name])) { |
|
355 | + if (isset($_REQUEST[$name])) { |
|
356 | 356 | unset($_REQUEST[$name]); |
357 | 357 | } |
358 | 358 | |
359 | - if(isset($this->knownParams[$name])) { |
|
359 | + if (isset($this->knownParams[$name])) { |
|
360 | 360 | unset($this->knownParams[$name]); |
361 | 361 | } |
362 | 362 | |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | */ |
372 | 372 | public function removeParams(array $names) : Request |
373 | 373 | { |
374 | - foreach($names as $name) { |
|
374 | + foreach ($names as $name) { |
|
375 | 375 | $this->removeParam($name); |
376 | 376 | } |
377 | 377 | |
@@ -387,10 +387,10 @@ discard block |
||
387 | 387 | * @param string $name |
388 | 388 | * @return bool |
389 | 389 | */ |
390 | - public function getBool($name, $default=false) |
|
390 | + public function getBool($name, $default = false) |
|
391 | 391 | { |
392 | 392 | $value = $this->getParam($name, $default); |
393 | - if(ConvertHelper::isBoolean($value)) { |
|
393 | + if (ConvertHelper::isBoolean($value)) { |
|
394 | 394 | return ConvertHelper::string2bool($value); |
395 | 395 | } |
396 | 396 | |
@@ -399,11 +399,11 @@ discard block |
||
399 | 399 | |
400 | 400 | public function validate() |
401 | 401 | { |
402 | - foreach($this->knownParams as $param) |
|
402 | + foreach ($this->knownParams as $param) |
|
403 | 403 | { |
404 | 404 | $name = $param->getName(); |
405 | 405 | |
406 | - if($param->isRequired() && !$this->hasParam($name)) |
|
406 | + if ($param->isRequired() && !$this->hasParam($name)) |
|
407 | 407 | { |
408 | 408 | throw new Request_Exception( |
409 | 409 | 'Missing request parameter '.$name, |
@@ -425,10 +425,10 @@ discard block |
||
425 | 425 | * @param mixed $default |
426 | 426 | * @return string |
427 | 427 | */ |
428 | - public function getFilteredParam($name, $default=null) |
|
428 | + public function getFilteredParam($name, $default = null) |
|
429 | 429 | { |
430 | 430 | $val = $this->getParam($name, $default); |
431 | - if(is_string($val)) { |
|
431 | + if (is_string($val)) { |
|
432 | 432 | $val = htmlspecialchars(trim(strip_tags($val)), ENT_QUOTES, 'UTF-8'); |
433 | 433 | } |
434 | 434 | |
@@ -447,24 +447,24 @@ discard block |
||
447 | 447 | * @see Request::getJSONAssoc() |
448 | 448 | * @see Request::getJSONObject() |
449 | 449 | */ |
450 | - public function getJSON(string $name, bool $assoc=true) |
|
450 | + public function getJSON(string $name, bool $assoc = true) |
|
451 | 451 | { |
452 | 452 | $value = $this->getParam($name); |
453 | 453 | |
454 | - if(!empty($value) && is_string($value)) |
|
454 | + if (!empty($value) && is_string($value)) |
|
455 | 455 | { |
456 | 456 | $data = json_decode($value, $assoc); |
457 | 457 | |
458 | - if($assoc && is_array($data)) { |
|
458 | + if ($assoc && is_array($data)) { |
|
459 | 459 | return $data; |
460 | 460 | } |
461 | 461 | |
462 | - if(is_object($data)) { |
|
462 | + if (is_object($data)) { |
|
463 | 463 | return $data; |
464 | 464 | } |
465 | 465 | } |
466 | 466 | |
467 | - if($assoc) { |
|
467 | + if ($assoc) { |
|
468 | 468 | return array(); |
469 | 469 | } |
470 | 470 | |
@@ -481,7 +481,7 @@ discard block |
||
481 | 481 | public function getJSONAssoc(string $name) : array |
482 | 482 | { |
483 | 483 | $result = $this->getJSON($name); |
484 | - if(is_array($result)) { |
|
484 | + if (is_array($result)) { |
|
485 | 485 | return $result; |
486 | 486 | } |
487 | 487 | |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | public function getJSONObject(string $name) : object |
499 | 499 | { |
500 | 500 | $result = $this->getJSON($name, false); |
501 | - if(is_object($result)) { |
|
501 | + if (is_object($result)) { |
|
502 | 502 | return $result; |
503 | 503 | } |
504 | 504 | |
@@ -511,10 +511,10 @@ discard block |
||
511 | 511 | * @param array|string $data |
512 | 512 | * @param bool $exit Whether to exit the script afterwards. |
513 | 513 | */ |
514 | - public static function sendJSON($data, bool $exit=true) |
|
514 | + public static function sendJSON($data, bool $exit = true) |
|
515 | 515 | { |
516 | 516 | $payload = $data; |
517 | - if(!is_string($payload)) { |
|
517 | + if (!is_string($payload)) { |
|
518 | 518 | $payload = json_encode($payload); |
519 | 519 | } |
520 | 520 | |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | |
525 | 525 | echo $payload; |
526 | 526 | |
527 | - if($exit) |
|
527 | + if ($exit) |
|
528 | 528 | { |
529 | 529 | exit; |
530 | 530 | } |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | * @param string $html |
537 | 537 | * @param bool $exit Whether to exit the script afterwards. |
538 | 538 | */ |
539 | - public static function sendHTML(string $html, bool $exit=true) |
|
539 | + public static function sendHTML(string $html, bool $exit = true) |
|
540 | 540 | { |
541 | 541 | header('Cache-Control: no-cache, must-revalidate'); |
542 | 542 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | |
545 | 545 | echo $html; |
546 | 546 | |
547 | - if($exit) |
|
547 | + if ($exit) |
|
548 | 548 | { |
549 | 549 | exit; |
550 | 550 | } |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present) |
561 | 561 | * @return Request_URLComparer |
562 | 562 | */ |
563 | - public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer |
|
563 | + public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams = array()) : Request_URLComparer |
|
564 | 564 | { |
565 | 565 | $comparer = new Request_URLComparer($this, $sourceURL, $targetURL); |
566 | 566 | $comparer->addLimitParams($limitParams); |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | public function __construct($callback) |
31 | 31 | { |
32 | - if(!is_callable($callback)) |
|
32 | + if (!is_callable($callback)) |
|
33 | 33 | { |
34 | 34 | throw new Request_Exception( |
35 | 35 | 'Invalid exclusion callback', |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @param bool $exclude |
49 | 49 | * @return Request_RefreshParams |
50 | 50 | */ |
51 | - public function setExcludeSessionName(bool $exclude=true) : Request_RefreshParams |
|
51 | + public function setExcludeSessionName(bool $exclude = true) : Request_RefreshParams |
|
52 | 52 | { |
53 | 53 | $this->setOption('exclude-session-name', $exclude); |
54 | 54 | return $this; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | public function excludeParamByName(string $paramName) : Request_RefreshParams |
72 | 72 | { |
73 | - if($paramName !== '') |
|
73 | + if ($paramName !== '') |
|
74 | 74 | { |
75 | 75 | $this->excludes[] = new Request_RefreshParams_Exclude_Name($paramName); |
76 | 76 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | public function excludeParamsByName(array $paramNames) : Request_RefreshParams |
109 | 109 | { |
110 | - foreach($paramNames as $name) |
|
110 | + foreach ($paramNames as $name) |
|
111 | 111 | { |
112 | 112 | $this->excludeParamByName((string)$name); |
113 | 113 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function overrideParams(array $params) : Request_RefreshParams |
141 | 141 | { |
142 | - foreach($params as $name => $value) |
|
142 | + foreach ($params as $name => $value) |
|
143 | 143 | { |
144 | 144 | $this->overrideParam((string)$name, $value); |
145 | 145 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | */ |
174 | 174 | private function autoExcludeSessionName(array &$excludes) : void |
175 | 175 | { |
176 | - if($this->getBoolOption('exclude-session-name')) |
|
176 | + if ($this->getBoolOption('exclude-session-name')) |
|
177 | 177 | { |
178 | 178 | $excludes[] = new Request_RefreshParams_Exclude_Name(session_name()); |
179 | 179 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | */ |
188 | 188 | private function autoExcludeQuickform(array &$excludes) : void |
189 | 189 | { |
190 | - if($this->getBoolOption('exclude-quickform-submitter')) |
|
190 | + if ($this->getBoolOption('exclude-quickform-submitter')) |
|
191 | 191 | { |
192 | 192 | $excludes[] = new Request_RefreshParams_Exclude_Callback(function(string $paramName) |
193 | 193 | { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | // Note: using this loop instead of array_merge, |
210 | 210 | // because array_merge has weird behavior when |
211 | 211 | // using numeric keys. |
212 | - foreach($this->overrides as $name => $val) |
|
212 | + foreach ($this->overrides as $name => $val) |
|
213 | 213 | { |
214 | 214 | $params[$name] = $val; |
215 | 215 | } |
@@ -227,11 +227,11 @@ discard block |
||
227 | 227 | { |
228 | 228 | $result = array(); |
229 | 229 | |
230 | - foreach($params as $name => $value) |
|
230 | + foreach ($params as $name => $value) |
|
231 | 231 | { |
232 | 232 | $name = (string)$name; |
233 | 233 | |
234 | - if(!$this->isExcluded($name, $value)) |
|
234 | + if (!$this->isExcluded($name, $value)) |
|
235 | 235 | { |
236 | 236 | $result[$name] = $value; |
237 | 237 | } |
@@ -252,9 +252,9 @@ discard block |
||
252 | 252 | { |
253 | 253 | $excludes = $this->resolveExcludes(); |
254 | 254 | |
255 | - foreach($excludes as $exclude) |
|
255 | + foreach ($excludes as $exclude) |
|
256 | 256 | { |
257 | - if($exclude->isExcluded($paramName, $paramValue)) |
|
257 | + if ($exclude->isExcluded($paramName, $paramValue)) |
|
258 | 258 | { |
259 | 259 | return true; |
260 | 260 | } |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | * @param bool $enabled |
124 | 124 | * @return URLInfo |
125 | 125 | */ |
126 | - public function setUTFEncoding(bool $enabled=true) : URLInfo |
|
126 | + public function setUTFEncoding(bool $enabled = true) : URLInfo |
|
127 | 127 | { |
128 | - if($this->encodeUTFChars !== $enabled) |
|
128 | + if ($this->encodeUTFChars !== $enabled) |
|
129 | 129 | { |
130 | 130 | $this->encodeUTFChars = $enabled; |
131 | 131 | $this->parse(); // re-parse the URL to apply the changes |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | { |
230 | 230 | $port = $this->getInfoKey('port'); |
231 | 231 | |
232 | - if(!empty($port)) { |
|
232 | + if (!empty($port)) { |
|
233 | 233 | return (int)$port; |
234 | 234 | } |
235 | 235 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | |
310 | 310 | protected function getInfoKey(string $name) : string |
311 | 311 | { |
312 | - if(isset($this->info[$name])) { |
|
312 | + if (isset($this->info[$name])) { |
|
313 | 313 | return (string)$this->info[$name]; |
314 | 314 | } |
315 | 315 | |
@@ -338,13 +338,13 @@ discard block |
||
338 | 338 | return $this->normalize(false); |
339 | 339 | } |
340 | 340 | |
341 | - protected function normalize(bool $auth=true) : string |
|
341 | + protected function normalize(bool $auth = true) : string |
|
342 | 342 | { |
343 | - if(!$this->isValid()) { |
|
343 | + if (!$this->isValid()) { |
|
344 | 344 | return ''; |
345 | 345 | } |
346 | 346 | |
347 | - if(!isset($this->normalizer)) { |
|
347 | + if (!isset($this->normalizer)) { |
|
348 | 348 | $this->normalizer = new URLInfo_Normalizer($this); |
349 | 349 | } |
350 | 350 | |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | */ |
375 | 375 | public function getHighlighted() : string |
376 | 376 | { |
377 | - if(!$this->isValid()) { |
|
377 | + if (!$this->isValid()) { |
|
378 | 378 | return ''; |
379 | 379 | } |
380 | 380 | |
@@ -416,14 +416,14 @@ discard block |
||
416 | 416 | */ |
417 | 417 | public function getParams() : array |
418 | 418 | { |
419 | - if(!$this->paramExclusion || empty($this->excludedParams)) { |
|
419 | + if (!$this->paramExclusion || empty($this->excludedParams)) { |
|
420 | 420 | return $this->info['params']; |
421 | 421 | } |
422 | 422 | |
423 | 423 | $keep = array(); |
424 | - foreach($this->info['params'] as $name => $value) |
|
424 | + foreach ($this->info['params'] as $name => $value) |
|
425 | 425 | { |
426 | - if(!isset($this->excludedParams[$name])) { |
|
426 | + if (!isset($this->excludedParams[$name])) { |
|
427 | 427 | $keep[$name] = $value; |
428 | 428 | } |
429 | 429 | } |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | */ |
450 | 450 | public function getParam(string $name) : string |
451 | 451 | { |
452 | - if(isset($this->info['params'][$name])) { |
|
452 | + if (isset($this->info['params'][$name])) { |
|
453 | 453 | return $this->info['params'][$name]; |
454 | 454 | } |
455 | 455 | |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | */ |
469 | 469 | public function excludeParam(string $name, string $reason) : URLInfo |
470 | 470 | { |
471 | - if(!isset($this->excludedParams[$name])) |
|
471 | + if (!isset($this->excludedParams[$name])) |
|
472 | 472 | { |
473 | 473 | $this->excludedParams[$name] = $reason; |
474 | 474 | $this->setParamExclusion(); |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | |
495 | 495 | public function getTypeLabel() : string |
496 | 496 | { |
497 | - if(!isset(self::$typeLabels)) |
|
497 | + if (!isset(self::$typeLabels)) |
|
498 | 498 | { |
499 | 499 | self::$typeLabels = array( |
500 | 500 | self::TYPE_EMAIL => t('Email'), |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | |
507 | 507 | $type = $this->getType(); |
508 | 508 | |
509 | - if(!isset(self::$typeLabels[$type])) |
|
509 | + if (!isset(self::$typeLabels[$type])) |
|
510 | 510 | { |
511 | 511 | throw new BaseException( |
512 | 512 | sprintf('Unknown URL type label for type [%s].', $type), |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | * @param bool $highlight |
527 | 527 | * @return URLInfo |
528 | 528 | */ |
529 | - public function setHighlightExcluded(bool $highlight=true) : URLInfo |
|
529 | + public function setHighlightExcluded(bool $highlight = true) : URLInfo |
|
530 | 530 | { |
531 | 531 | $this->highlightExcluded = $highlight; |
532 | 532 | return $this; |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | * @see URLInfo::isParamExclusionEnabled() |
575 | 575 | * @see URLInfo::setHighlightExcluded() |
576 | 576 | */ |
577 | - public function setParamExclusion(bool $enabled=true) : URLInfo |
|
577 | + public function setParamExclusion(bool $enabled = true) : URLInfo |
|
578 | 578 | { |
579 | 579 | $this->paramExclusion = $enabled; |
580 | 580 | return $this; |
@@ -600,13 +600,13 @@ discard block |
||
600 | 600 | */ |
601 | 601 | public function containsExcludedParams() : bool |
602 | 602 | { |
603 | - if(empty($this->excludedParams)) { |
|
603 | + if (empty($this->excludedParams)) { |
|
604 | 604 | return false; |
605 | 605 | } |
606 | 606 | |
607 | 607 | $names = array_keys($this->info['params']); |
608 | - foreach($names as $name) { |
|
609 | - if(isset($this->excludedParams[$name])) { |
|
608 | + foreach ($names as $name) { |
|
609 | + if (isset($this->excludedParams[$name])) { |
|
610 | 610 | return true; |
611 | 611 | } |
612 | 612 | } |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | |
623 | 623 | public function offsetSet($offset, $value) |
624 | 624 | { |
625 | - if(in_array($offset, $this->infoKeys)) { |
|
625 | + if (in_array($offset, $this->infoKeys)) { |
|
626 | 626 | $this->info[$offset] = $value; |
627 | 627 | } |
628 | 628 | } |
@@ -639,11 +639,11 @@ discard block |
||
639 | 639 | |
640 | 640 | public function offsetGet($offset) |
641 | 641 | { |
642 | - if($offset === 'port') { |
|
642 | + if ($offset === 'port') { |
|
643 | 643 | return $this->getPort(); |
644 | 644 | } |
645 | 645 | |
646 | - if(in_array($offset, $this->infoKeys)) { |
|
646 | + if (in_array($offset, $this->infoKeys)) { |
|
647 | 647 | return $this->getInfoKey($offset); |
648 | 648 | } |
649 | 649 | |
@@ -675,7 +675,7 @@ discard block |
||
675 | 675 | * @return bool |
676 | 676 | * @throws BaseException |
677 | 677 | */ |
678 | - public function tryConnect(bool $verifySSL=true) : bool |
|
678 | + public function tryConnect(bool $verifySSL = true) : bool |
|
679 | 679 | { |
680 | 680 | return $this->createConnectionTester() |
681 | 681 | ->setVerifySSL($verifySSL) |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | */ |
719 | 719 | public function removeParam(string $param) : URLInfo |
720 | 720 | { |
721 | - if(isset($this->info['params'][$param])) |
|
721 | + if (isset($this->info['params'][$param])) |
|
722 | 722 | { |
723 | 723 | unset($this->info['params'][$param]); |
724 | 724 | } |