← All changes
|
vendor_prefixed/twig/symfony/polyfill-mbstring/bootstrap80.php
+13
-14
4.1.0-dev2
→
4.3.1
View file →
| @@ -230,10 +230,9 @@ | ||
| 230 | 230 | } |
| 231 | 231 | if (!\function_exists('mb_scrub')) { |
| 232 | 232 | function mb_scrub(?string $string, ?string $encoding = null) : string |
| 233 | 233 | { |
| 234 | - $encoding ??= \mb_internal_encoding(); | |
| 235 | - return \mb_convert_encoding((string) $string, $encoding, $encoding); | |
| 234 | + return p\Mbstring::mb_scrub($string, $encoding); | |
| 236 | 235 | } |
| 237 | 236 | } |
| 238 | 237 | if (!\function_exists('mb_str_split')) { |
| 239 | 238 | function mb_str_split(?string $string, ?int $length = 1, ?string $encoding = null) : array |
| @@ -241,41 +240,41 @@ | ||
| 241 | 240 | return p\Mbstring::mb_str_split((string) $string, (int) $length, $encoding); |
| 242 | 241 | } |
| 243 | 242 | } |
| 244 | 243 | if (!\function_exists('ElementorDeps\\mb_str_pad')) { |
| 245 | - function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, ?string $encoding = null) : string | |
| 244 | + function mb_str_pad(?string $string, ?int $length, ?string $pad_string = ' ', ?int $pad_type = \STR_PAD_RIGHT, ?string $encoding = null) : string | |
| 246 | 245 | { |
| 247 | - return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); | |
| 246 | + return p\Mbstring::mb_str_pad((string) $string, (int) $length, (string) $pad_string, (int) $pad_type, $encoding); | |
| 248 | 247 | } |
| 249 | 248 | } |
| 250 | 249 | if (!\function_exists('ElementorDeps\\mb_ucfirst')) { |
| 251 | - function mb_ucfirst(string $string, ?string $encoding = null) : string | |
| 250 | + function mb_ucfirst(?string $string, ?string $encoding = null) : string | |
| 252 | 251 | { |
| 253 | - return p\Mbstring::mb_ucfirst($string, $encoding); | |
| 252 | + return p\Mbstring::mb_ucfirst((string) $string, $encoding); | |
| 254 | 253 | } |
| 255 | 254 | } |
| 256 | 255 | if (!\function_exists('ElementorDeps\\mb_lcfirst')) { |
| 257 | - function mb_lcfirst(string $string, ?string $encoding = null) : string | |
| 256 | + function mb_lcfirst(?string $string, ?string $encoding = null) : string | |
| 258 | 257 | { |
| 259 | - return p\Mbstring::mb_lcfirst($string, $encoding); | |
| 258 | + return p\Mbstring::mb_lcfirst((string) $string, $encoding); | |
| 260 | 259 | } |
| 261 | 260 | } |
| 262 | 261 | if (!\function_exists('ElementorDeps\\mb_trim')) { |
| 263 | - function mb_trim(string $string, ?string $characters = null, ?string $encoding = null) : string | |
| 262 | + function mb_trim(?string $string, ?string $characters = null, ?string $encoding = null) : string | |
| 264 | 263 | { |
| 265 | - return p\Mbstring::mb_trim($string, $characters, $encoding); | |
| 264 | + return p\Mbstring::mb_trim((string) $string, $characters, $encoding); | |
| 266 | 265 | } |
| 267 | 266 | } |
| 268 | 267 | if (!\function_exists('ElementorDeps\\mb_ltrim')) { |
| 269 | - function mb_ltrim(string $string, ?string $characters = null, ?string $encoding = null) : string | |
| 268 | + function mb_ltrim(?string $string, ?string $characters = null, ?string $encoding = null) : string | |
| 270 | 269 | { |
| 271 | - return p\Mbstring::mb_ltrim($string, $characters, $encoding); | |
| 270 | + return p\Mbstring::mb_ltrim((string) $string, $characters, $encoding); | |
| 272 | 271 | } |
| 273 | 272 | } |
| 274 | 273 | if (!\function_exists('ElementorDeps\\mb_rtrim')) { |
| 275 | - function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null) : string | |
| 274 | + function mb_rtrim(?string $string, ?string $characters = null, ?string $encoding = null) : string | |
| 276 | 275 | { |
| 277 | - return p\Mbstring::mb_rtrim($string, $characters, $encoding); | |
| 276 | + return p\Mbstring::mb_rtrim((string) $string, $characters, $encoding); | |
| 278 | 277 | } |
| 279 | 278 | } |
| 280 | 279 | if (\extension_loaded('mbstring')) { |
| 281 | 280 | return; |