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