@@ -126,9 +126,9 @@ discard block |
||
126 | 126 | * @param array $args |
127 | 127 | * @return Request_Param |
128 | 128 | */ |
129 | - public function setCallback($callback, array $args=array()) : Request_Param |
|
129 | + public function setCallback($callback, array $args = array()) : Request_Param |
|
130 | 130 | { |
131 | - if(!is_callable($callback)) { |
|
131 | + if (!is_callable($callback)) { |
|
132 | 132 | throw new Request_Exception( |
133 | 133 | 'Not a valid callback', |
134 | 134 | 'The specified callback is not a valid callable entity.', |
@@ -159,22 +159,22 @@ discard block |
||
159 | 159 | // first off, apply filtering |
160 | 160 | $value = $this->filter($value); |
161 | 161 | |
162 | - if($this->valueType === self::VALUE_TYPE_LIST) |
|
162 | + if ($this->valueType === self::VALUE_TYPE_LIST) |
|
163 | 163 | { |
164 | - if(!is_array($value)) |
|
164 | + if (!is_array($value)) |
|
165 | 165 | { |
166 | 166 | $value = explode(',', $value); |
167 | 167 | } |
168 | 168 | |
169 | 169 | $keep = array(); |
170 | 170 | |
171 | - foreach($value as $subval) |
|
171 | + foreach ($value as $subval) |
|
172 | 172 | { |
173 | 173 | $subval = $this->filter($subval); |
174 | 174 | |
175 | 175 | $subval = $this->applyValidations($subval, true); |
176 | 176 | |
177 | - if($subval !== null) { |
|
177 | + if ($subval !== null) { |
|
178 | 178 | $keep[] = $subval; |
179 | 179 | } |
180 | 180 | } |
@@ -195,11 +195,11 @@ discard block |
||
195 | 195 | * @param mixed $value |
196 | 196 | * @return mixed |
197 | 197 | */ |
198 | - protected function applyValidations($value, bool $subval=false) |
|
198 | + protected function applyValidations($value, bool $subval = false) |
|
199 | 199 | { |
200 | 200 | // go through all enqueued validations in turn, each time |
201 | 201 | // replacing the value with the adjusted, validated value. |
202 | - foreach($this->validations as $validateDef) |
|
202 | + foreach ($this->validations as $validateDef) |
|
203 | 203 | { |
204 | 204 | $value = $this->validateType($value, $validateDef['type'], $validateDef['params'], $subval); |
205 | 205 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | { |
223 | 223 | $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type); |
224 | 224 | |
225 | - if(!class_exists($class)) |
|
225 | + if (!class_exists($class)) |
|
226 | 226 | { |
227 | 227 | throw new Request_Exception( |
228 | 228 | 'Unknown validation type.', |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | { |
377 | 377 | $args = func_get_args(); // cannot be used as function parameter in some PHP versions |
378 | 378 | |
379 | - if(is_array($args[0])) |
|
379 | + if (is_array($args[0])) |
|
380 | 380 | { |
381 | 381 | $args = $args[0]; |
382 | 382 | } |
@@ -521,10 +521,10 @@ discard block |
||
521 | 521 | * @param mixed $default |
522 | 522 | * @return mixed |
523 | 523 | */ |
524 | - public function get($default=null) |
|
524 | + public function get($default = null) |
|
525 | 525 | { |
526 | 526 | $value = $this->request->getParam($this->paramName); |
527 | - if($value !== null && $value !== '') { |
|
527 | + if ($value !== null && $value !== '') { |
|
528 | 528 | return $value; |
529 | 529 | } |
530 | 530 | |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | { |
544 | 544 | $total = count($this->filters); |
545 | 545 | for ($i = 0; $i < $total; $i++) { |
546 | - $method = 'applyFilter_' . $this->filters[$i]['type']; |
|
546 | + $method = 'applyFilter_'.$this->filters[$i]['type']; |
|
547 | 547 | $value = $this->$method($value, $this->filters[$i]['params']); |
548 | 548 | } |
549 | 549 | |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | * @param bool $stripEmptyEntries Remove empty entries from the array? |
701 | 701 | * @return \AppUtils\Request_Param |
702 | 702 | */ |
703 | - public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param |
|
703 | + public function addCommaSeparatedFilter(bool $trimEntries = true, bool $stripEmptyEntries = true) : Request_Param |
|
704 | 704 | { |
705 | 705 | $this->setArray(); |
706 | 706 | |
@@ -713,7 +713,7 @@ discard block |
||
713 | 713 | ); |
714 | 714 | } |
715 | 715 | |
716 | - protected function addClassFilter(string $name, array $params=array()) : Request_Param |
|
716 | + protected function addClassFilter(string $name, array $params = array()) : Request_Param |
|
717 | 717 | { |
718 | 718 | return $this->addFilter( |
719 | 719 | self::FILTER_TYPE_CLASS, |
@@ -28,11 +28,11 @@ |
||
28 | 28 | protected function _validate() |
29 | 29 | { |
30 | 30 | // subvalues cannot be arrays |
31 | - if($this->isSubvalue) { |
|
31 | + if ($this->isSubvalue) { |
|
32 | 32 | return $this->value; |
33 | 33 | } |
34 | 34 | |
35 | - if(is_array($this->value)) { |
|
35 | + if (is_array($this->value)) { |
|
36 | 36 | return $this->value; |
37 | 37 | } |
38 | 38 |
@@ -33,22 +33,22 @@ |
||
33 | 33 | |
34 | 34 | // if we are validating a subvalue, it means we are |
35 | 35 | // validating a single value in the existing list. |
36 | - if($this->isSubvalue) |
|
36 | + if ($this->isSubvalue) |
|
37 | 37 | { |
38 | - if(in_array($this->value, $allowed)) { |
|
38 | + if (in_array($this->value, $allowed)) { |
|
39 | 39 | return $this->value; |
40 | 40 | } |
41 | 41 | |
42 | 42 | return null; |
43 | 43 | } |
44 | 44 | |
45 | - if(!is_array($this->value)) { |
|
45 | + if (!is_array($this->value)) { |
|
46 | 46 | return array(); |
47 | 47 | } |
48 | 48 | |
49 | 49 | $keep = array(); |
50 | - foreach($this->value as $item) { |
|
51 | - if(in_array($item, $allowed)) { |
|
50 | + foreach ($this->value as $item) { |
|
51 | + if (in_array($item, $allowed)) { |
|
52 | 52 | $keep[] = $item; |
53 | 53 | } |
54 | 54 | } |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | $lines[] = '--'.$this->boundaries->getMimeBoundary(); |
133 | 133 | $lines[] = $this->renderContentDisposition(); |
134 | 134 | |
135 | - if(!empty($this->contentType)) |
|
135 | + if (!empty($this->contentType)) |
|
136 | 136 | { |
137 | 137 | $lines[] = $this->renderContentType(); |
138 | 138 | } |
139 | 139 | |
140 | - if(!empty($this->transferEncoding)) |
|
140 | + if (!empty($this->transferEncoding)) |
|
141 | 141 | { |
142 | 142 | $lines[] = $this->renderTransferEncoding(); |
143 | 143 | } |
@@ -152,9 +152,9 @@ discard block |
||
152 | 152 | { |
153 | 153 | $result = 'Content-Disposition: form-data'; |
154 | 154 | |
155 | - foreach($this->dispositionParams as $name => $value) |
|
155 | + foreach ($this->dispositionParams as $name => $value) |
|
156 | 156 | { |
157 | - $result .= '; '.$name.'="' . $value . '"'; |
|
157 | + $result .= '; '.$name.'="'.$value.'"'; |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | return $result; |
@@ -162,11 +162,11 @@ discard block |
||
162 | 162 | |
163 | 163 | protected function renderContentType() : string |
164 | 164 | { |
165 | - $result = 'Content-Type: ' . $this->contentType; |
|
165 | + $result = 'Content-Type: '.$this->contentType; |
|
166 | 166 | |
167 | - if(!empty($this->contentEncoding)) |
|
167 | + if (!empty($this->contentEncoding)) |
|
168 | 168 | { |
169 | - $result .= '; charset="' . $this->contentEncoding.'"'; |
|
169 | + $result .= '; charset="'.$this->contentEncoding.'"'; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | return $result; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | protected function renderTransferEncoding() : string |
176 | 176 | { |
177 | - $result = 'Content-Transfer-Encoding: ' . $this->transferEncoding; |
|
177 | + $result = 'Content-Transfer-Encoding: '.$this->transferEncoding; |
|
178 | 178 | |
179 | 179 | return $result; |
180 | 180 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function setOption(string $name, $value) |
42 | 42 | { |
43 | - if(!isset($this->options)) { |
|
43 | + if (!isset($this->options)) { |
|
44 | 44 | $this->options = $this->getDefaultOptions(); |
45 | 45 | } |
46 | 46 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function setOptions(array $options) |
58 | 58 | { |
59 | - foreach($options as $name => $value) { |
|
59 | + foreach ($options as $name => $value) { |
|
60 | 60 | $this->setOption($name, $value); |
61 | 61 | } |
62 | 62 | |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | * @param mixed $default The default value to return if the option does not exist. |
74 | 74 | * @return mixed |
75 | 75 | */ |
76 | - public function getOption(string $name, $default=null) |
|
76 | + public function getOption(string $name, $default = null) |
|
77 | 77 | { |
78 | - if(!isset($this->options)) { |
|
78 | + if (!isset($this->options)) { |
|
79 | 79 | $this->options = $this->getDefaultOptions(); |
80 | 80 | } |
81 | 81 | |
82 | - if(isset($this->options[$name])) { |
|
82 | + if (isset($this->options[$name])) { |
|
83 | 83 | return $this->options[$name]; |
84 | 84 | } |
85 | 85 | |
@@ -96,11 +96,11 @@ discard block |
||
96 | 96 | * @param string $default Used if the option does not exist, is invalid, or empty. |
97 | 97 | * @return string |
98 | 98 | */ |
99 | - public function getStringOption(string $name, string $default='') : string |
|
99 | + public function getStringOption(string $name, string $default = '') : string |
|
100 | 100 | { |
101 | 101 | $value = $this->getOption($name, false); |
102 | 102 | |
103 | - if((is_string($value) || is_numeric($value)) && !empty($value)) { |
|
103 | + if ((is_string($value) || is_numeric($value)) && !empty($value)) { |
|
104 | 104 | return (string)$value; |
105 | 105 | } |
106 | 106 | |
@@ -116,9 +116,9 @@ discard block |
||
116 | 116 | * @param string $name |
117 | 117 | * @return bool |
118 | 118 | */ |
119 | - public function getBoolOption(string $name, bool $default=false) : bool |
|
119 | + public function getBoolOption(string $name, bool $default = false) : bool |
|
120 | 120 | { |
121 | - if($this->getOption($name) === true) { |
|
121 | + if ($this->getOption($name) === true) { |
|
122 | 122 | return true; |
123 | 123 | } |
124 | 124 | |
@@ -134,10 +134,10 @@ discard block |
||
134 | 134 | * @param int $default |
135 | 135 | * @return int |
136 | 136 | */ |
137 | - public function getIntOption(string $name, int $default=0) : int |
|
137 | + public function getIntOption(string $name, int $default = 0) : int |
|
138 | 138 | { |
139 | 139 | $value = $this->getOption($name); |
140 | - if(ConvertHelper::isInteger($value)) { |
|
140 | + if (ConvertHelper::isInteger($value)) { |
|
141 | 141 | return (int)$value; |
142 | 142 | } |
143 | 143 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | public function getArrayOption(string $name) : array |
156 | 156 | { |
157 | 157 | $val = $this->getOption($name); |
158 | - if(is_array($val)) { |
|
158 | + if (is_array($val)) { |
|
159 | 159 | return $val; |
160 | 160 | } |
161 | 161 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function hasOption(string $name) : bool |
173 | 173 | { |
174 | - if(!isset($this->options)) { |
|
174 | + if (!isset($this->options)) { |
|
175 | 175 | $this->options = $this->getDefaultOptions(); |
176 | 176 | } |
177 | 177 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | */ |
185 | 185 | public function getOptions() : array |
186 | 186 | { |
187 | - if(!isset($this->options)) { |
|
187 | + if (!isset($this->options)) { |
|
188 | 188 | $this->options = $this->getDefaultOptions(); |
189 | 189 | } |
190 | 190 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * @param mixed $default |
239 | 239 | * @return $this |
240 | 240 | */ |
241 | - function getOption(string $name, $default=null); |
|
241 | + function getOption(string $name, $default = null); |
|
242 | 242 | |
243 | 243 | /** |
244 | 244 | * @param array $options |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper_Boundaries |
85 | 85 | { |
86 | - if(empty($contentType)) |
|
86 | + if (empty($contentType)) |
|
87 | 87 | { |
88 | 88 | $contentType = (string)FileHelper::detectMimeType($fileName); |
89 | 89 | } |
90 | 90 | |
91 | - if(empty($encoding)) |
|
91 | + if (empty($encoding)) |
|
92 | 92 | { |
93 | 93 | $encoding = RequestHelper::ENCODING_UTF8; |
94 | 94 | $content = ConvertHelper::string2utf8($content); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | */ |
154 | 154 | public function render() : string |
155 | 155 | { |
156 | - if(empty($this->boundaries)) |
|
156 | + if (empty($this->boundaries)) |
|
157 | 157 | { |
158 | 158 | throw new RequestHelper_Exception( |
159 | 159 | 'No mime boundaries added', |
@@ -164,13 +164,13 @@ discard block |
||
164 | 164 | |
165 | 165 | $result = ''; |
166 | 166 | |
167 | - foreach($this->boundaries as $boundary) |
|
167 | + foreach ($this->boundaries as $boundary) |
|
168 | 168 | { |
169 | 169 | $result .= $boundary->render(); |
170 | 170 | } |
171 | 171 | |
172 | - $result .= "--" . $this->getMimeBoundary() . "--" . |
|
173 | - $this->getEOL() . $this->getEOL(); // always finish with two eol's!! |
|
172 | + $result .= "--".$this->getMimeBoundary()."--". |
|
173 | + $this->getEOL().$this->getEOL(); // always finish with two eol's!! |
|
174 | 174 | |
175 | 175 | return $result; |
176 | 176 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | 'fragment' |
78 | 78 | ); |
79 | 79 | |
80 | - foreach($parts as $part) |
|
80 | + foreach ($parts as $part) |
|
81 | 81 | { |
82 | 82 | $method = 'render_'.$part; |
83 | 83 | $result[] = (string)$this->$method(); |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | protected function render_scheme() : string |
90 | 90 | { |
91 | - if(!$this->info->hasScheme()) { |
|
91 | + if (!$this->info->hasScheme()) { |
|
92 | 92 | return ''; |
93 | 93 | } |
94 | 94 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | protected function render_username() : string |
105 | 105 | { |
106 | - if(!$this->info->hasUsername()) { |
|
106 | + if (!$this->info->hasUsername()) { |
|
107 | 107 | return ''; |
108 | 108 | } |
109 | 109 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | |
120 | 120 | protected function render_host() : string |
121 | 121 | { |
122 | - if(!$this->info->hasHost()) { |
|
122 | + if (!$this->info->hasHost()) { |
|
123 | 123 | return ''; |
124 | 124 | } |
125 | 125 | |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | |
132 | 132 | protected function render_port() : string |
133 | 133 | { |
134 | - if(!$this->info->hasPort()) { |
|
134 | + if (!$this->info->hasPort()) { |
|
135 | 135 | return ''; |
136 | 136 | } |
137 | 137 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | protected function render_path() : string |
146 | 146 | { |
147 | - if(!$this->info->hasPath()) { |
|
147 | + if (!$this->info->hasPath()) { |
|
148 | 148 | return ''; |
149 | 149 | } |
150 | 150 | |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | { |
170 | 170 | $previous = $this->info->isParamExclusionEnabled(); |
171 | 171 | |
172 | - if($previous) |
|
172 | + if ($previous) |
|
173 | 173 | { |
174 | 174 | $this->info->setParamExclusion(false); |
175 | 175 | } |
@@ -185,19 +185,19 @@ discard block |
||
185 | 185 | { |
186 | 186 | $params = $this->resolveParams(); |
187 | 187 | |
188 | - if(empty($params)) { |
|
188 | + if (empty($params)) { |
|
189 | 189 | return ''; |
190 | 190 | } |
191 | 191 | |
192 | 192 | $tokens = array(); |
193 | 193 | $excluded = array(); |
194 | 194 | |
195 | - if($this->info->isParamExclusionEnabled()) |
|
195 | + if ($this->info->isParamExclusionEnabled()) |
|
196 | 196 | { |
197 | 197 | $excluded = $this->info->getExcludedParams(); |
198 | 198 | } |
199 | 199 | |
200 | - foreach($params as $param => $value) |
|
200 | + foreach ($params as $param => $value) |
|
201 | 201 | { |
202 | 202 | $parts = sprintf( |
203 | 203 | '<span class="link-param-name">%s</span>'. |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | |
215 | 215 | $tag = $this->resolveTag($excluded, $param); |
216 | 216 | |
217 | - if(!empty($tag)) |
|
217 | + if (!empty($tag)) |
|
218 | 218 | { |
219 | 219 | $tokens[] = sprintf($tag, $parts); |
220 | 220 | } |
@@ -228,13 +228,13 @@ discard block |
||
228 | 228 | protected function resolveTag(array $excluded, string $paramName) : string |
229 | 229 | { |
230 | 230 | // regular, non-excluded parameter |
231 | - if(!isset($excluded[$paramName])) |
|
231 | + if (!isset($excluded[$paramName])) |
|
232 | 232 | { |
233 | 233 | return '<span class="link-param">%s</span>'; |
234 | 234 | } |
235 | 235 | |
236 | 236 | // highlight excluded parameters is disabled, ignore this parameter |
237 | - if(!$this->info->isHighlightExcludeEnabled()) |
|
237 | + if (!$this->info->isHighlightExcludeEnabled()) |
|
238 | 238 | { |
239 | 239 | return ''; |
240 | 240 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | |
251 | 251 | protected function render_fragment() : string |
252 | 252 | { |
253 | - if(!$this->info->hasFragment()) { |
|
253 | + if (!$this->info->hasFragment()) { |
|
254 | 254 | return ''; |
255 | 255 | } |
256 | 256 | |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | { |
266 | 266 | $cssFolder = realpath(__DIR__.'/../../css'); |
267 | 267 | |
268 | - if($cssFolder === false) { |
|
268 | + if ($cssFolder === false) { |
|
269 | 269 | throw new BaseException( |
270 | 270 | 'Cannot find package CSS folder.', |
271 | 271 | null, |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param bool $enable Whether to turn it on or off. |
40 | 40 | * @return URLInfo_Normalizer |
41 | 41 | */ |
42 | - public function enableAuth(bool $enable=true) : URLInfo_Normalizer |
|
42 | + public function enableAuth(bool $enable = true) : URLInfo_Normalizer |
|
43 | 43 | { |
44 | 44 | $this->auth = $enable; |
45 | 45 | return $this; |
@@ -86,48 +86,48 @@ discard block |
||
86 | 86 | |
87 | 87 | protected function renderAuth(string $normalized) : string |
88 | 88 | { |
89 | - if(!$this->info->hasUsername() || !$this->auth) { |
|
89 | + if (!$this->info->hasUsername() || !$this->auth) { |
|
90 | 90 | return $normalized; |
91 | 91 | } |
92 | 92 | |
93 | - return $normalized . urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@'; |
|
93 | + return $normalized.urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@'; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | protected function renderPort(string $normalized) : string |
97 | 97 | { |
98 | - if(!$this->info->hasPort()) { |
|
98 | + if (!$this->info->hasPort()) { |
|
99 | 99 | return $normalized; |
100 | 100 | } |
101 | 101 | |
102 | - return $normalized . ':'.$this->info->getPort(); |
|
102 | + return $normalized.':'.$this->info->getPort(); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | protected function renderPath(string $normalized) : string |
106 | 106 | { |
107 | - if(!$this->info->hasPath()) { |
|
107 | + if (!$this->info->hasPath()) { |
|
108 | 108 | return $normalized; |
109 | 109 | } |
110 | 110 | |
111 | - return $normalized . $this->info->getPath(); |
|
111 | + return $normalized.$this->info->getPath(); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | protected function renderParams(string $normalized) : string |
115 | 115 | { |
116 | 116 | $params = $this->info->getParams(); |
117 | 117 | |
118 | - if(empty($params)) { |
|
118 | + if (empty($params)) { |
|
119 | 119 | return $normalized; |
120 | 120 | } |
121 | 121 | |
122 | - return $normalized . '?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986); |
|
122 | + return $normalized.'?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | protected function renderFragment(string $normalized) : string |
126 | 126 | { |
127 | - if(!$this->info->hasFragment()) { |
|
127 | + if (!$this->info->hasFragment()) { |
|
128 | 128 | return $normalized; |
129 | 129 | } |
130 | 130 | |
131 | - return $normalized . '#'.$this->info->getFragment(); |
|
131 | + return $normalized.'#'.$this->info->getFragment(); |
|
132 | 132 | } |
133 | 133 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | $result = array(); |
48 | 48 | |
49 | - foreach($parts as $part) |
|
49 | + foreach ($parts as $part) |
|
50 | 50 | { |
51 | 51 | $tokens = explode('=', $part); |
52 | 52 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | $trimmed = trim($name); |
57 | 57 | |
58 | - if(empty($trimmed)) |
|
58 | + if (empty($trimmed)) |
|
59 | 59 | { |
60 | 60 | continue; |
61 | 61 | } |