@@ -259,7 +259,7 @@ |
||
259 | 259 | /** |
260 | 260 | * strng regexp bbcode killer |
261 | 261 | * |
262 | - * @param string|array $bbcode BBCode as string or matches as array - callback from preg_replace_callback() |
|
262 | + * @param string $bbcode BBCode as string or matches as array - callback from preg_replace_callback() |
|
263 | 263 | * |
264 | 264 | * @return string |
265 | 265 | * @throws \chillerlan\bbcode\BBCodeException |
@@ -101,7 +101,6 @@ |
||
101 | 101 | |
102 | 102 | /** |
103 | 103 | * Checks if an attribute exists and if it exists as key in a whitelist |
104 | - |
|
105 | 104 | * @param string $name the desired attributes name |
106 | 105 | * @param array $whitelist an array with whitelisted key -> value pairs |
107 | 106 | * @param mixed $default [optional] a default value in case the attribute isn't set, defaults to false |
@@ -101,7 +101,6 @@ |
||
101 | 101 | |
102 | 102 | /** |
103 | 103 | * Checks if an attribute exists and if it exists as key in a whitelist |
104 | - |
|
105 | 104 | * @param string $name the desired attributes name |
106 | 105 | * @param array $whitelist an array with whitelisted key -> value pairs |
107 | 106 | * @param mixed $default [optional] a default value in case the attribute isn't set, defaults to false |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | |
249 | 249 | * @param string $name the desired attributes name |
250 | 250 | * @param array $whitelist an array with whitelisted key -> value pairs |
251 | - * @param mixed $default [optional] a default value in case the attribute isn't set, defaults to false |
|
251 | + * @param string $default [optional] a default value in case the attribute isn't set, defaults to false |
|
252 | 252 | * |
253 | 253 | * @return mixed boolean if no $default is set, otherwise the whitelist value to the given key in case it exists or $default |
254 | 254 | */ |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * Checks if the current tag is whitelisted |
263 | 263 | * |
264 | 264 | * @param array $whitelist an array with whitelisted tag names |
265 | - * @param mixed $default [optional] a default value in case the tag isn't whitelisted |
|
265 | + * @param string $default [optional] a default value in case the tag isn't whitelisted |
|
266 | 266 | * |
267 | 267 | * @return mixed boolean if no $default is set, otherwise the whitelisted tag or $default |
268 | 268 | */ |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | * shorthand for self::attributeIn('__BBTAG__', $array) |
312 | 312 | * |
313 | 313 | * @param array $array |
314 | - * @param mixed $default |
|
314 | + * @param string $default |
|
315 | 315 | * |
316 | 316 | * @return mixed |
317 | 317 | */ |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | * |
325 | 325 | * @param string $url the URL to check |
326 | 326 | * |
327 | - * @return bool|string the url if valid, otherwise false |
|
327 | + * @return false|string the url if valid, otherwise false |
|
328 | 328 | */ |
329 | 329 | public function checkUrl(string $url){ |
330 | 330 | if(filter_var($url, FILTER_VALIDATE_URL) === false){ |
@@ -12,8 +12,8 @@ |
||
12 | 12 | |
13 | 13 | namespace chillerlan\bbcode\Modules\Html5; |
14 | 14 | |
15 | -use chillerlan\bbcode\Modules\ModuleInterface; |
|
16 | 15 | use chillerlan\TinyCurl\Traits\RequestTrait; |
16 | +use chillerlan\bbcode\Modules\ModuleInterface; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Transforms several video tags into HTML5 |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | protected function flashPlayer(string $video_url):string{ |
100 | 100 | |
101 | 101 | return '<div'.$this->getCssClass($this->cssclass).'>' |
102 | - .'<object type="application/x-shockwave-flash" data="'.$video_url.'">' |
|
103 | - .'<param name="allowfullscreen" value="true">' |
|
104 | - .'<param name="wmode" value="opaque" />' |
|
105 | - .'<param name="movie" value="'.$video_url.'" />' |
|
106 | - .'</object></div>'; |
|
102 | + .'<object type="application/x-shockwave-flash" data="'.$video_url.'">' |
|
103 | + .'<param name="allowfullscreen" value="true">' |
|
104 | + .'<param name="wmode" value="opaque" />' |
|
105 | + .'<param name="movie" value="'.$video_url.'" />' |
|
106 | + .'</object></div>'; |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | protected function embedPlayer(string $video_url):string{ |
115 | 115 | |
116 | 116 | return '<div'.$this->getCssClass($this->cssclass).'>' |
117 | - .'<iframe src="'.$video_url.'" allowfullscreen></iframe></div>'; |
|
117 | + .'<iframe src="'.$video_url.'" allowfullscreen></iframe></div>'; |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | protected function html5Player():string{ |
124 | 124 | |
125 | 125 | return '<video src="'.$this->checkUrl($this->content).'"' |
126 | - .$this->getCssClass($this->cssclass).' preload="auto" controls="true"></video>'; |
|
126 | + .$this->getCssClass($this->cssclass).' preload="auto" controls="true"></video>'; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * @param string $class FQCN |
26 | 26 | * @param string $interface FQCN |
27 | 27 | * |
28 | - * @param mixed $params [optional] the following arguments are optional and will be passed to the class constructor if present. |
|
28 | + * @param \chillerlan\bbcode\ParserOptions $params [optional] the following arguments are optional and will be passed to the class constructor if present. |
|
29 | 29 | * |
30 | 30 | * @link https://github.com/chillerlan/framework/blob/master/src/Core/Traits/ClassLoaderTrait.php |
31 | 31 | * |
@@ -11,8 +11,8 @@ |
||
11 | 11 | |
12 | 12 | namespace chillerlan\bbcode\Traits; |
13 | 13 | |
14 | -use chillerlan\bbcode\BBCodeException; |
|
15 | 14 | use ReflectionClass; |
15 | +use chillerlan\bbcode\BBCodeException; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Trait ClassLoaderTrait |
@@ -32,7 +32,8 @@ |
||
32 | 32 | * @return object of type $interface |
33 | 33 | * @throws \chillerlan\bbcode\BBCodeException |
34 | 34 | */ |
35 | - protected function __loadClass(string $class, string $interface, ...$params){ // phpDocumentor stumbles across the ... syntax |
|
35 | + protected function __loadClass(string $class, string $interface, ...$params){ |
|
36 | +// phpDocumentor stumbles across the ... syntax |
|
36 | 37 | if(class_exists($class)){ |
37 | 38 | $reflectionClass = new ReflectionClass($class); |
38 | 39 |
@@ -40,7 +40,7 @@ |
||
40 | 40 | return ''; |
41 | 41 | } |
42 | 42 | |
43 | - $url = $this->checkUrl($this->bbtag() ? : $this->content); |
|
43 | + $url = $this->checkUrl($this->bbtag() ?: $this->content); |
|
44 | 44 | $host = parse_url($url, PHP_URL_HOST); |
45 | 45 | $target = (!empty($host) && (isset($_SERVER['SERVER_NAME']) && $host === $_SERVER['SERVER_NAME'])) |
46 | 46 | || empty($host) ? 'self' : 'blank'; |
@@ -40,10 +40,10 @@ |
||
40 | 40 | if(!empty($this->content)){ |
41 | 41 | return $url && $this->checkUrl($url) |
42 | 42 | ? '['.$this->content.']('.$url.')' |
43 | - : $this->checkUrl($this->content) ? : $this->content; |
|
43 | + : $this->checkUrl($this->content) ?: $this->content; |
|
44 | 44 | } |
45 | 45 | |
46 | - return $this->checkUrl($url) ? : ''; |
|
46 | + return $this->checkUrl($url) ?: ''; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | } |
@@ -41,9 +41,9 @@ |
||
41 | 41 | |
42 | 42 | $str = [ |
43 | 43 | 'b' => '**', // bold |
44 | - 'c' => '`', // inline code |
|
44 | + 'c' => '`', // inline code |
|
45 | 45 | 'del' => '~~', // strikethrough |
46 | - 'i' => '_', // italic |
|
46 | + 'i' => '_', // italic |
|
47 | 47 | 's' => '~~', // strikethrough |
48 | 48 | 'strong' => '**', // bold |
49 | 49 | ][$this->tag]; |
@@ -127,7 +127,7 @@ |
||
127 | 127 | */ |
128 | 128 | protected function getCssClass(array $additional_classes = []){ |
129 | 129 | $classes = $this->getAttribute('class', '').' '.implode(' ', $additional_classes); |
130 | - $classes =preg_replace('/[^a-z\d\- ]/i', '', $classes); |
|
130 | + $classes = preg_replace('/[^a-z\d\- ]/i', '', $classes); |
|
131 | 131 | $classes = trim($classes); |
132 | 132 | |
133 | 133 | return !empty($classes) ? ' class="'.$classes.'"' : ''; |