Upgraded two symfony/polyfill packages

opencart · Jun 20, 2024 · cb4eec0 · cb4eec0
1 parent 8cc534e
commit cb4eec0
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 48 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/upload/system/storage/vendor/composer/installed.json b/upload/system/storage/vendor/composer/installed.json
@@ -814,17 +814,17 @@
  },
  {
  "name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
- "version_normalized": "1.29.0.0",
+ "version": "v1.30.0",
+ "version_normalized": "1.30.0.0",
  "source": {
  "type": "git",
  "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
  },
  "dist": {
  "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+ "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
  "shasum": ""
  },
  "require": {
@@ -836,7 +836,7 @@
  "suggest": {
  "ext-ctype": "For best performance"
  },
- "time": "2024-01-29T20:11:03+00:00",
+ "time": "2024-05-31T15:07:36+00:00",
  "type": "library",
  "extra": {
  "thanks": {
@@ -876,7 +876,7 @@
  "portable"
  ],
  "support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
  },
  "funding": [
  {
@@ -896,17 +896,17 @@
  },
  {
  "name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
- "version_normalized": "1.29.0.0",
+ "version": "v1.30.0",
+ "version_normalized": "1.30.0.0",
  "source": {
  "type": "git",
  "url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+ "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
  },
  "dist": {
  "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+ "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
  "shasum": ""
  },
  "require": {
@@ -918,7 +918,7 @@
  "suggest": {
  "ext-mbstring": "For best performance"
  },
- "time": "2024-01-29T20:11:03+00:00",
+ "time": "2024-06-19T12:30:46+00:00",
  "type": "library",
  "extra": {
  "thanks": {
@@ -959,7 +959,7 @@
  "shim"
  ],
  "support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
  },
  "funding": [
  {

diff --git a/upload/system/storage/vendor/composer/installed.php b/upload/system/storage/vendor/composer/installed.php
@@ -3,7 +3,7 @@
  'name' => 'opencart/opencart-3',
  'pretty_version' => 'dev-main',
  'version' => 'dev-main',
- 'reference' => 'd9dc31a7fc7baa976ce086e3a9bab2ae288f1f1b',
+ 'reference' => '8cc534e6d857cc96325f07d80ecf0501c65fe7b1',
  'type' => 'project',
  'install_path' => __DIR__ . '/../../../../../',
  'aliases' => array(),
@@ -58,7 +58,7 @@
  'opencart/opencart-3' => array(
  'pretty_version' => 'dev-main',
  'version' => 'dev-main',
- 'reference' => 'd9dc31a7fc7baa976ce086e3a9bab2ae288f1f1b',
+ 'reference' => '8cc534e6d857cc96325f07d80ecf0501c65fe7b1',
  'type' => 'project',
  'install_path' => __DIR__ . '/../../../../../',
  'aliases' => array(),
@@ -137,18 +137,18 @@
  'dev_requirement' => false,
  ),
  'symfony/polyfill-ctype' => array(
- 'pretty_version' => 'v1.29.0',
- 'version' => '1.29.0.0',
- 'reference' => 'ef4d7e442ca910c4764bce785146269b30cb5fc4',
+ 'pretty_version' => 'v1.30.0',
+ 'version' => '1.30.0.0',
+ 'reference' => '0424dff1c58f028c451efff2045f5d92410bd540',
  'type' => 'library',
  'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
  'aliases' => array(),
  'dev_requirement' => false,
  ),
  'symfony/polyfill-mbstring' => array(
- 'pretty_version' => 'v1.29.0',
- 'version' => '1.29.0.0',
- 'reference' => '9773676c8a1bb1f8d4340a62efe641cf76eda7ec',
+ 'pretty_version' => 'v1.30.0',
+ 'version' => '1.30.0.0',
+ 'reference' => 'fd22ab50000ef01661e2a31d850ebaa297f8e03c',
  'type' => 'library',
  'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
  'aliases' => array(),

diff --git a/upload/system/storage/vendor/symfony/polyfill-mbstring/Mbstring.php b/upload/system/storage/vendor/symfony/polyfill-mbstring/Mbstring.php
@@ -48,6 +48,8 @@
  * - mb_strstr - Finds first occurrence of a string within another
  * - mb_strwidth - Return width of string
  * - mb_substr_count - Count the number of substring occurrences
+ * - mb_ucfirst - Make a string's first character uppercase
+ * - mb_lcfirst - Make a string's first character lowercase
  *
  * Not implemented:
  * - mb_convert_kana - Convert "kana" one from another ("zen-kaku", "han-kaku" and more)
@@ -80,6 +82,21 @@ final class Mbstring
 
  public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
  {
+ if (\is_array($s)) {
+ if (PHP_VERSION_ID < 70200) {
+ trigger_error('mb_convert_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);
+
+ return null;
+ }
+
+ $r = [];
+ foreach ($s as $str) {
+ $r[] = self::mb_convert_encoding($str, $toEncoding, $fromEncoding);
+ }
+
+ return $r;
+ }
+
  if (\is_array($fromEncoding) || (null !== $fromEncoding && false !== strpos($fromEncoding, ','))) {
  $fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
  } else {
@@ -410,7 +427,7 @@ public static function mb_encoding_aliases($encoding)
 
  public static function mb_check_encoding($var = null, $encoding = null)
  {
- if (PHP_VERSION_ID < 70200 && \is_array($var)) {
+ if (\PHP_VERSION_ID < 70200 && \is_array($var)) {
  trigger_error('mb_check_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);
 
  return null;
@@ -437,7 +454,6 @@ public static function mb_check_encoding($var = null, $encoding = null)
  }
 
  return true;
-
  }
 
  public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
@@ -827,25 +843,16 @@ public static function mb_ord($s, $encoding = null)
  return $code;
  }
 
- public static function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, string $encoding = null): string
+ public static function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, ?string $encoding = null): string
  {
  if (!\in_array($pad_type, [\STR_PAD_RIGHT, \STR_PAD_LEFT, \STR_PAD_BOTH], true)) {
  throw new \ValueError('mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH');
  }
 
  if (null === $encoding) {
  $encoding = self::mb_internal_encoding();
- }
-
- try {
- $validEncoding = @self::mb_check_encoding('', $encoding);
- } catch (\ValueError $e) {
- throw new \ValueError(sprintf('mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given', $encoding));
- }
-
- // BC for PHP 7.3 and lower
- if (!$validEncoding) {
- throw new \ValueError(sprintf('mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given', $encoding));
+ } else {
+ self::assertEncoding($encoding, 'mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given');
  }
 
  if (self::mb_strlen($pad_string, $encoding) <= 0) {
@@ -871,6 +878,34 @@ public static function mb_str_pad(string $string, int $length, string $pad_strin
  }
  }
 
+ public static function mb_ucfirst(string $string, ?string $encoding = null): string
+ {
+ if (null === $encoding) {
+ $encoding = self::mb_internal_encoding();
+ } else {
+ self::assertEncoding($encoding, 'mb_ucfirst(): Argument #2 ($encoding) must be a valid encoding, "%s" given');
+ }
+
+ $firstChar = mb_substr($string, 0, 1, $encoding);
+ $firstChar = mb_convert_case($firstChar, \MB_CASE_TITLE, $encoding);
+
+ return $firstChar.mb_substr($string, 1, null, $encoding);
+ }
+
+ public static function mb_lcfirst(string $string, ?string $encoding = null): string
+ {
+ if (null === $encoding) {
+ $encoding = self::mb_internal_encoding();
+ } else {
+ self::assertEncoding($encoding, 'mb_lcfirst(): Argument #2 ($encoding) must be a valid encoding, "%s" given');
+ }
+
+ $firstChar = mb_substr($string, 0, 1, $encoding);
+ $firstChar = mb_convert_case($firstChar, \MB_CASE_LOWER, $encoding);
+
+ return $firstChar.mb_substr($string, 1, null, $encoding);
+ }
+
  private static function getSubpart($pos, $part, $haystack, $encoding)
  {
  if (false === $pos) {
@@ -944,4 +979,18 @@ private static function getEncoding($encoding)
 
  return $encoding;
  }
+
+ private static function assertEncoding(string $encoding, string $errorFormat): void
+ {
+ try {
+ $validEncoding = @self::mb_check_encoding('', $encoding);
+ } catch (\ValueError $e) {
+ throw new \ValueError(\sprintf($errorFormat, $encoding));
+ }
+
+ // BC for PHP 7.3 and lower
+ if (!$validEncoding) {
+ throw new \ValueError(\sprintf($errorFormat, $encoding));
+ }
+ }
 }
diff --git a/upload/system/storage/vendor/symfony/polyfill-mbstring/bootstrap.php b/upload/system/storage/vendor/symfony/polyfill-mbstring/bootstrap.php
@@ -136,6 +136,14 @@ function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstrin
  function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
 }
 
+if (!function_exists('mb_ucfirst')) {
+ function mb_ucfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_ucfirst($string, $encoding); }
+}
+
+if (!function_exists('mb_lcfirst')) {
+ function mb_lcfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
+}
+
 if (extension_loaded('mbstring')) {
  return;
 }

diff --git a/upload/system/storage/vendor/symfony/polyfill-mbstring/bootstrap80.php b/upload/system/storage/vendor/symfony/polyfill-mbstring/bootstrap80.php
@@ -132,6 +132,14 @@ function mb_str_split(?string $string, ?int $length = 1, ?string $encoding = nul
  function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
 }
 
+if (!function_exists('mb_ucfirst')) {
+ function mb_ucfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_ucfirst($string, $encoding); }
+}
+
+if (!function_exists('mb_lcfirst')) {
+ function mb_lcfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
+}
+
 if (extension_loaded('mbstring')) {
  return;
 }