From fbbb20ec0da9d99c97186b911465053a7dc406cf Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 26 Nov 2019 14:56:25 +0100 Subject: [PATCH] Updated dependencies --- .../files/lib/system/api/composer.lock | 24 +++++++------- .../lib/system/api/composer/installed.json | 26 ++++++++-------- .../system/api/erusev/parsedown/Parsedown.php | 2 +- .../symfony/polyfill-mbstring/Mbstring.php | 31 ++++++++++++++++++- .../symfony/polyfill-mbstring/bootstrap.php | 4 +++ .../symfony/polyfill-mbstring/composer.json | 2 +- 6 files changed, 61 insertions(+), 28 deletions(-) diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index 6447cb3d03..ccd16634a0 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5bfe3a3e87123035f9549110cdc90342", + "content-hash": "40d290f4722e5411ae7ebbd7f96bdf59", "packages": [ { "name": "chrisjean/php-ico", @@ -51,16 +51,16 @@ }, { "name": "erusev/parsedown", - "version": "v1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "d60bcdc46978357759ecb13cb4b078da783f8faf" + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/d60bcdc46978357759ecb13cb4b078da783f8faf", - "reference": "d60bcdc46978357759ecb13cb4b078da783f8faf", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", "shasum": "" }, "require": { @@ -93,7 +93,7 @@ "markdown", "parser" ], - "time": "2019-03-17T17:19:46+00:00" + "time": "2019-03-17T18:48:37+00:00" }, { "name": "ezyang/htmlpurifier", @@ -316,16 +316,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -337,7 +337,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -371,7 +371,7 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "true/punycode", diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index 484b65e30a..2b3da3681f 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -46,17 +46,17 @@ }, { "name": "erusev/parsedown", - "version": "v1.7.2", - "version_normalized": "1.7.2.0", + "version": "1.7.3", + "version_normalized": "1.7.3.0", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "d60bcdc46978357759ecb13cb4b078da783f8faf" + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/d60bcdc46978357759ecb13cb4b078da783f8faf", - "reference": "d60bcdc46978357759ecb13cb4b078da783f8faf", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", "shasum": "" }, "require": { @@ -66,7 +66,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35" }, - "time": "2019-03-17T17:19:46+00:00", + "time": "2019-03-17T18:48:37+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -321,17 +321,17 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.11.0", - "version_normalized": "1.11.0.0", + "version": "v1.12.0", + "version_normalized": "1.12.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -340,11 +340,11 @@ "suggest": { "ext-mbstring": "For best performance" }, - "time": "2019-02-06T07:57:58+00:00", + "time": "2019-08-06T08:03:45+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "installation-source": "dist", diff --git a/wcfsetup/install/files/lib/system/api/erusev/parsedown/Parsedown.php b/wcfsetup/install/files/lib/system/api/erusev/parsedown/Parsedown.php index 6843635cba..a34b44f0f0 100644 --- a/wcfsetup/install/files/lib/system/api/erusev/parsedown/Parsedown.php +++ b/wcfsetup/install/files/lib/system/api/erusev/parsedown/Parsedown.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.7.2'; + const version = '1.7.3'; # ~ diff --git a/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/Mbstring.php b/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/Mbstring.php index a5e4a8fde4..1fc4feea72 100644 --- a/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/Mbstring.php +++ b/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/Mbstring.php @@ -35,6 +35,7 @@ namespace Symfony\Polyfill\Mbstring; * - mb_strlen - Get string length * - mb_strpos - Find position of first occurrence of string in a string * - mb_strrpos - Find position of last occurrence of a string in a string + * - mb_str_split - Convert a string to an array * - mb_strtolower - Make a string lowercase * - mb_strtoupper - Make a string uppercase * - mb_substitute_character - Set/Get substitution character @@ -523,6 +524,34 @@ final class Mbstring 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); + + return null; + } + + if ($split_length < 1) { + trigger_error('The length of each segment must be greater than zero', E_USER_WARNING); + + return false; + } + + if (null === $encoding) { + $encoding = mb_internal_encoding(); + } + + $result = array(); + $length = mb_strlen($string, $encoding); + + for ($i = 0; $i < $length; $i += $split_length) { + $result[] = mb_substr($string, $i, $split_length, $encoding); + } + + return $result; + } + public static function mb_strtolower($s, $encoding = null) { return self::mb_convert_case($s, MB_CASE_LOWER, $encoding); @@ -546,7 +575,7 @@ final class Mbstring { $encoding = self::getEncoding($encoding); if ('CP850' === $encoding || 'ASCII' === $encoding) { - return substr($s, $start, null === $length ? 2147483647 : $length); + return (string) substr($s, $start, null === $length ? 2147483647 : $length); } if ($start < 0) { diff --git a/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/bootstrap.php b/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/bootstrap.php index 2fdcc5a6f6..204a41ba27 100644 --- a/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/bootstrap.php +++ b/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/bootstrap.php @@ -56,3 +56,7 @@ if (!function_exists('mb_chr')) { function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); } function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); } } + +if (!function_exists('mb_str_split')) { + function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); } +} diff --git a/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/composer.json b/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/composer.json index 0bce08782e..308f009a10 100644 --- a/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/composer.json +++ b/wcfsetup/install/files/lib/system/api/symfony/polyfill-mbstring/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } } } -- 2.20.1