@@ -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 | } |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | |
242 | 242 | $output = curl_exec($ch); |
243 | 243 | |
244 | - if(isset($this->logfilePointer)) |
|
244 | + if (isset($this->logfilePointer)) |
|
245 | 245 | { |
246 | 246 | fclose($this->logfilePointer); |
247 | 247 | } |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | // CURL will complain about an empty response when the |
254 | 254 | // server sends a 100-continue code. That should not be |
255 | 255 | // regarded as an error. |
256 | - if($output === false && $this->response->getCode() !== 100) |
|
256 | + if ($output === false && $this->response->getCode() !== 100) |
|
257 | 257 | { |
258 | 258 | $curlCode = curl_errno($ch); |
259 | 259 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | { |
290 | 290 | $ch = curl_init(); |
291 | 291 | |
292 | - if(!is_resource($ch)) |
|
292 | + if (!is_resource($ch)) |
|
293 | 293 | { |
294 | 294 | throw new RequestHelper_Exception( |
295 | 295 | 'Could not initialize a new cURL instance.', |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | } |
300 | 300 | |
301 | 301 | $this->setHeader('Content-Length', (string)$this->boundaries->getContentLength()); |
302 | - $this->setHeader('Content-Type', 'multipart/form-data; boundary=' . $this->mimeBoundary); |
|
302 | + $this->setHeader('Content-Type', 'multipart/form-data; boundary='.$this->mimeBoundary); |
|
303 | 303 | |
304 | 304 | curl_setopt($ch, CURLOPT_POST, true); |
305 | 305 | curl_setopt($ch, CURLOPT_URL, $url->getNormalizedWithoutAuth()); |
@@ -312,18 +312,18 @@ discard block |
||
312 | 312 | |
313 | 313 | $loggingEnabled = $this->configureLogging($ch); |
314 | 314 | |
315 | - if(!$loggingEnabled) |
|
315 | + if (!$loggingEnabled) |
|
316 | 316 | { |
317 | 317 | curl_setopt($ch, CURLINFO_HEADER_OUT, true); |
318 | 318 | } |
319 | 319 | |
320 | - if($this->verifySSL) |
|
320 | + if ($this->verifySSL) |
|
321 | 321 | { |
322 | 322 | curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); |
323 | 323 | curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); |
324 | 324 | } |
325 | 325 | |
326 | - if($url->hasUsername()) |
|
326 | + if ($url->hasUsername()) |
|
327 | 327 | { |
328 | 328 | curl_setopt($ch, CURLOPT_USERNAME, $url->getUsername()); |
329 | 329 | curl_setopt($ch, CURLOPT_PASSWORD, $url->getPassword()); |
@@ -338,14 +338,14 @@ discard block |
||
338 | 338 | */ |
339 | 339 | protected function configureLogging($ch) : bool |
340 | 340 | { |
341 | - if(empty($this->logfile)) |
|
341 | + if (empty($this->logfile)) |
|
342 | 342 | { |
343 | 343 | return false; |
344 | 344 | } |
345 | 345 | |
346 | 346 | $res = fopen($this->logfile, 'w+'); |
347 | 347 | |
348 | - if($res === false) |
|
348 | + if ($res === false) |
|
349 | 349 | { |
350 | 350 | throw new RequestHelper_Exception( |
351 | 351 | 'Cannot open logfile for writing.', |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | |
376 | 376 | $this->setHeader('Expect', ''); |
377 | 377 | |
378 | - foreach($this->headers as $name => $value) { |
|
378 | + foreach ($this->headers as $name => $value) { |
|
379 | 379 | $result[] = $name.': '.$value; |
380 | 380 | } |
381 | 381 | |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | { |
393 | 393 | $response = $this->getResponse(); |
394 | 394 | |
395 | - if($response !== null) { |
|
395 | + if ($response !== null) { |
|
396 | 396 | return $response->getHeaders(); |
397 | 397 | } |
398 | 398 | |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | */ |
429 | 429 | public function getHeader(string $name) : string |
430 | 430 | { |
431 | - if(isset($this->headers[$name])) |
|
431 | + if (isset($this->headers[$name])) |
|
432 | 432 | { |
433 | 433 | return $this->headers[$name]; |
434 | 434 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | */ |
109 | 109 | public static function json($subject) : string |
110 | 110 | { |
111 | - if(!is_string($subject)) |
|
111 | + if (!is_string($subject)) |
|
112 | 112 | { |
113 | 113 | $subject = json_encode($subject, JSON_PRETTY_PRINT); |
114 | 114 | } |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | * @param bool $formatSource Whether to format the source with indentation to make it readable. |
126 | 126 | * @return string |
127 | 127 | */ |
128 | - public static function xml(string $xml, bool $formatSource=false) : string |
|
128 | + public static function xml(string $xml, bool $formatSource = false) : string |
|
129 | 129 | { |
130 | - if($formatSource) |
|
130 | + if ($formatSource) |
|
131 | 131 | { |
132 | 132 | $dom = new DOMDocument(); |
133 | 133 | $dom->preserveWhiteSpace = false; |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | * @param bool $formatSource |
149 | 149 | * @return string |
150 | 150 | */ |
151 | - public static function html(string $html, bool $formatSource=false) : string |
|
151 | + public static function html(string $html, bool $formatSource = false) : string |
|
152 | 152 | { |
153 | - if($formatSource) |
|
153 | + if ($formatSource) |
|
154 | 154 | { |
155 | 155 | $dom = new DOMDocument(); |
156 | 156 | $dom->preserveWhiteSpace = false; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | private function initUnits() : void |
50 | 50 | { |
51 | - if(isset(self::$units)) |
|
51 | + if (isset(self::$units)) |
|
52 | 52 | { |
53 | 53 | return; |
54 | 54 | } |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | public function toString() : string |
91 | 91 | { |
92 | 92 | // specifically handle zero |
93 | - if($this->seconds <= 0) |
|
93 | + if ($this->seconds <= 0) |
|
94 | 94 | { |
95 | - return '0 ' . t('seconds'); |
|
95 | + return '0 '.t('seconds'); |
|
96 | 96 | } |
97 | 97 | |
98 | - if($this->seconds < 1) |
|
98 | + if ($this->seconds < 1) |
|
99 | 99 | { |
100 | 100 | return t('less than a second'); |
101 | 101 | } |
@@ -104,12 +104,12 @@ discard block |
||
104 | 104 | |
105 | 105 | $last = array_pop($tokens); |
106 | 106 | |
107 | - if(empty($tokens)) |
|
107 | + if (empty($tokens)) |
|
108 | 108 | { |
109 | 109 | return $last; |
110 | 110 | } |
111 | 111 | |
112 | - return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last; |
|
112 | + return implode(', ', $tokens).' '.t('and').' '.$last; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -122,18 +122,18 @@ discard block |
||
122 | 122 | $seconds = $this->seconds; |
123 | 123 | $tokens = array(); |
124 | 124 | |
125 | - foreach(self::$units as $def) |
|
125 | + foreach (self::$units as $def) |
|
126 | 126 | { |
127 | 127 | $unitValue = intval($seconds / $def['value']); |
128 | 128 | |
129 | - if($unitValue <= 0) |
|
129 | + if ($unitValue <= 0) |
|
130 | 130 | { |
131 | 131 | continue; |
132 | 132 | } |
133 | 133 | |
134 | - $item = strval($unitValue) . ' '; |
|
134 | + $item = strval($unitValue).' '; |
|
135 | 135 | |
136 | - if(abs($unitValue) > 1) |
|
136 | + if (abs($unitValue) > 1) |
|
137 | 137 | { |
138 | 138 | $item .= $def['plural']; |
139 | 139 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | $autoload = $root.'/vendor/autoload.php'; |
16 | 16 | |
17 | 17 | // we need the autoloader to be present |
18 | - if($autoload === false) |
|
18 | + if ($autoload === false) |
|
19 | 19 | { |
20 | 20 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
21 | 21 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public static function detect(string $subjectString) : ?ConvertHelper_EOL |
123 | 123 | { |
124 | - if(empty($subjectString)) { |
|
124 | + if (empty($subjectString)) { |
|
125 | 125 | return null; |
126 | 126 | } |
127 | 127 | |
@@ -129,18 +129,18 @@ discard block |
||
129 | 129 | $results = array(); |
130 | 130 | $chars = self::getEOLChars(); |
131 | 131 | |
132 | - foreach($chars as $def) |
|
132 | + foreach ($chars as $def) |
|
133 | 133 | { |
134 | 134 | $amount = substr_count($subjectString, $def['char']); |
135 | 135 | |
136 | - if($amount > $max) |
|
136 | + if ($amount > $max) |
|
137 | 137 | { |
138 | 138 | $max = $amount; |
139 | 139 | $results[] = $def; |
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
143 | - if(empty($results)) { |
|
143 | + if (empty($results)) { |
|
144 | 144 | return null; |
145 | 145 | } |
146 | 146 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | */ |
157 | 157 | public static function getEOLChars() : array |
158 | 158 | { |
159 | - if(isset(self::$eolChars)) { |
|
159 | + if (isset(self::$eolChars)) { |
|
160 | 160 | return self::$eolChars; |
161 | 161 | } |
162 | 162 |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | * @param array|null $serialized |
68 | 68 | * @throws BaseException |
69 | 69 | */ |
70 | - public function __construct($value, ?array $serialized=null) |
|
70 | + public function __construct($value, ?array $serialized = null) |
|
71 | 71 | { |
72 | - if(is_array($serialized)) |
|
72 | + if (is_array($serialized)) |
|
73 | 73 | { |
74 | 74 | $this->parseSerialized($serialized); |
75 | 75 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | protected function parseSerialized(array $serialized) : void |
119 | 119 | { |
120 | - if(!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
|
120 | + if (!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options'])) |
|
121 | 121 | { |
122 | 122 | throw new BaseException( |
123 | 123 | 'Invalid variable info serialized data.', |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | |
140 | 140 | // Gettype will return a string like "Resource(closed)" when |
141 | 141 | // working with a resource that has already been closed. |
142 | - if(strstr($this->type, 'resource')) |
|
142 | + if (strstr($this->type, 'resource')) |
|
143 | 143 | { |
144 | 144 | $this->type = self::TYPE_RESOURCE; |
145 | 145 | } |
146 | 146 | |
147 | - if(in_array($this->type, $this->callableTypes) && is_callable($value)) { |
|
147 | + if (in_array($this->type, $this->callableTypes) && is_callable($value)) { |
|
148 | 148 | $this->type = self::TYPE_CALLABLE; |
149 | 149 | } |
150 | 150 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * @param bool $enable |
183 | 183 | * @return VariableInfo |
184 | 184 | */ |
185 | - public function enableType(bool $enable=true) : VariableInfo |
|
185 | + public function enableType(bool $enable = true) : VariableInfo |
|
186 | 186 | { |
187 | 187 | return $this->setOption('prepend-type', $enable); |
188 | 188 | } |
@@ -191,9 +191,9 @@ discard block |
||
191 | 191 | { |
192 | 192 | $converted = $this->string; |
193 | 193 | |
194 | - if($this->getOption('prepend-type') === true && !$this->isNull()) |
|
194 | + if ($this->getOption('prepend-type') === true && !$this->isNull()) |
|
195 | 195 | { |
196 | - if($this->isString()) |
|
196 | + if ($this->isString()) |
|
197 | 197 | { |
198 | 198 | $converted = '"'.$converted.'"'; |
199 | 199 | } |
@@ -13,20 +13,20 @@ discard block |
||
13 | 13 | $string = ''; |
14 | 14 | |
15 | 15 | // Simple function call |
16 | - if(is_string($this->value)) |
|
16 | + if (is_string($this->value)) |
|
17 | 17 | { |
18 | 18 | return $this->value.'()'; |
19 | 19 | } |
20 | 20 | |
21 | - if(is_array($this->value)) { |
|
21 | + if (is_array($this->value)) { |
|
22 | 22 | return $this->renderArray(); |
23 | 23 | } |
24 | 24 | |
25 | - if($this->value instanceof NamedClosure) { |
|
25 | + if ($this->value instanceof NamedClosure) { |
|
26 | 26 | return 'Closure:'.$this->value->getOrigin(); |
27 | 27 | } |
28 | 28 | |
29 | - if($this->value instanceof Closure) { |
|
29 | + if ($this->value instanceof Closure) { |
|
30 | 30 | return 'Closure'; |
31 | 31 | } |
32 | 32 | |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | $string = ''; |
39 | 39 | |
40 | 40 | if (is_string($this->value[0])) { |
41 | - $string .= $this->value[0] . '::'; |
|
41 | + $string .= $this->value[0].'::'; |
|
42 | 42 | } else { |
43 | - $string .= get_class($this->value[0]) . '->'; |
|
43 | + $string .= get_class($this->value[0]).'->'; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | $string .= $this->value[1].'()'; |