@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | public function __construct() |
| 36 | 36 | { |
| 37 | - if(empty(self::$cacheFile)) { |
|
| 37 | + if (empty(self::$cacheFile)) { |
|
| 38 | 38 | self::$cacheFile = __DIR__.'/tlds-alpha-by-domain.txt'; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | private function load() : void |
| 60 | 60 | { |
| 61 | - if(!empty(self::$names)) { |
|
| 61 | + if (!empty(self::$names)) { |
|
| 62 | 62 | return; |
| 63 | 63 | } |
| 64 | 64 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | // Store the names as keys in the array to allow |
| 70 | 70 | // faster lookups (to avoid using in_array). |
| 71 | - foreach($names as $name) { |
|
| 71 | + foreach ($names as $name) { |
|
| 72 | 72 | self::$names[$name] = ''; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -110,38 +110,38 @@ discard block |
||
| 110 | 110 | return $this; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - /** |
|
| 114 | - * Whether to enable sorting the URLs alphabetically (disabled by default). |
|
| 115 | - * |
|
| 116 | - * @param bool $enabled |
|
| 117 | - * @return $this |
|
| 118 | - */ |
|
| 113 | + /** |
|
| 114 | + * Whether to enable sorting the URLs alphabetically (disabled by default). |
|
| 115 | + * |
|
| 116 | + * @param bool $enabled |
|
| 117 | + * @return $this |
|
| 118 | + */ |
|
| 119 | 119 | public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder |
| 120 | 120 | { |
| 121 | 121 | $this->setOption('sorting', $enabled); |
| 122 | 122 | return $this; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - /** |
|
| 126 | - * Whether to include email addresses in the search. |
|
| 127 | - * This is only relevant when using the getURLs() |
|
| 128 | - * method. |
|
| 129 | - * |
|
| 130 | - * @param bool $include |
|
| 131 | - * @return ConvertHelper_URLFinder |
|
| 132 | - */ |
|
| 125 | + /** |
|
| 126 | + * Whether to include email addresses in the search. |
|
| 127 | + * This is only relevant when using the getURLs() |
|
| 128 | + * method. |
|
| 129 | + * |
|
| 130 | + * @param bool $include |
|
| 131 | + * @return ConvertHelper_URLFinder |
|
| 132 | + */ |
|
| 133 | 133 | public function includeEmails(bool $include=true) : ConvertHelper_URLFinder |
| 134 | 134 | { |
| 135 | 135 | $this->setOption('include-emails', $include); |
| 136 | 136 | return $this; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - /** |
|
| 140 | - * Whether to omit the mailto: that is automatically added to all email addresses. |
|
| 141 | - * |
|
| 142 | - * @param bool $omit |
|
| 143 | - * @return ConvertHelper_URLFinder |
|
| 144 | - */ |
|
| 139 | + /** |
|
| 140 | + * Whether to omit the mailto: that is automatically added to all email addresses. |
|
| 141 | + * |
|
| 142 | + * @param bool $omit |
|
| 143 | + * @return ConvertHelper_URLFinder |
|
| 144 | + */ |
|
| 145 | 145 | public function omitMailto(bool $omit=true) : ConvertHelper_URLFinder |
| 146 | 146 | { |
| 147 | 147 | $this->setOption('omit-mailto', $omit); |
@@ -267,11 +267,11 @@ discard block |
||
| 267 | 267 | ); |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - /** |
|
| 271 | - * Fetches all URLs that can be found in the subject string. |
|
| 272 | - * |
|
| 273 | - * @return string[] |
|
| 274 | - */ |
|
| 270 | + /** |
|
| 271 | + * Fetches all URLs that can be found in the subject string. |
|
| 272 | + * |
|
| 273 | + * @return string[] |
|
| 274 | + */ |
|
| 275 | 275 | public function getURLs() : array |
| 276 | 276 | { |
| 277 | 277 | $this->parse(); |
@@ -474,13 +474,13 @@ discard block |
||
| 474 | 474 | return array_pop($parts); |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - /** |
|
| 478 | - * Retrieves all email addresses from the subject string. |
|
| 479 | - * |
|
| 480 | - * @return string[] |
|
| 481 | - * |
|
| 482 | - * @see omitMailto() |
|
| 483 | - */ |
|
| 477 | + /** |
|
| 478 | + * Retrieves all email addresses from the subject string. |
|
| 479 | + * |
|
| 480 | + * @return string[] |
|
| 481 | + * |
|
| 482 | + * @see omitMailto() |
|
| 483 | + */ |
|
| 484 | 484 | public function getEmails() : array |
| 485 | 485 | { |
| 486 | 486 | $this->parse(); |
@@ -506,11 +506,11 @@ discard block |
||
| 506 | 506 | return $result; |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | - /** |
|
| 510 | - * Retrieves all URLs as URLInfo instances. |
|
| 511 | - * |
|
| 512 | - * @return URLInfo[] |
|
| 513 | - */ |
|
| 509 | + /** |
|
| 510 | + * Retrieves all URLs as URLInfo instances. |
|
| 511 | + * |
|
| 512 | + * @return URLInfo[] |
|
| 513 | + */ |
|
| 514 | 514 | public function getInfos() : array |
| 515 | 515 | { |
| 516 | 516 | $this->parse(); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @param bool $enabled |
| 105 | 105 | * @return $this |
| 106 | 106 | */ |
| 107 | - public function enableNormalizing(bool $enabled=true) : ConvertHelper_URLFinder |
|
| 107 | + public function enableNormalizing(bool $enabled = true) : ConvertHelper_URLFinder |
|
| 108 | 108 | { |
| 109 | 109 | $this->setOption('normalize', $enabled); |
| 110 | 110 | return $this; |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | * @param bool $enabled |
| 117 | 117 | * @return $this |
| 118 | 118 | */ |
| 119 | - public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder |
|
| 119 | + public function enableSorting(bool $enabled = true) : ConvertHelper_URLFinder |
|
| 120 | 120 | { |
| 121 | 121 | $this->setOption('sorting', $enabled); |
| 122 | 122 | return $this; |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * @param bool $include |
| 131 | 131 | * @return ConvertHelper_URLFinder |
| 132 | 132 | */ |
| 133 | - public function includeEmails(bool $include=true) : ConvertHelper_URLFinder |
|
| 133 | + public function includeEmails(bool $include = true) : ConvertHelper_URLFinder |
|
| 134 | 134 | { |
| 135 | 135 | $this->setOption('include-emails', $include); |
| 136 | 136 | return $this; |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @param bool $omit |
| 143 | 143 | * @return ConvertHelper_URLFinder |
| 144 | 144 | */ |
| 145 | - public function omitMailto(bool $omit=true) : ConvertHelper_URLFinder |
|
| 145 | + public function omitMailto(bool $omit = true) : ConvertHelper_URLFinder |
|
| 146 | 146 | { |
| 147 | 147 | $this->setOption('omit-mailto', $omit); |
| 148 | 148 | return $this; |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | { |
| 170 | 170 | $line = $this->analyzeLine($line); |
| 171 | 171 | |
| 172 | - if($line !== null) { |
|
| 172 | + if ($line !== null) { |
|
| 173 | 173 | $keep[] = $line; |
| 174 | 174 | } |
| 175 | 175 | } |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $line = trim($line, '.'); |
| 191 | 191 | |
| 192 | 192 | // Handle detecting an URI scheme |
| 193 | - if(strstr($line, ':') !== false) |
|
| 193 | + if (strstr($line, ':') !== false) |
|
| 194 | 194 | { |
| 195 | 195 | $scheme = URLInfo_Schemes::detectScheme($line); |
| 196 | 196 | |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | // detect are email addresses and domain names. |
| 205 | 205 | |
| 206 | 206 | // No dot? Then it's certainly not a domain name. |
| 207 | - if(strstr($line, '.') === false) { |
|
| 207 | + if (strstr($line, '.') === false) { |
|
| 208 | 208 | return null; |
| 209 | 209 | } |
| 210 | 210 | |
@@ -222,10 +222,10 @@ discard block |
||
| 222 | 222 | { |
| 223 | 223 | $subject = stripslashes($subject); |
| 224 | 224 | |
| 225 | - foreach($this->detectors as $detector) |
|
| 225 | + foreach ($this->detectors as $detector) |
|
| 226 | 226 | { |
| 227 | 227 | // Avoid processing the string if it is not needed. |
| 228 | - if($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_BEFORE || !$detector->isValidFor($subject)) { |
|
| 228 | + if ($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_BEFORE || !$detector->isValidFor($subject)) { |
|
| 229 | 229 | continue; |
| 230 | 230 | } |
| 231 | 231 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | { |
| 247 | 247 | $detector = new $className(); |
| 248 | 248 | |
| 249 | - if($detector instanceof ConvertHelper_URLFinder_Detector) |
|
| 249 | + if ($detector instanceof ConvertHelper_URLFinder_Detector) |
|
| 250 | 250 | { |
| 251 | 251 | return $detector; |
| 252 | 252 | } |
@@ -273,12 +273,12 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | $result = $this->getItemsAsString($this->urls); |
| 275 | 275 | |
| 276 | - if($this->getBoolOption('include-emails')) |
|
| 276 | + if ($this->getBoolOption('include-emails')) |
|
| 277 | 277 | { |
| 278 | 278 | $result = array_merge($result, $this->getEmails()); |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - if($this->getBoolOption('sorting')) |
|
| 281 | + if ($this->getBoolOption('sorting')) |
|
| 282 | 282 | { |
| 283 | 283 | usort($result, function(string $a, string $b) { |
| 284 | 284 | return strnatcasecmp($a, $b); |
@@ -298,12 +298,12 @@ discard block |
||
| 298 | 298 | |
| 299 | 299 | $result = array(); |
| 300 | 300 | |
| 301 | - foreach($collection as $url => $info) { |
|
| 302 | - if($normalize) { |
|
| 301 | + foreach ($collection as $url => $info) { |
|
| 302 | + if ($normalize) { |
|
| 303 | 303 | $url = $info->getNormalized(); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | - if(!in_array($url, $result)) { |
|
| 306 | + if (!in_array($url, $result)) { |
|
| 307 | 307 | $result[] = $url; |
| 308 | 308 | } |
| 309 | 309 | } |
@@ -320,9 +320,9 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | private function initDetectors() : void |
| 322 | 322 | { |
| 323 | - foreach($this->enabledDetectorClasses as $className => $enabled) |
|
| 323 | + foreach ($this->enabledDetectorClasses as $className => $enabled) |
|
| 324 | 324 | { |
| 325 | - if($enabled) { |
|
| 325 | + if ($enabled) { |
|
| 326 | 326 | $this->detectors[] = $this->createDetector($className); |
| 327 | 327 | } |
| 328 | 328 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | private function parse() : void |
| 339 | 339 | { |
| 340 | - if($this->parsed) { |
|
| 340 | + if ($this->parsed) { |
|
| 341 | 341 | return; |
| 342 | 342 | } |
| 343 | 343 | |
@@ -348,11 +348,11 @@ discard block |
||
| 348 | 348 | |
| 349 | 349 | unset($this->subject); |
| 350 | 350 | |
| 351 | - foreach($this->matches as $match) |
|
| 351 | + foreach ($this->matches as $match) |
|
| 352 | 352 | { |
| 353 | 353 | $info = parseURL($match); |
| 354 | 354 | |
| 355 | - if($info->isEmail()) |
|
| 355 | + if ($info->isEmail()) |
|
| 356 | 356 | { |
| 357 | 357 | $this->emails[$this->filterEmailAddress($match)] = $info; |
| 358 | 358 | continue; |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | * @param bool $enable |
| 369 | 369 | * @return $this |
| 370 | 370 | */ |
| 371 | - public function enableHTMLAttributes(bool $enable=true) : ConvertHelper_URLFinder |
|
| 371 | + public function enableHTMLAttributes(bool $enable = true) : ConvertHelper_URLFinder |
|
| 372 | 372 | { |
| 373 | 373 | $this->enabledDetectorClasses[ConvertHelper_URLFinder_Detector_HTMLAttributes::class] = $enable; |
| 374 | 374 | return $this; |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | */ |
| 384 | 384 | private function filterEmailAddress(string $email) : string |
| 385 | 385 | { |
| 386 | - if(stristr($email, 'mailto:') === false) { |
|
| 386 | + if (stristr($email, 'mailto:') === false) { |
|
| 387 | 387 | $email = 'mailto:'.$email; |
| 388 | 388 | } |
| 389 | 389 | |
@@ -405,14 +405,14 @@ discard block |
||
| 405 | 405 | foreach ($lines as $line) |
| 406 | 406 | { |
| 407 | 407 | $scheme = URLInfo_Schemes::detectScheme($line); |
| 408 | - if($scheme !== null) { |
|
| 408 | + if ($scheme !== null) { |
|
| 409 | 409 | $this->matches[] = $line; |
| 410 | 410 | continue; |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | $extension = $this->detectDomainExtension($line); |
| 414 | 414 | |
| 415 | - if($domains->nameExists($extension)) { |
|
| 415 | + if ($domains->nameExists($extension)) { |
|
| 416 | 416 | $this->matches[] = $line; |
| 417 | 417 | } |
| 418 | 418 | } |
@@ -431,9 +431,9 @@ discard block |
||
| 431 | 431 | |
| 432 | 432 | $subject = str_replace($remove, ' ', $subject); |
| 433 | 433 | |
| 434 | - foreach($this->detectors as $detector) |
|
| 434 | + foreach ($this->detectors as $detector) |
|
| 435 | 435 | { |
| 436 | - if($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_AFTER || !$detector->isValidFor($subject)) { |
|
| 436 | + if ($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_AFTER || !$detector->isValidFor($subject)) { |
|
| 437 | 437 | continue; |
| 438 | 438 | } |
| 439 | 439 | |
@@ -456,8 +456,8 @@ discard block |
||
| 456 | 456 | $boundaries = array('/', '?'); |
| 457 | 457 | |
| 458 | 458 | // Remove the path or query parts to access the domain extension only |
| 459 | - foreach($boundaries as $boundary) { |
|
| 460 | - if(strstr($url, $boundary)) { |
|
| 459 | + foreach ($boundaries as $boundary) { |
|
| 460 | + if (strstr($url, $boundary)) { |
|
| 461 | 461 | $parts = explode($boundary, $url); |
| 462 | 462 | $url = array_shift($parts); |
| 463 | 463 | break; |
@@ -482,16 +482,16 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | $result = $this->getItemsAsString($this->emails); |
| 484 | 484 | |
| 485 | - if($this->getBoolOption('omit-mailto')) { |
|
| 485 | + if ($this->getBoolOption('omit-mailto')) { |
|
| 486 | 486 | $keep = array(); |
| 487 | - foreach($result as $email) { |
|
| 487 | + foreach ($result as $email) { |
|
| 488 | 488 | $keep[] = str_replace('mailto:', '', $email); |
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | $result = $keep; |
| 492 | 492 | } |
| 493 | 493 | |
| 494 | - if($this->getBoolOption('sorting')) |
|
| 494 | + if ($this->getBoolOption('sorting')) |
|
| 495 | 495 | { |
| 496 | 496 | usort($result, function(string $a, string $b) { |
| 497 | 497 | return strnatcasecmp($a, $b); |
@@ -513,16 +513,16 @@ discard block |
||
| 513 | 513 | $result = array(); |
| 514 | 514 | $normalize = $this->getBoolOption('normalize'); |
| 515 | 515 | |
| 516 | - foreach($this->urls as $url => $info) |
|
| 516 | + foreach ($this->urls as $url => $info) |
|
| 517 | 517 | { |
| 518 | - if($normalize) { |
|
| 518 | + if ($normalize) { |
|
| 519 | 519 | $url = $info->getNormalized(); |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | $result[$url] = $info; |
| 523 | 523 | } |
| 524 | 524 | |
| 525 | - if($this->getBoolOption('sorting')) |
|
| 525 | + if ($this->getBoolOption('sorting')) |
|
| 526 | 526 | { |
| 527 | 527 | ksort($result); |
| 528 | 528 | } |
@@ -23,24 +23,24 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | class URLInfo_Parser |
| 25 | 25 | { |
| 26 | - /** |
|
| 27 | - * @var string |
|
| 28 | - */ |
|
| 26 | + /** |
|
| 27 | + * @var string |
|
| 28 | + */ |
|
| 29 | 29 | protected $url; |
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * @var bool |
|
| 33 | - */ |
|
| 31 | + /** |
|
| 32 | + * @var bool |
|
| 33 | + */ |
|
| 34 | 34 | protected $isValid = false; |
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @var array |
|
| 38 | - */ |
|
| 36 | + /** |
|
| 37 | + * @var array |
|
| 38 | + */ |
|
| 39 | 39 | protected $info; |
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @var array|NULL |
|
| 43 | - */ |
|
| 41 | + /** |
|
| 42 | + * @var array|NULL |
|
| 43 | + */ |
|
| 44 | 44 | protected $error; |
| 45 | 45 | |
| 46 | 46 | /** |
@@ -57,25 +57,25 @@ discard block |
||
| 57 | 57 | 'git' |
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * Stores a list of all unicode characters in the URL |
|
| 62 | - * that have been filtered out before parsing it with |
|
| 63 | - * parse_url. |
|
| 64 | - * |
|
| 65 | - * @var string[]string |
|
| 66 | - */ |
|
| 60 | + /** |
|
| 61 | + * Stores a list of all unicode characters in the URL |
|
| 62 | + * that have been filtered out before parsing it with |
|
| 63 | + * parse_url. |
|
| 64 | + * |
|
| 65 | + * @var string[]string |
|
| 66 | + */ |
|
| 67 | 67 | protected $unicodeChars = array(); |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @var bool |
|
| 71 | - */ |
|
| 69 | + /** |
|
| 70 | + * @var bool |
|
| 71 | + */ |
|
| 72 | 72 | protected $encodeUTF = false; |
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * |
|
| 76 | - * @param string $url The target URL. |
|
| 77 | - * @param bool $encodeUTF Whether to URL encode any plain text unicode characters. |
|
| 78 | - */ |
|
| 74 | + /** |
|
| 75 | + * |
|
| 76 | + * @param string $url The target URL. |
|
| 77 | + * @param bool $encodeUTF Whether to URL encode any plain text unicode characters. |
|
| 78 | + */ |
|
| 79 | 79 | public function __construct(string $url, bool $encodeUTF) |
| 80 | 80 | { |
| 81 | 81 | $this->url = $url; |
@@ -88,12 +88,12 @@ discard block |
||
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * Retrieves the array as parsed by PHP's parse_url, |
|
| 93 | - * filtered and adjusted as necessary. |
|
| 94 | - * |
|
| 95 | - * @return array |
|
| 96 | - */ |
|
| 91 | + /** |
|
| 92 | + * Retrieves the array as parsed by PHP's parse_url, |
|
| 93 | + * filtered and adjusted as necessary. |
|
| 94 | + * |
|
| 95 | + * @return array |
|
| 96 | + */ |
|
| 97 | 97 | public function getInfo() : array |
| 98 | 98 | { |
| 99 | 99 | return $this->info; |
@@ -115,11 +115,11 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - /** |
|
| 119 | - * Finds any non-url encoded unicode characters in |
|
| 120 | - * the URL, and encodes them before the URL is |
|
| 121 | - * passed to parse_url. |
|
| 122 | - */ |
|
| 118 | + /** |
|
| 119 | + * Finds any non-url encoded unicode characters in |
|
| 120 | + * the URL, and encodes them before the URL is |
|
| 121 | + * passed to parse_url. |
|
| 122 | + */ |
|
| 123 | 123 | protected function filterUnicodeChars() : void |
| 124 | 124 | { |
| 125 | 125 | $chars = ConvertHelper::string2array($this->url); |
@@ -238,11 +238,11 @@ discard block |
||
| 238 | 238 | return false; |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | - /** |
|
| 242 | - * Goes through all information in the parse_url result |
|
| 243 | - * array, and attempts to fix any user errors in formatting |
|
| 244 | - * that can be recovered from, mostly regarding stray spaces. |
|
| 245 | - */ |
|
| 241 | + /** |
|
| 242 | + * Goes through all information in the parse_url result |
|
| 243 | + * array, and attempts to fix any user errors in formatting |
|
| 244 | + * that can be recovered from, mostly regarding stray spaces. |
|
| 245 | + */ |
|
| 246 | 246 | protected function filterParsed() : void |
| 247 | 247 | { |
| 248 | 248 | $this->info['params'] = array(); |
@@ -284,13 +284,13 @@ discard block |
||
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | - /** |
|
| 288 | - * Recursively goes through the array, and converts all previously |
|
| 289 | - * URL encoded characters with their unicode character counterparts. |
|
| 290 | - * |
|
| 291 | - * @param array $subject |
|
| 292 | - * @return array |
|
| 293 | - */ |
|
| 287 | + /** |
|
| 288 | + * Recursively goes through the array, and converts all previously |
|
| 289 | + * URL encoded characters with their unicode character counterparts. |
|
| 290 | + * |
|
| 291 | + * @param array $subject |
|
| 292 | + * @return array |
|
| 293 | + */ |
|
| 294 | 294 | protected function restoreUnicodeChars(array $subject) : array |
| 295 | 295 | { |
| 296 | 296 | $result = array(); |
@@ -314,13 +314,13 @@ discard block |
||
| 314 | 314 | return $result; |
| 315 | 315 | } |
| 316 | 316 | |
| 317 | - /** |
|
| 318 | - * Replaces all URL encoded unicode characters |
|
| 319 | - * in the string with the unicode character. |
|
| 320 | - * |
|
| 321 | - * @param string $string |
|
| 322 | - * @return string |
|
| 323 | - */ |
|
| 317 | + /** |
|
| 318 | + * Replaces all URL encoded unicode characters |
|
| 319 | + * in the string with the unicode character. |
|
| 320 | + * |
|
| 321 | + * @param string $string |
|
| 322 | + * @return string |
|
| 323 | + */ |
|
| 324 | 324 | protected function restoreUnicodeChar(string $string) : string |
| 325 | 325 | { |
| 326 | 326 | if(strstr($string, '%')) |
@@ -404,21 +404,21 @@ discard block |
||
| 404 | 404 | ); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | - /** |
|
| 408 | - * Checks whether the URL that was parsed is valid. |
|
| 409 | - * @return bool |
|
| 410 | - */ |
|
| 407 | + /** |
|
| 408 | + * Checks whether the URL that was parsed is valid. |
|
| 409 | + * @return bool |
|
| 410 | + */ |
|
| 411 | 411 | public function isValid() : bool |
| 412 | 412 | { |
| 413 | 413 | return $this->isValid; |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - /** |
|
| 417 | - * If the validation failed, retrieves the validation |
|
| 418 | - * error message. |
|
| 419 | - * |
|
| 420 | - * @return string |
|
| 421 | - */ |
|
| 416 | + /** |
|
| 417 | + * If the validation failed, retrieves the validation |
|
| 418 | + * error message. |
|
| 419 | + * |
|
| 420 | + * @return string |
|
| 421 | + */ |
|
| 422 | 422 | public function getErrorMessage() : string |
| 423 | 423 | { |
| 424 | 424 | if(isset($this->error)) { |
@@ -428,12 +428,12 @@ discard block |
||
| 428 | 428 | return ''; |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | - /** |
|
| 432 | - * If the validation failed, retrieves the validation |
|
| 433 | - * error code. |
|
| 434 | - * |
|
| 435 | - * @return int |
|
| 436 | - */ |
|
| 431 | + /** |
|
| 432 | + * If the validation failed, retrieves the validation |
|
| 433 | + * error code. |
|
| 434 | + * |
|
| 435 | + * @return int |
|
| 436 | + */ |
|
| 437 | 437 | public function getErrorCode() : int |
| 438 | 438 | { |
| 439 | 439 | if(isset($this->error)) { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $this->parse(); |
| 85 | 85 | |
| 86 | - if(!$this->detectType()) { |
|
| 86 | + if (!$this->detectType()) { |
|
| 87 | 87 | $this->validate(); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | // if the URL contains any URL characters, and we |
| 111 | 111 | // do not want them URL encoded, restore them. |
| 112 | - if(!$this->encodeUTF && !empty($this->unicodeChars)) |
|
| 112 | + if (!$this->encodeUTF && !empty($this->unicodeChars)) |
|
| 113 | 113 | { |
| 114 | 114 | $this->info = $this->restoreUnicodeChars($this->info); |
| 115 | 115 | } |
@@ -126,13 +126,13 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | $keep = array(); |
| 128 | 128 | |
| 129 | - foreach($chars as $char) |
|
| 129 | + foreach ($chars as $char) |
|
| 130 | 130 | { |
| 131 | - if(preg_match('/\p{L}/usix', $char)) |
|
| 131 | + if (preg_match('/\p{L}/usix', $char)) |
|
| 132 | 132 | { |
| 133 | 133 | $encoded = rawurlencode($char); |
| 134 | 134 | |
| 135 | - if($encoded != $char) |
|
| 135 | + if ($encoded != $char) |
|
| 136 | 136 | { |
| 137 | 137 | $this->unicodeChars[$encoded] = $char; |
| 138 | 138 | $char = $encoded; |
@@ -154,11 +154,11 @@ discard block |
||
| 154 | 154 | 'ipAddress' |
| 155 | 155 | ); |
| 156 | 156 | |
| 157 | - foreach($types as $type) |
|
| 157 | + foreach ($types as $type) |
|
| 158 | 158 | { |
| 159 | 159 | $method = 'detectType_'.$type; |
| 160 | 160 | |
| 161 | - if($this->$method() === true) |
|
| 161 | + if ($this->$method() === true) |
|
| 162 | 162 | { |
| 163 | 163 | $this->isValid = true; |
| 164 | 164 | return true; |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | 'hostIsPresent' |
| 177 | 177 | ); |
| 178 | 178 | |
| 179 | - foreach($validations as $validation) |
|
| 179 | + foreach ($validations as $validation) |
|
| 180 | 180 | { |
| 181 | 181 | $method = 'validate_'.$validation; |
| 182 | 182 | |
| 183 | - if($this->$method() !== true) { |
|
| 183 | + if ($this->$method() !== true) { |
|
| 184 | 184 | return; |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -193,13 +193,13 @@ discard block |
||
| 193 | 193 | // every link needs a host. This case can happen for ex, if |
| 194 | 194 | // the link starts with a typo with only one slash, like: |
| 195 | 195 | // "http:/hostname" |
| 196 | - if(isset($this->info['host'])) { |
|
| 196 | + if (isset($this->info['host'])) { |
|
| 197 | 197 | return true; |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $this->setError( |
| 201 | 201 | URLInfo::ERROR_MISSING_HOST, |
| 202 | - t('Cannot determine the link\'s host name.') . ' ' . |
|
| 202 | + t('Cannot determine the link\'s host name.').' '. |
|
| 203 | 203 | t('This usually happens when there\'s a typo somewhere.') |
| 204 | 204 | ); |
| 205 | 205 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | protected function validate_schemeIsSet() : bool |
| 210 | 210 | { |
| 211 | - if(isset($this->info['scheme'])) { |
|
| 211 | + if (isset($this->info['scheme'])) { |
|
| 212 | 212 | return true; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -225,13 +225,13 @@ discard block |
||
| 225 | 225 | |
| 226 | 226 | protected function validate_schemeIsKnown() : bool |
| 227 | 227 | { |
| 228 | - if(in_array($this->info['scheme'], $this->knownSchemes)) { |
|
| 228 | + if (in_array($this->info['scheme'], $this->knownSchemes)) { |
|
| 229 | 229 | return true; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | $this->setError( |
| 233 | 233 | URLInfo::ERROR_INVALID_SCHEME, |
| 234 | - t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' . |
|
| 234 | + t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '. |
|
| 235 | 235 | t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes)) |
| 236 | 236 | ); |
| 237 | 237 | |
@@ -248,36 +248,36 @@ discard block |
||
| 248 | 248 | $this->info['params'] = array(); |
| 249 | 249 | $this->info['type'] = URLInfo::TYPE_URL; |
| 250 | 250 | |
| 251 | - if(isset($this->info['scheme'])) |
|
| 251 | + if (isset($this->info['scheme'])) |
|
| 252 | 252 | { |
| 253 | 253 | $this->info['scheme'] = strtolower($this->info['scheme']); |
| 254 | 254 | } |
| 255 | 255 | else |
| 256 | 256 | { |
| 257 | 257 | $scheme = URLInfo_Schemes::detectScheme($this->url); |
| 258 | - if(!empty($scheme)) { |
|
| 259 | - $this->info['scheme'] = substr($scheme,0, strpos($scheme, ':')); |
|
| 258 | + if (!empty($scheme)) { |
|
| 259 | + $this->info['scheme'] = substr($scheme, 0, strpos($scheme, ':')); |
|
| 260 | 260 | } |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | - if(isset($this->info['user'])) { |
|
| 263 | + if (isset($this->info['user'])) { |
|
| 264 | 264 | $this->info['user'] = urldecode($this->info['user']); |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - if(isset($this->info['pass'])) { |
|
| 267 | + if (isset($this->info['pass'])) { |
|
| 268 | 268 | $this->info['pass'] = urldecode($this->info['pass']); |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | - if(isset($this->info['host'])) { |
|
| 271 | + if (isset($this->info['host'])) { |
|
| 272 | 272 | $this->info['host'] = strtolower($this->info['host']); |
| 273 | 273 | $this->info['host'] = str_replace(' ', '', $this->info['host']); |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - if(isset($this->info['path'])) { |
|
| 276 | + if (isset($this->info['path'])) { |
|
| 277 | 277 | $this->info['path'] = str_replace(' ', '', $this->info['path']); |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - if(isset($this->info['query']) && !empty($this->info['query'])) |
|
| 280 | + if (isset($this->info['query']) && !empty($this->info['query'])) |
|
| 281 | 281 | { |
| 282 | 282 | $this->info['params'] = ConvertHelper::parseQueryString($this->info['query']); |
| 283 | 283 | ksort($this->info['params']); |
@@ -295,9 +295,9 @@ discard block |
||
| 295 | 295 | { |
| 296 | 296 | $result = array(); |
| 297 | 297 | |
| 298 | - foreach($subject as $key => $val) |
|
| 298 | + foreach ($subject as $key => $val) |
|
| 299 | 299 | { |
| 300 | - if(is_array($val)) |
|
| 300 | + if (is_array($val)) |
|
| 301 | 301 | { |
| 302 | 302 | $val = $this->restoreUnicodeChars($val); |
| 303 | 303 | } |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | */ |
| 324 | 324 | protected function restoreUnicodeChar(string $string) : string |
| 325 | 325 | { |
| 326 | - if(strstr($string, '%')) |
|
| 326 | + if (strstr($string, '%')) |
|
| 327 | 327 | { |
| 328 | 328 | return str_replace(array_keys($this->unicodeChars), array_values($this->unicodeChars), $string); |
| 329 | 329 | } |
@@ -333,12 +333,12 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | protected function detectType_email() : bool |
| 335 | 335 | { |
| 336 | - if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') { |
|
| 336 | + if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') { |
|
| 337 | 337 | $this->info['type'] = URLInfo::TYPE_EMAIL; |
| 338 | 338 | return true; |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | - if(isset($this->info['path']) && preg_match(RegexHelper::REGEX_EMAIL, $this->info['path'])) |
|
| 341 | + if (isset($this->info['path']) && preg_match(RegexHelper::REGEX_EMAIL, $this->info['path'])) |
|
| 342 | 342 | { |
| 343 | 343 | $this->info['scheme'] = 'mailto'; |
| 344 | 344 | $this->info['type'] = URLInfo::TYPE_EMAIL; |
@@ -350,13 +350,13 @@ discard block |
||
| 350 | 350 | |
| 351 | 351 | protected function detectType_ipAddress() : bool |
| 352 | 352 | { |
| 353 | - if($this->isPathOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['path'])) { |
|
| 353 | + if ($this->isPathOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['path'])) { |
|
| 354 | 354 | $this->info['host'] = $this->info['path']; |
| 355 | 355 | $this->info['scheme'] = 'https'; |
| 356 | 356 | unset($this->info['path']); |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | - if($this->isHostOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['host'])) { |
|
| 359 | + if ($this->isHostOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['host'])) { |
|
| 360 | 360 | $this->info['ip'] = $this->info['host']; |
| 361 | 361 | return true; |
| 362 | 362 | } |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | |
| 377 | 377 | protected function detectType_fragmentLink() : bool |
| 378 | 378 | { |
| 379 | - if(isset($this->info['fragment']) && !isset($this->info['scheme'])) { |
|
| 379 | + if (isset($this->info['fragment']) && !isset($this->info['scheme'])) { |
|
| 380 | 380 | $this->info['type'] = URLInfo::TYPE_FRAGMENT; |
| 381 | 381 | return true; |
| 382 | 382 | } |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | protected function detectType_phoneLink() : bool |
| 388 | 388 | { |
| 389 | - if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') { |
|
| 389 | + if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') { |
|
| 390 | 390 | $this->info['type'] = URLInfo::TYPE_PHONE; |
| 391 | 391 | return true; |
| 392 | 392 | } |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | */ |
| 422 | 422 | public function getErrorMessage() : string |
| 423 | 423 | { |
| 424 | - if(isset($this->error)) { |
|
| 424 | + if (isset($this->error)) { |
|
| 425 | 425 | return $this->error['message']; |
| 426 | 426 | } |
| 427 | 427 | |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | */ |
| 437 | 437 | public function getErrorCode() : int |
| 438 | 438 | { |
| 439 | - if(isset($this->error)) { |
|
| 439 | + if (isset($this->error)) { |
|
| 440 | 440 | return $this->error['code']; |
| 441 | 441 | } |
| 442 | 442 | |
@@ -251,8 +251,7 @@ discard block |
||
| 251 | 251 | if(isset($this->info['scheme'])) |
| 252 | 252 | { |
| 253 | 253 | $this->info['scheme'] = strtolower($this->info['scheme']); |
| 254 | - } |
|
| 255 | - else |
|
| 254 | + } else |
|
| 256 | 255 | { |
| 257 | 256 | $scheme = URLInfo_Schemes::detectScheme($this->url); |
| 258 | 257 | if(!empty($scheme)) { |
@@ -300,8 +299,7 @@ discard block |
||
| 300 | 299 | if(is_array($val)) |
| 301 | 300 | { |
| 302 | 301 | $val = $this->restoreUnicodeChars($val); |
| 303 | - } |
|
| 304 | - else |
|
| 302 | + } else |
|
| 305 | 303 | { |
| 306 | 304 | $val = $this->restoreUnicodeChar($val); |
| 307 | 305 | } |
@@ -72,8 +72,8 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | self::buildCache(); |
| 74 | 74 | |
| 75 | - foreach(self::$cache as $scheme => $length) { |
|
| 76 | - if(strtolower(substr($url, 0, $length)) === $scheme) { |
|
| 75 | + foreach (self::$cache as $scheme => $length) { |
|
| 76 | + if (strtolower(substr($url, 0, $length)) === $scheme) { |
|
| 77 | 77 | return $scheme; |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -88,11 +88,11 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | private static function buildCache() : void |
| 90 | 90 | { |
| 91 | - if(!empty(self::$cache)) { |
|
| 91 | + if (!empty(self::$cache)) { |
|
| 92 | 92 | return; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - foreach(self::$schemes as $scheme) { |
|
| 95 | + foreach (self::$schemes as $scheme) { |
|
| 96 | 96 | self::$cache[$scheme] = strlen($scheme); |
| 97 | 97 | } |
| 98 | 98 | } |
@@ -42,10 +42,10 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | const REGEX_MD5 = '/^[a-f0-9]{32}$/i'; |
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var string |
|
| 47 | - * @see https://en.wikipedia.org/wiki/Email_address#Local-part |
|
| 48 | - */ |
|
| 45 | + /** |
|
| 46 | + * @var string |
|
| 47 | + * @see https://en.wikipedia.org/wiki/Email_address#Local-part |
|
| 48 | + */ |
|
| 49 | 49 | const REGEX_EMAIL = '/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i'; |
| 50 | 50 | |
| 51 | 51 | const REGEX_PHONE = '/\A[+0-9][0-9 +\-()]+\z/m'; |
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | */ |
| 98 | 98 | const REGEX_IS_HTML = '%<{0,1}[a-z\/][\s\S]*>|<[a-z\/][\s\S]*>{0,1}%i'; |
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * Hexadecimal color codes. Allows the following formats: |
|
| 102 | - * |
|
| 103 | - * FFFFFF |
|
| 104 | - * FFF |
|
| 105 | - * |
|
| 106 | - * @var string |
|
| 107 | - */ |
|
| 100 | + /** |
|
| 101 | + * Hexadecimal color codes. Allows the following formats: |
|
| 102 | + * |
|
| 103 | + * FFFFFF |
|
| 104 | + * FFF |
|
| 105 | + * |
|
| 106 | + * @var string |
|
| 107 | + */ |
|
| 108 | 108 | const REGEX_HEX_COLOR_CODE = '/\A(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\z/iU'; |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -33,14 +33,14 @@ |
||
| 33 | 33 | { |
| 34 | 34 | preg_match_all('%<([A-Z][A-Z0-9]*)\b[^>]*>(.*?)</\1>%si', $html, $result, PREG_PATTERN_ORDER); |
| 35 | 35 | |
| 36 | - if(empty($result[1])) { |
|
| 36 | + if (empty($result[1])) { |
|
| 37 | 37 | return '<p>'.$text.'</p>'; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $tagName = array_pop($result[1]); |
| 41 | 41 | $pos = strrpos($html, '</'.$tagName.'>'); |
| 42 | 42 | |
| 43 | - if(in_array(strtolower($tagName), self::$newParaTags)) { |
|
| 43 | + if (in_array(strtolower($tagName), self::$newParaTags)) { |
|
| 44 | 44 | $replace = '</'.$tagName.'><p>'.$text.'</p>'; |
| 45 | 45 | } else { |
| 46 | 46 | $replace = $text.'</'.$tagName.'>'; |
@@ -25,10 +25,10 @@ |
||
| 25 | 25 | * |
| 26 | 26 | * @return string |
| 27 | 27 | */ |
| 28 | - function render() : string; |
|
| 28 | + function render() : string; |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Renders the string and echos it. |
| 32 | 32 | */ |
| 33 | - function display() : void; |
|
| 33 | + function display() : void; |
|
| 34 | 34 | } |
@@ -41,14 +41,14 @@ discard block |
||
| 41 | 41 | const TOKEN_MONTHS = 'm'; |
| 42 | 42 | const TOKEN_YEARS = 'y'; |
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @var DateInterval |
|
| 46 | - */ |
|
| 44 | + /** |
|
| 45 | + * @var DateInterval |
|
| 46 | + */ |
|
| 47 | 47 | protected $interval; |
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @var int |
|
| 51 | - */ |
|
| 49 | + /** |
|
| 50 | + * @var int |
|
| 51 | + */ |
|
| 52 | 52 | protected $seconds; |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -92,22 +92,22 @@ discard block |
||
| 92 | 92 | return new ConvertHelper_DateInterval($seconds); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * Creates the interval from an existing regular interval instance. |
|
| 97 | - * |
|
| 98 | - * @param DateInterval $interval |
|
| 99 | - * @return ConvertHelper_DateInterval |
|
| 100 | - */ |
|
| 95 | + /** |
|
| 96 | + * Creates the interval from an existing regular interval instance. |
|
| 97 | + * |
|
| 98 | + * @param DateInterval $interval |
|
| 99 | + * @return ConvertHelper_DateInterval |
|
| 100 | + */ |
|
| 101 | 101 | public static function fromInterval(DateInterval $interval) |
| 102 | 102 | { |
| 103 | 103 | return self::fromSeconds(ConvertHelper::interval2seconds($interval)); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - /** |
|
| 107 | - * Retrieves the PHP native date interval. |
|
| 108 | - * |
|
| 109 | - * @return DateInterval |
|
| 110 | - */ |
|
| 106 | + /** |
|
| 107 | + * Retrieves the PHP native date interval. |
|
| 108 | + * |
|
| 109 | + * @return DateInterval |
|
| 110 | + */ |
|
| 111 | 111 | public function getInterval() : DateInterval |
| 112 | 112 | { |
| 113 | 113 | return $this->interval; |
@@ -143,31 +143,31 @@ discard block |
||
| 143 | 143 | return $this->getToken(self::TOKEN_YEARS); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - /** |
|
| 147 | - * Retrieves a specific time token, e.g. "h" (for hours). |
|
| 148 | - * Using the constants to specifiy the tokens is recommended. |
|
| 149 | - * |
|
| 150 | - * @param string $token |
|
| 151 | - * @return int |
|
| 152 | - * |
|
| 153 | - * @see ConvertHelper_DateInterval::TOKEN_SECONDS |
|
| 154 | - * @see ConvertHelper_DateInterval::TOKEN_MINUTES |
|
| 155 | - * @see ConvertHelper_DateInterval::TOKEN_HOURS |
|
| 156 | - * @see ConvertHelper_DateInterval::TOKEN_DAYS |
|
| 157 | - * @see ConvertHelper_DateInterval::TOKEN_MONTHS |
|
| 158 | - * @see ConvertHelper_DateInterval::TOKEN_YEARS |
|
| 159 | - */ |
|
| 146 | + /** |
|
| 147 | + * Retrieves a specific time token, e.g. "h" (for hours). |
|
| 148 | + * Using the constants to specifiy the tokens is recommended. |
|
| 149 | + * |
|
| 150 | + * @param string $token |
|
| 151 | + * @return int |
|
| 152 | + * |
|
| 153 | + * @see ConvertHelper_DateInterval::TOKEN_SECONDS |
|
| 154 | + * @see ConvertHelper_DateInterval::TOKEN_MINUTES |
|
| 155 | + * @see ConvertHelper_DateInterval::TOKEN_HOURS |
|
| 156 | + * @see ConvertHelper_DateInterval::TOKEN_DAYS |
|
| 157 | + * @see ConvertHelper_DateInterval::TOKEN_MONTHS |
|
| 158 | + * @see ConvertHelper_DateInterval::TOKEN_YEARS |
|
| 159 | + */ |
|
| 160 | 160 | public function getToken(string $token) : int |
| 161 | 161 | { |
| 162 | 162 | return (int)$this->interval->$token; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - /** |
|
| 166 | - * The total amount of seconds in the interval (including |
|
| 167 | - * everything, from seconds to days, months, years...). |
|
| 168 | - * |
|
| 169 | - * @return int |
|
| 170 | - */ |
|
| 165 | + /** |
|
| 166 | + * The total amount of seconds in the interval (including |
|
| 167 | + * everything, from seconds to days, months, years...). |
|
| 168 | + * |
|
| 169 | + * @return int |
|
| 170 | + */ |
|
| 171 | 171 | public function getTotalSeconds() : int |
| 172 | 172 | { |
| 173 | 173 | return $this->seconds; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $interval = $d2->diff($d1); |
| 70 | 70 | |
| 71 | - if(!$interval instanceof DateInterval) |
|
| 71 | + if (!$interval instanceof DateInterval) |
|
| 72 | 72 | { |
| 73 | 73 | throw new ConvertHelper_Exception( |
| 74 | 74 | 'Cannot create interval', |
@@ -187,24 +187,24 @@ discard block |
||
| 187 | 187 | * @see ConvertHelper::INTERVAL_HOURS |
| 188 | 188 | * @see ConvertHelper::INTERVAL_DAYS |
| 189 | 189 | */ |
| 190 | - public static function toTotal(DateInterval $interval, string $unit=ConvertHelper::INTERVAL_SECONDS) : int |
|
| 190 | + public static function toTotal(DateInterval $interval, string $unit = ConvertHelper::INTERVAL_SECONDS) : int |
|
| 191 | 191 | { |
| 192 | 192 | $total = (int)$interval->format('%a'); |
| 193 | 193 | if ($unit == ConvertHelper::INTERVAL_DAYS) { |
| 194 | 194 | return $total; |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - $total = ($total * 24) + ((int)$interval->h ); |
|
| 197 | + $total = ($total * 24) + ((int)$interval->h); |
|
| 198 | 198 | if ($unit == ConvertHelper::INTERVAL_HOURS) { |
| 199 | 199 | return $total; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $total = ($total * 60) + ((int)$interval->i ); |
|
| 202 | + $total = ($total * 60) + ((int)$interval->i); |
|
| 203 | 203 | if ($unit == ConvertHelper::INTERVAL_MINUTES) { |
| 204 | 204 | return $total; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - $total = ($total * 60) + ((int)$interval->s ); |
|
| 207 | + $total = ($total * 60) + ((int)$interval->s); |
|
| 208 | 208 | if ($unit == ConvertHelper::INTERVAL_SECONDS) { |
| 209 | 209 | return $total; |
| 210 | 210 | } |
@@ -398,8 +398,7 @@ discard block |
||
| 398 | 398 | if($datefrom instanceof DateTime) |
| 399 | 399 | { |
| 400 | 400 | $converter->setDateFrom($datefrom); |
| 401 | - } |
|
| 402 | - else |
|
| 401 | + } else |
|
| 403 | 402 | { |
| 404 | 403 | $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom)); |
| 405 | 404 | } |
@@ -407,8 +406,7 @@ discard block |
||
| 407 | 406 | if($dateto instanceof DateTime) |
| 408 | 407 | { |
| 409 | 408 | $converter->setDateTo($dateto); |
| 410 | - } |
|
| 411 | - else if($dateto > 0) |
|
| 409 | + } else if($dateto > 0) |
|
| 412 | 410 | { |
| 413 | 411 | $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto)); |
| 414 | 412 | } |
@@ -34,39 +34,39 @@ discard block |
||
| 34 | 34 | const SECONDS_PER_MONTH_APPROX = 2505600; // imprecise - for 29 days, only for approximations. |
| 35 | 35 | const SECONDS_PER_YEAR = 31536000; |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var int |
|
| 39 | - */ |
|
| 37 | + /** |
|
| 38 | + * @var int |
|
| 39 | + */ |
|
| 40 | 40 | protected $dateFrom; |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var int |
|
| 44 | - */ |
|
| 42 | + /** |
|
| 43 | + * @var int |
|
| 44 | + */ |
|
| 45 | 45 | protected $dateTo; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var bool |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var bool |
|
| 49 | + */ |
|
| 50 | 50 | protected $future = false; |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @var string |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @var string |
|
| 54 | + */ |
|
| 55 | 55 | protected $interval = ''; |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @var int |
|
| 59 | - */ |
|
| 57 | + /** |
|
| 58 | + * @var int |
|
| 59 | + */ |
|
| 60 | 60 | protected $difference = 0; |
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * @var int |
|
| 64 | - */ |
|
| 62 | + /** |
|
| 63 | + * @var int |
|
| 64 | + */ |
|
| 65 | 65 | protected $dateDiff = 0; |
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * @var array<string,array<string,string>>|NULL |
|
| 69 | - */ |
|
| 67 | + /** |
|
| 68 | + * @var array<string,array<string,string>>|NULL |
|
| 69 | + */ |
|
| 70 | 70 | protected static $texts = null; |
| 71 | 71 | |
| 72 | 72 | public function __construct() |
@@ -86,17 +86,17 @@ discard block |
||
| 86 | 86 | self::$texts = null; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * Sets the origin date to calculate from. |
|
| 91 | - * |
|
| 92 | - * NOTE: if this is further in the future than |
|
| 93 | - * the to: date, it will be considered as a |
|
| 94 | - * calculation for something to come, i.e. |
|
| 95 | - * "In two days". |
|
| 96 | - * |
|
| 97 | - * @param DateTime $date |
|
| 98 | - * @return ConvertHelper_DurationConverter |
|
| 99 | - */ |
|
| 89 | + /** |
|
| 90 | + * Sets the origin date to calculate from. |
|
| 91 | + * |
|
| 92 | + * NOTE: if this is further in the future than |
|
| 93 | + * the to: date, it will be considered as a |
|
| 94 | + * calculation for something to come, i.e. |
|
| 95 | + * "In two days". |
|
| 96 | + * |
|
| 97 | + * @param DateTime $date |
|
| 98 | + * @return ConvertHelper_DurationConverter |
|
| 99 | + */ |
|
| 100 | 100 | public function setDateFrom(DateTime $date) : ConvertHelper_DurationConverter |
| 101 | 101 | { |
| 102 | 102 | $this->dateFrom = ConvertHelper::date2timestamp($date); |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | return $this; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - /** |
|
| 108 | - * Sets the date to calculate to. Defaults to |
|
| 109 | - * the current time if not set. |
|
| 110 | - * |
|
| 111 | - * @param DateTime $date |
|
| 112 | - * @return ConvertHelper_DurationConverter |
|
| 113 | - */ |
|
| 107 | + /** |
|
| 108 | + * Sets the date to calculate to. Defaults to |
|
| 109 | + * the current time if not set. |
|
| 110 | + * |
|
| 111 | + * @param DateTime $date |
|
| 112 | + * @return ConvertHelper_DurationConverter |
|
| 113 | + */ |
|
| 114 | 114 | public function setDateTo(DateTime $date) : ConvertHelper_DurationConverter |
| 115 | 115 | { |
| 116 | 116 | $this->dateTo = ConvertHelper::date2timestamp($date); |
@@ -118,14 +118,14 @@ discard block |
||
| 118 | 118 | return $this; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * Converts the specified dates to a human-readable string. |
|
| 123 | - * |
|
| 124 | - * @throws ConvertHelper_Exception |
|
| 125 | - * @return string |
|
| 126 | - * |
|
| 127 | - * @see ConvertHelper_DurationConverter::ERROR_NO_DATE_FROM_SET |
|
| 128 | - */ |
|
| 121 | + /** |
|
| 122 | + * Converts the specified dates to a human-readable string. |
|
| 123 | + * |
|
| 124 | + * @throws ConvertHelper_Exception |
|
| 125 | + * @return string |
|
| 126 | + * |
|
| 127 | + * @see ConvertHelper_DurationConverter::ERROR_NO_DATE_FROM_SET |
|
| 128 | + */ |
|
| 129 | 129 | public function convert() : string |
| 130 | 130 | { |
| 131 | 131 | $this->initTexts(); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | public function __construct() |
| 73 | 73 | { |
| 74 | - if(class_exists('\AppLocalize\Localization')) { |
|
| 74 | + if (class_exists('\AppLocalize\Localization')) { |
|
| 75 | 75 | \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged')); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -133,11 +133,11 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | $epoch = 'past'; |
| 135 | 135 | $key = 'singular'; |
| 136 | - if($this->dateDiff > 1) { |
|
| 136 | + if ($this->dateDiff > 1) { |
|
| 137 | 137 | $key = 'plural'; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - if($this->future) { |
|
| 140 | + if ($this->future) { |
|
| 141 | 141 | $epoch = 'future'; |
| 142 | 142 | } |
| 143 | 143 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | protected function initTexts() : void |
| 152 | 152 | { |
| 153 | - if(isset(self::$texts)) { |
|
| 153 | + if (isset(self::$texts)) { |
|
| 154 | 154 | return; |
| 155 | 155 | } |
| 156 | 156 | |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | $day = (int)date("j", $this->dateTo); |
| 237 | 237 | $year = (int)date("Y", $this->dateFrom); |
| 238 | 238 | |
| 239 | - while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
| 239 | + while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
| 240 | 240 | { |
| 241 | 241 | $months_difference++; |
| 242 | 242 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | protected function resolveCalculations() : void |
| 258 | 258 | { |
| 259 | - if(!isset($this->dateFrom)) |
|
| 259 | + if (!isset($this->dateFrom)) |
|
| 260 | 260 | { |
| 261 | 261 | throw new ConvertHelper_Exception( |
| 262 | 262 | 'No date from has been specified.', |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | // no date to set? Assume we want to use today. |
| 269 | - if(!isset($this->dateTo)) |
|
| 269 | + if (!isset($this->dateTo)) |
|
| 270 | 270 | { |
| 271 | 271 | $this->dateTo = time(); |
| 272 | 272 | } |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | $difference = $this->dateTo - $this->dateFrom; |
| 335 | 335 | |
| 336 | - if($difference < 0) |
|
| 336 | + if ($difference < 0) |
|
| 337 | 337 | { |
| 338 | 338 | $difference = $difference * -1; |
| 339 | 339 | $this->future = true; |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | { |
| 396 | 396 | $converter = new ConvertHelper_DurationConverter(); |
| 397 | 397 | |
| 398 | - if($datefrom instanceof DateTime) |
|
| 398 | + if ($datefrom instanceof DateTime) |
|
| 399 | 399 | { |
| 400 | 400 | $converter->setDateFrom($datefrom); |
| 401 | 401 | } |
@@ -404,11 +404,11 @@ discard block |
||
| 404 | 404 | $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom)); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | - if($dateto instanceof DateTime) |
|
| 407 | + if ($dateto instanceof DateTime) |
|
| 408 | 408 | { |
| 409 | 409 | $converter->setDateTo($dateto); |
| 410 | 410 | } |
| 411 | - else if($dateto > 0) |
|
| 411 | + else if ($dateto > 0) |
|
| 412 | 412 | { |
| 413 | 413 | $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto)); |
| 414 | 414 | } |