|
|
@@ -67,15 +67,15 @@ namespace Symfony\Polyfill\Mbstring;
|
|
|
*/
|
|
|
final class Mbstring
|
|
|
{
|
|
|
- const MB_CASE_FOLD = PHP_INT_MAX;
|
|
|
+ public const MB_CASE_FOLD = \PHP_INT_MAX;
|
|
|
|
|
|
- private static $encodingList = array('ASCII', 'UTF-8');
|
|
|
+ private static $encodingList = ['ASCII', 'UTF-8'];
|
|
|
private static $language = 'neutral';
|
|
|
private static $internalEncoding = 'UTF-8';
|
|
|
- private static $caseFold = array(
|
|
|
- array('µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"),
|
|
|
- array('μ', 's', 'ι', 'σ', 'β', 'θ', 'φ', 'π', 'κ', 'ρ', 'ε', "\xE1\xB9\xA1", 'ι'),
|
|
|
- );
|
|
|
+ private static $caseFold = [
|
|
|
+ ['µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"],
|
|
|
+ ['μ', 's', 'ι', 'σ', 'β', 'θ', 'φ', 'π', 'κ', 'ρ', 'ε', "\xE1\xB9\xA1", 'ι'],
|
|
|
+ ];
|
|
|
|
|
|
public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
|
|
|
{
|
|
|
@@ -104,24 +104,22 @@ final class Mbstring
|
|
|
$s = iconv($fromEncoding, 'UTF-8//IGNORE', $s);
|
|
|
}
|
|
|
|
|
|
- return preg_replace_callback('/[\x80-\xFF]+/', array(__CLASS__, 'html_encoding_callback'), $s);
|
|
|
+ return preg_replace_callback('/[\x80-\xFF]+/', [__CLASS__, 'html_encoding_callback'], $s);
|
|
|
}
|
|
|
|
|
|
if ('HTML-ENTITIES' === $fromEncoding) {
|
|
|
- $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
|
|
|
+ $s = html_entity_decode($s, \ENT_COMPAT, 'UTF-8');
|
|
|
$fromEncoding = 'UTF-8';
|
|
|
}
|
|
|
|
|
|
return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
|
|
|
}
|
|
|
|
|
|
- public static function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null)
|
|
|
+ public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
|
|
|
{
|
|
|
- $vars = array(&$a, &$b, &$c, &$d, &$e, &$f);
|
|
|
-
|
|
|
$ok = true;
|
|
|
array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
|
|
|
- if (false === $v = Mbstring::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
|
|
|
+ if (false === $v = self::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
|
|
|
$ok = false;
|
|
|
}
|
|
|
});
|
|
|
@@ -136,23 +134,23 @@ final class Mbstring
|
|
|
|
|
|
public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
|
|
|
{
|
|
|
- trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', E_USER_WARNING);
|
|
|
+ trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', \E_USER_WARNING);
|
|
|
}
|
|
|
|
|
|
public static function mb_decode_numericentity($s, $convmap, $encoding = null)
|
|
|
{
|
|
|
- if (null !== $s && !\is_scalar($s) && !(\is_object($s) && \method_exists($s, '__toString'))) {
|
|
|
- trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', E_USER_WARNING);
|
|
|
+ if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
|
|
|
+ trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
|
|
|
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- if (!\is_array($convmap) || !$convmap) {
|
|
|
+ if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- if (null !== $encoding && !\is_scalar($encoding)) {
|
|
|
- trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', E_USER_WARNING);
|
|
|
+ if (null !== $encoding && !is_scalar($encoding)) {
|
|
|
+ trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
|
|
|
|
|
|
return ''; // Instead of null (cf. mb_encode_numericentity).
|
|
|
}
|
|
|
@@ -185,7 +183,7 @@ final class Mbstring
|
|
|
$c = isset($m[2]) ? (int) hexdec($m[2]) : $m[1];
|
|
|
for ($i = 0; $i < $cnt; $i += 4) {
|
|
|
if ($c >= $convmap[$i] && $c <= $convmap[$i + 1]) {
|
|
|
- return Mbstring::mb_chr($c - $convmap[$i + 2]);
|
|
|
+ return self::mb_chr($c - $convmap[$i + 2]);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -201,24 +199,24 @@ final class Mbstring
|
|
|
|
|
|
public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
|
|
|
{
|
|
|
- if (null !== $s && !\is_scalar($s) && !(\is_object($s) && \method_exists($s, '__toString'))) {
|
|
|
- trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', E_USER_WARNING);
|
|
|
+ if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
|
|
|
+ trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
|
|
|
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- if (!\is_array($convmap) || !$convmap) {
|
|
|
+ if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- if (null !== $encoding && !\is_scalar($encoding)) {
|
|
|
- trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', E_USER_WARNING);
|
|
|
+ if (null !== $encoding && !is_scalar($encoding)) {
|
|
|
+ trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
|
|
|
|
|
|
return null; // Instead of '' (cf. mb_decode_numericentity).
|
|
|
}
|
|
|
|
|
|
- if (null !== $is_hex && !\is_scalar($is_hex)) {
|
|
|
- trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', E_USER_WARNING);
|
|
|
+ if (null !== $is_hex && !is_scalar($is_hex)) {
|
|
|
+ trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', \E_USER_WARNING);
|
|
|
|
|
|
return null;
|
|
|
}
|
|
|
@@ -239,7 +237,7 @@ final class Mbstring
|
|
|
$s = iconv($encoding, 'UTF-8//IGNORE', $s);
|
|
|
}
|
|
|
|
|
|
- static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
|
|
|
+ static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
|
|
|
|
|
|
$cnt = floor(\count($convmap) / 4) * 4;
|
|
|
$i = 0;
|
|
|
@@ -287,14 +285,14 @@ final class Mbstring
|
|
|
$s = iconv($encoding, 'UTF-8//IGNORE', $s);
|
|
|
}
|
|
|
|
|
|
- if (MB_CASE_TITLE == $mode) {
|
|
|
+ if (\MB_CASE_TITLE == $mode) {
|
|
|
static $titleRegexp = null;
|
|
|
if (null === $titleRegexp) {
|
|
|
$titleRegexp = self::getData('titleCaseRegexp');
|
|
|
}
|
|
|
- $s = preg_replace_callback($titleRegexp, array(__CLASS__, 'title_case'), $s);
|
|
|
+ $s = preg_replace_callback($titleRegexp, [__CLASS__, 'title_case'], $s);
|
|
|
} else {
|
|
|
- if (MB_CASE_UPPER == $mode) {
|
|
|
+ if (\MB_CASE_UPPER == $mode) {
|
|
|
static $upper = null;
|
|
|
if (null === $upper) {
|
|
|
$upper = self::getData('upperCase');
|
|
|
@@ -312,7 +310,7 @@ final class Mbstring
|
|
|
$map = $lower;
|
|
|
}
|
|
|
|
|
|
- static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
|
|
|
+ static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
|
|
|
|
|
|
$i = 0;
|
|
|
$len = \strlen($s);
|
|
|
@@ -353,15 +351,19 @@ final class Mbstring
|
|
|
return self::$internalEncoding;
|
|
|
}
|
|
|
|
|
|
- $encoding = self::getEncoding($encoding);
|
|
|
+ $normalizedEncoding = self::getEncoding($encoding);
|
|
|
|
|
|
- if ('UTF-8' === $encoding || false !== @iconv($encoding, $encoding, ' ')) {
|
|
|
- self::$internalEncoding = $encoding;
|
|
|
+ if ('UTF-8' === $normalizedEncoding || false !== @iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
|
|
|
+ self::$internalEncoding = $normalizedEncoding;
|
|
|
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- return false;
|
|
|
+ if (80000 > \PHP_VERSION_ID) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ throw new \ValueError(sprintf('Argument #1 ($encoding) must be a valid encoding, "%s" given', $encoding));
|
|
|
}
|
|
|
|
|
|
public static function mb_language($lang = null)
|
|
|
@@ -370,20 +372,24 @@ final class Mbstring
|
|
|
return self::$language;
|
|
|
}
|
|
|
|
|
|
- switch ($lang = strtolower($lang)) {
|
|
|
+ switch ($normalizedLang = strtolower($lang)) {
|
|
|
case 'uni':
|
|
|
case 'neutral':
|
|
|
- self::$language = $lang;
|
|
|
+ self::$language = $normalizedLang;
|
|
|
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- return false;
|
|
|
+ if (80000 > \PHP_VERSION_ID) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ throw new \ValueError(sprintf('Argument #1 ($language) must be a valid language, "%s" given', $lang));
|
|
|
}
|
|
|
|
|
|
public static function mb_list_encodings()
|
|
|
{
|
|
|
- return array('UTF-8');
|
|
|
+ return ['UTF-8'];
|
|
|
}
|
|
|
|
|
|
public static function mb_encoding_aliases($encoding)
|
|
|
@@ -391,7 +397,7 @@ final class Mbstring
|
|
|
switch (strtoupper($encoding)) {
|
|
|
case 'UTF8':
|
|
|
case 'UTF-8':
|
|
|
- return array('utf8');
|
|
|
+ return ['utf8'];
|
|
|
}
|
|
|
|
|
|
return false;
|
|
|
@@ -406,7 +412,7 @@ final class Mbstring
|
|
|
$encoding = self::$internalEncoding;
|
|
|
}
|
|
|
|
|
|
- return self::mb_detect_encoding($var, array($encoding)) || false !== @iconv($encoding, $encoding, $var);
|
|
|
+ return self::mb_detect_encoding($var, [$encoding]) || false !== @iconv($encoding, $encoding, $var);
|
|
|
}
|
|
|
|
|
|
public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
|
|
|
@@ -493,9 +499,13 @@ final class Mbstring
|
|
|
|
|
|
$needle = (string) $needle;
|
|
|
if ('' === $needle) {
|
|
|
- trigger_error(__METHOD__.': Empty delimiter', E_USER_WARNING);
|
|
|
+ if (80000 > \PHP_VERSION_ID) {
|
|
|
+ trigger_error(__METHOD__.': Empty delimiter', \E_USER_WARNING);
|
|
|
|
|
|
- return false;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
return iconv_strpos($haystack, $needle, $offset, $encoding);
|
|
|
@@ -521,23 +531,28 @@ final class Mbstring
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $pos = iconv_strrpos($haystack, $needle, $encoding);
|
|
|
+ $pos = '' !== $needle || 80000 > \PHP_VERSION_ID
|
|
|
+ ? iconv_strrpos($haystack, $needle, $encoding)
|
|
|
+ : self::mb_strlen($haystack, $encoding);
|
|
|
|
|
|
return false !== $pos ? $offset + $pos : false;
|
|
|
}
|
|
|
|
|
|
public static function mb_str_split($string, $split_length = 1, $encoding = null)
|
|
|
{
|
|
|
- if (null !== $string && !\is_scalar($string) && !(\is_object($string) && \method_exists($string, '__toString'))) {
|
|
|
- trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', E_USER_WARNING);
|
|
|
+ if (null !== $string && !is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
|
|
|
+ trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', \E_USER_WARNING);
|
|
|
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
if (1 > $split_length = (int) $split_length) {
|
|
|
- trigger_error('The length of each segment must be greater than zero', E_USER_WARNING);
|
|
|
+ if (80000 > \PHP_VERSION_ID) {
|
|
|
+ trigger_error('The length of each segment must be greater than zero', \E_USER_WARNING);
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
- return false;
|
|
|
+ throw new \ValueError('Argument #2 ($length) must be greater than 0');
|
|
|
}
|
|
|
|
|
|
if (null === $encoding) {
|
|
|
@@ -552,10 +567,10 @@ final class Mbstring
|
|
|
}
|
|
|
$rx .= '.{'.$split_length.'})/us';
|
|
|
|
|
|
- return preg_split($rx, $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
|
|
|
+ return preg_split($rx, $string, null, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY);
|
|
|
}
|
|
|
|
|
|
- $result = array();
|
|
|
+ $result = [];
|
|
|
$length = mb_strlen($string, $encoding);
|
|
|
|
|
|
for ($i = 0; $i < $length; $i += $split_length) {
|
|
|
@@ -567,21 +582,27 @@ final class Mbstring
|
|
|
|
|
|
public static function mb_strtolower($s, $encoding = null)
|
|
|
{
|
|
|
- return self::mb_convert_case($s, MB_CASE_LOWER, $encoding);
|
|
|
+ return self::mb_convert_case($s, \MB_CASE_LOWER, $encoding);
|
|
|
}
|
|
|
|
|
|
public static function mb_strtoupper($s, $encoding = null)
|
|
|
{
|
|
|
- return self::mb_convert_case($s, MB_CASE_UPPER, $encoding);
|
|
|
+ return self::mb_convert_case($s, \MB_CASE_UPPER, $encoding);
|
|
|
}
|
|
|
|
|
|
public static function mb_substitute_character($c = null)
|
|
|
{
|
|
|
+ if (null === $c) {
|
|
|
+ return 'none';
|
|
|
+ }
|
|
|
if (0 === strcasecmp($c, 'none')) {
|
|
|
return true;
|
|
|
}
|
|
|
+ if (80000 > \PHP_VERSION_ID) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
- return null !== $c ? false : 'none';
|
|
|
+ throw new \ValueError('Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint');
|
|
|
}
|
|
|
|
|
|
public static function mb_substr($s, $start, $length = null, $encoding = null)
|
|
|
@@ -629,10 +650,11 @@ final class Mbstring
|
|
|
{
|
|
|
$encoding = self::getEncoding($encoding);
|
|
|
if ('CP850' === $encoding || 'ASCII' === $encoding) {
|
|
|
- return strrchr($haystack, $needle, $part);
|
|
|
+ $pos = strrpos($haystack, $needle);
|
|
|
+ } else {
|
|
|
+ $needle = self::mb_substr($needle, 0, 1, $encoding);
|
|
|
+ $pos = iconv_strrpos($haystack, $needle, $encoding);
|
|
|
}
|
|
|
- $needle = self::mb_substr($needle, 0, 1, $encoding);
|
|
|
- $pos = iconv_strrpos($haystack, $needle, $encoding);
|
|
|
|
|
|
return self::getSubpart($pos, $part, $haystack, $encoding);
|
|
|
}
|
|
|
@@ -668,7 +690,7 @@ final class Mbstring
|
|
|
|
|
|
public static function mb_get_info($type = 'all')
|
|
|
{
|
|
|
- $info = array(
|
|
|
+ $info = [
|
|
|
'internal_encoding' => self::$internalEncoding,
|
|
|
'http_output' => 'pass',
|
|
|
'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)',
|
|
|
@@ -683,7 +705,7 @@ final class Mbstring
|
|
|
'detect_order' => self::$encodingList,
|
|
|
'substitute_character' => 'none',
|
|
|
'strict_detection' => 'Off',
|
|
|
- );
|
|
|
+ ];
|
|
|
|
|
|
if ('all' === $type) {
|
|
|
return $info;
|
|
|
@@ -787,7 +809,7 @@ final class Mbstring
|
|
|
{
|
|
|
$i = 1;
|
|
|
$entities = '';
|
|
|
- $m = unpack('C*', htmlentities($m[0], ENT_COMPAT, 'UTF-8'));
|
|
|
+ $m = unpack('C*', htmlentities($m[0], \ENT_COMPAT, 'UTF-8'));
|
|
|
|
|
|
while (isset($m[$i])) {
|
|
|
if (0x80 > $m[$i]) {
|
|
|
@@ -810,7 +832,7 @@ final class Mbstring
|
|
|
|
|
|
private static function title_case(array $s)
|
|
|
{
|
|
|
- return self::mb_convert_case($s[1], MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], MB_CASE_LOWER, 'UTF-8');
|
|
|
+ return self::mb_convert_case($s[1], \MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], \MB_CASE_LOWER, 'UTF-8');
|
|
|
}
|
|
|
|
|
|
private static function getData($file)
|