@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class URLInfo_Highlighter |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var URLInfo |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var URLInfo |
|
| 25 | + */ |
|
| 26 | 26 | protected $info; |
| 27 | 27 | |
| 28 | 28 | public function __construct(URLInfo $info) |
@@ -158,13 +158,13 @@ discard block |
||
| 158 | 158 | ); |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - /** |
|
| 162 | - * Fetches all parameters in the URL, regardless of |
|
| 163 | - * whether parameter exclusion is enabled, so they |
|
| 164 | - * can be highlighted is need be. |
|
| 165 | - * |
|
| 166 | - * @return array |
|
| 167 | - */ |
|
| 161 | + /** |
|
| 162 | + * Fetches all parameters in the URL, regardless of |
|
| 163 | + * whether parameter exclusion is enabled, so they |
|
| 164 | + * can be highlighted is need be. |
|
| 165 | + * |
|
| 166 | + * @return array |
|
| 167 | + */ |
|
| 168 | 168 | protected function resolveParams() : array |
| 169 | 169 | { |
| 170 | 170 | $previous = $this->info->isParamExclusionEnabled(); |
@@ -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, |
@@ -20,24 +20,24 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class URLInfo_Parser |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var string |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var string |
|
| 25 | + */ |
|
| 26 | 26 | protected $url; |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @var bool |
|
| 30 | - */ |
|
| 28 | + /** |
|
| 29 | + * @var bool |
|
| 30 | + */ |
|
| 31 | 31 | protected $isValid = false; |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @var array |
|
| 35 | - */ |
|
| 33 | + /** |
|
| 34 | + * @var array |
|
| 35 | + */ |
|
| 36 | 36 | protected $info; |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @var array|NULL |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @var array|NULL |
|
| 40 | + */ |
|
| 41 | 41 | protected $error; |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -177,11 +177,11 @@ discard block |
||
| 177 | 177 | return false; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - /** |
|
| 181 | - * Goes through all information in the parse_url result |
|
| 182 | - * array, and attempts to fix any user errors in formatting |
|
| 183 | - * that can be recovered from, mostly regarding stray spaces. |
|
| 184 | - */ |
|
| 180 | + /** |
|
| 181 | + * Goes through all information in the parse_url result |
|
| 182 | + * array, and attempts to fix any user errors in formatting |
|
| 183 | + * that can be recovered from, mostly regarding stray spaces. |
|
| 184 | + */ |
|
| 185 | 185 | protected function filterParsed() |
| 186 | 186 | { |
| 187 | 187 | $this->info['params'] = array(); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | $this->parse(); |
| 61 | 61 | |
| 62 | - if(!$this->detectType()) { |
|
| 62 | + if (!$this->detectType()) { |
|
| 63 | 63 | $this->validate(); |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -93,11 +93,11 @@ discard block |
||
| 93 | 93 | 'phoneLink' |
| 94 | 94 | ); |
| 95 | 95 | |
| 96 | - foreach($types as $type) |
|
| 96 | + foreach ($types as $type) |
|
| 97 | 97 | { |
| 98 | 98 | $method = 'detectType_'.$type; |
| 99 | 99 | |
| 100 | - if($this->$method() === true) |
|
| 100 | + if ($this->$method() === true) |
|
| 101 | 101 | { |
| 102 | 102 | $this->isValid = true; |
| 103 | 103 | return true; |
@@ -115,11 +115,11 @@ discard block |
||
| 115 | 115 | 'hostIsPresent' |
| 116 | 116 | ); |
| 117 | 117 | |
| 118 | - foreach($validations as $validation) |
|
| 118 | + foreach ($validations as $validation) |
|
| 119 | 119 | { |
| 120 | 120 | $method = 'validate_'.$validation; |
| 121 | 121 | |
| 122 | - if($this->$method() !== true) { |
|
| 122 | + if ($this->$method() !== true) { |
|
| 123 | 123 | return; |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -132,13 +132,13 @@ discard block |
||
| 132 | 132 | // every link needs a host. This case can happen for ex, if |
| 133 | 133 | // the link starts with a typo with only one slash, like: |
| 134 | 134 | // "http:/hostname" |
| 135 | - if(isset($this->info['host'])) { |
|
| 135 | + if (isset($this->info['host'])) { |
|
| 136 | 136 | return true; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | $this->setError( |
| 140 | 140 | URLInfo::ERROR_MISSING_HOST, |
| 141 | - t('Cannot determine the link\'s host name.') . ' ' . |
|
| 141 | + t('Cannot determine the link\'s host name.').' '. |
|
| 142 | 142 | t('This usually happens when there\'s a typo somewhere.') |
| 143 | 143 | ); |
| 144 | 144 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | protected function validate_schemeIsSet() : bool |
| 149 | 149 | { |
| 150 | - if(isset($this->info['scheme'])) { |
|
| 150 | + if (isset($this->info['scheme'])) { |
|
| 151 | 151 | return true; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -164,13 +164,13 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | protected function validate_schemeIsKnown() : bool |
| 166 | 166 | { |
| 167 | - if(in_array($this->info['scheme'], $this->knownSchemes)) { |
|
| 167 | + if (in_array($this->info['scheme'], $this->knownSchemes)) { |
|
| 168 | 168 | return true; |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | $this->setError( |
| 172 | 172 | URLInfo::ERROR_INVALID_SCHEME, |
| 173 | - t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' . |
|
| 173 | + t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '. |
|
| 174 | 174 | t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes)) |
| 175 | 175 | ); |
| 176 | 176 | |
@@ -187,23 +187,23 @@ discard block |
||
| 187 | 187 | $this->info['params'] = array(); |
| 188 | 188 | $this->info['type'] = URLInfo::TYPE_URL; |
| 189 | 189 | |
| 190 | - if(isset($this->info['user'])) { |
|
| 190 | + if (isset($this->info['user'])) { |
|
| 191 | 191 | $this->info['user'] = urldecode($this->info['user']); |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - if(isset($this->info['pass'])) { |
|
| 194 | + if (isset($this->info['pass'])) { |
|
| 195 | 195 | $this->info['pass'] = urldecode($this->info['pass']); |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - if(isset($this->info['host'])) { |
|
| 198 | + if (isset($this->info['host'])) { |
|
| 199 | 199 | $this->info['host'] = str_replace(' ', '', $this->info['host']); |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - if(isset($this->info['path'])) { |
|
| 202 | + if (isset($this->info['path'])) { |
|
| 203 | 203 | $this->info['path'] = str_replace(' ', '', $this->info['path']); |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | - if(isset($this->info['query']) && !empty($this->info['query'])) |
|
| 206 | + if (isset($this->info['query']) && !empty($this->info['query'])) |
|
| 207 | 207 | { |
| 208 | 208 | $this->info['params'] = \AppUtils\ConvertHelper::parseQueryString($this->info['query']); |
| 209 | 209 | ksort($this->info['params']); |
@@ -212,12 +212,12 @@ discard block |
||
| 212 | 212 | |
| 213 | 213 | protected function detectType_email() : bool |
| 214 | 214 | { |
| 215 | - if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') { |
|
| 215 | + if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') { |
|
| 216 | 216 | $this->info['type'] = URLInfo::TYPE_EMAIL; |
| 217 | 217 | return true; |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - if(isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path'])) |
|
| 220 | + if (isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path'])) |
|
| 221 | 221 | { |
| 222 | 222 | $this->info['scheme'] = 'mailto'; |
| 223 | 223 | $this->info['type'] = URLInfo::TYPE_EMAIL; |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | protected function detectType_fragmentLink() : bool |
| 231 | 231 | { |
| 232 | - if(isset($this->info['fragment']) && !isset($this->info['scheme'])) { |
|
| 232 | + if (isset($this->info['fragment']) && !isset($this->info['scheme'])) { |
|
| 233 | 233 | $this->info['type'] = URLInfo::TYPE_FRAGMENT; |
| 234 | 234 | return true; |
| 235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | |
| 240 | 240 | protected function detectType_phoneLink() : bool |
| 241 | 241 | { |
| 242 | - if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') { |
|
| 242 | + if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') { |
|
| 243 | 243 | $this->info['type'] = URLInfo::TYPE_PHONE; |
| 244 | 244 | return true; |
| 245 | 245 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | |
| 265 | 265 | public function getErrorMessage() : string |
| 266 | 266 | { |
| 267 | - if(isset($this->error)) { |
|
| 267 | + if (isset($this->error)) { |
|
| 268 | 268 | return $this->error['message']; |
| 269 | 269 | } |
| 270 | 270 | |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | public function getErrorCode() : int |
| 275 | 275 | { |
| 276 | - if(isset($this->error)) { |
|
| 276 | + if (isset($this->error)) { |
|
| 277 | 277 | return $this->error['code']; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -27,16 +27,16 @@ |
||
| 27 | 27 | |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * We parse the query string ourselves, because the PHP implementation |
|
| 32 | - * of parse_str has limitations that do not apply to query strings. This |
|
| 33 | - * is due to the fact that parse_str has to create PHP-compatible variable |
|
| 34 | - * names from the parameters. URL parameters simply allow way more things |
|
| 35 | - * than PHP variable names. |
|
| 36 | - * |
|
| 37 | - * @param string $queryString |
|
| 38 | - * @return array |
|
| 39 | - */ |
|
| 30 | + /** |
|
| 31 | + * We parse the query string ourselves, because the PHP implementation |
|
| 32 | + * of parse_str has limitations that do not apply to query strings. This |
|
| 33 | + * is due to the fact that parse_str has to create PHP-compatible variable |
|
| 34 | + * names from the parameters. URL parameters simply allow way more things |
|
| 35 | + * than PHP variable names. |
|
| 36 | + * |
|
| 37 | + * @param string $queryString |
|
| 38 | + * @return array |
|
| 39 | + */ |
|
| 40 | 40 | public function parse(string $queryString) : array |
| 41 | 41 | { |
| 42 | 42 | // allow HTML entities notation |
@@ -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 | } |