@@ -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 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * @param bool $verifySSL |
| 49 | 49 | * @return URLInfo_ConnectionTester |
| 50 | 50 | */ |
| 51 | - public function setVerifySSL(bool $verifySSL=true) : URLInfo_ConnectionTester |
|
| 51 | + public function setVerifySSL(bool $verifySSL = true) : URLInfo_ConnectionTester |
|
| 52 | 52 | { |
| 53 | 53 | $this->setOption('verify-ssl', $verifySSL); |
| 54 | 54 | return $this; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | return $this->getBoolOption('verify-ssl'); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function setVerboseMode(bool $enabled=true) : URLInfo_ConnectionTester |
|
| 62 | + public function setVerboseMode(bool $enabled = true) : URLInfo_ConnectionTester |
|
| 63 | 63 | { |
| 64 | 64 | $this->setOption('curl-verbose', $enabled); |
| 65 | 65 | return $this; |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $ch = curl_init(); |
| 93 | 93 | |
| 94 | - if(!is_resource($ch)) |
|
| 94 | + if (!is_resource($ch)) |
|
| 95 | 95 | { |
| 96 | 96 | throw new BaseException( |
| 97 | 97 | 'Could not initialize a new cURL instance.', |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | private function configureOptions($ch) : void |
| 110 | 110 | { |
| 111 | - if($this->isVerboseModeEnabled()) |
|
| 111 | + if ($this->isVerboseModeEnabled()) |
|
| 112 | 112 | { |
| 113 | 113 | curl_setopt($ch, CURLOPT_VERBOSE, true); |
| 114 | 114 | } |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | curl_setopt($ch, CURLOPT_TIMEOUT, $this->getTimeout()); |
| 119 | 119 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
| 120 | 120 | |
| 121 | - if(!$this->isVerifySSLEnabled()) |
|
| 121 | + if (!$this->isVerifySSLEnabled()) |
|
| 122 | 122 | { |
| 123 | 123 | curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); |
| 124 | 124 | curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - if($this->url->hasUsername()) |
|
| 127 | + if ($this->url->hasUsername()) |
|
| 128 | 128 | { |
| 129 | 129 | curl_setopt($ch, CURLOPT_USERNAME, $this->url->getUsername()); |
| 130 | 130 | curl_setopt($ch, CURLOPT_PASSWORD, $this->url->getPassword()); |
@@ -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].'()'; |
@@ -43,9 +43,9 @@ |
||
| 43 | 43 | |
| 44 | 44 | $result = array(); |
| 45 | 45 | $matches = array_unique($matches[2]); |
| 46 | - foreach($matches as $match) { |
|
| 46 | + foreach ($matches as $match) { |
|
| 47 | 47 | $match = trim($match); |
| 48 | - if(!empty($match) && !in_array($match, $result)) { |
|
| 48 | + if (!empty($match) && !in_array($match, $result)) { |
|
| 49 | 49 | $result[] = $match; |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -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 | } |
@@ -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 | |
@@ -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 | } |
@@ -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.'>'; |