diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-12-07 10:51:34 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-12-07 10:51:34 +0000 |
| commit | 146e3b067372de33ad6f12777964f6f54d84d901 (patch) | |
| tree | d439797e0433bb9d4a9a4870b7f8aa825a63aaf6 /vendor/symfony | |
| parent | afd642658c0a941ee62d4ce70dd7f8e4959b1260 (diff) | |
| download | webtrees-146e3b067372de33ad6f12777964f6f54d84d901.tar.gz webtrees-146e3b067372de33ad6f12777964f6f54d84d901.tar.bz2 webtrees-146e3b067372de33ad6f12777964f6f54d84d901.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor/symfony')
| -rw-r--r-- | vendor/symfony/cache/Adapter/PhpArrayAdapter.php | 2 | ||||
| -rw-r--r-- | vendor/symfony/cache/Traits/RedisTrait.php | 8 | ||||
| -rw-r--r-- | vendor/symfony/polyfill-ctype/composer.json | 2 | ||||
| -rw-r--r-- | vendor/symfony/polyfill-iconv/composer.json | 2 | ||||
| -rw-r--r-- | vendor/symfony/polyfill-intl-idn/composer.json | 2 | ||||
| -rw-r--r-- | vendor/symfony/polyfill-mbstring/Mbstring.php | 15 | ||||
| -rw-r--r-- | vendor/symfony/polyfill-mbstring/composer.json | 2 | ||||
| -rw-r--r-- | vendor/symfony/polyfill-php72/composer.json | 2 | ||||
| -rw-r--r-- | vendor/symfony/var-exporter/Internal/Exporter.php | 6 |
9 files changed, 29 insertions, 12 deletions
diff --git a/vendor/symfony/cache/Adapter/PhpArrayAdapter.php b/vendor/symfony/cache/Adapter/PhpArrayAdapter.php index 71ace29d1c..5f6e99169c 100644 --- a/vendor/symfony/cache/Adapter/PhpArrayAdapter.php +++ b/vendor/symfony/cache/Adapter/PhpArrayAdapter.php @@ -305,7 +305,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte public static function throwOnRequiredClass($class) { $e = new \ReflectionException("Class $class does not exist"); - $trace = $e->getTrace(); + $trace = debug_backtrace(); $autoloadFrame = [ 'function' => 'spl_autoload_call', 'args' => [$class], diff --git a/vendor/symfony/cache/Traits/RedisTrait.php b/vendor/symfony/cache/Traits/RedisTrait.php index 5eab66890b..9b65ccb987 100644 --- a/vendor/symfony/cache/Traits/RedisTrait.php +++ b/vendor/symfony/cache/Traits/RedisTrait.php @@ -308,7 +308,13 @@ trait RedisTrait } }); } else { - $values = array_combine($ids, $this->redis->mget($ids)); + $values = $this->redis->mget($ids); + + if (!\is_array($values) || \count($values) !== \count($ids)) { + return []; + } + + $values = array_combine($ids, $values); } foreach ($values as $id => $v) { diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json index 090f923ef1..2a2ea044bd 100644 --- a/vendor/symfony/polyfill-ctype/composer.json +++ b/vendor/symfony/polyfill-ctype/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } } } diff --git a/vendor/symfony/polyfill-iconv/composer.json b/vendor/symfony/polyfill-iconv/composer.json index 0c23267cbe..0161be6c20 100644 --- a/vendor/symfony/polyfill-iconv/composer.json +++ b/vendor/symfony/polyfill-iconv/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } } } diff --git a/vendor/symfony/polyfill-intl-idn/composer.json b/vendor/symfony/polyfill-intl-idn/composer.json index d2e3f4b197..428c13e6d6 100644 --- a/vendor/symfony/polyfill-intl-idn/composer.json +++ b/vendor/symfony/polyfill-intl-idn/composer.json @@ -30,7 +30,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } } } diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php index 1fc4feea72..bf882ba263 100644 --- a/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -512,7 +512,9 @@ final class Mbstring $offset = 0; } elseif ($offset = (int) $offset) { if ($offset < 0) { - $haystack = self::mb_substr($haystack, 0, $offset, $encoding); + if (0 > $offset += self::mb_strlen($needle)) { + $haystack = self::mb_substr($haystack, 0, $offset, $encoding); + } $offset = 0; } else { $haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding); @@ -532,7 +534,7 @@ final class Mbstring return null; } - if ($split_length < 1) { + if (1 > $split_length = (int) $split_length) { trigger_error('The length of each segment must be greater than zero', E_USER_WARNING); return false; @@ -542,6 +544,10 @@ final class Mbstring $encoding = mb_internal_encoding(); } + if ('UTF-8' === $encoding = self::getEncoding($encoding)) { + return preg_split("/(.{{$split_length}})/u", $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + } + $result = array(); $length = mb_strlen($string, $encoding); @@ -815,11 +821,16 @@ final class Mbstring return self::$internalEncoding; } + if ('UTF-8' === $encoding) { + return 'UTF-8'; + } + $encoding = strtoupper($encoding); if ('8BIT' === $encoding || 'BINARY' === $encoding) { return 'CP850'; } + if ('UTF8' === $encoding) { return 'UTF-8'; } diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json index 308f009a10..c968074339 100644 --- a/vendor/symfony/polyfill-mbstring/composer.json +++ b/vendor/symfony/polyfill-mbstring/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } } } diff --git a/vendor/symfony/polyfill-php72/composer.json b/vendor/symfony/polyfill-php72/composer.json index 5cfcbb7578..0d37167f2c 100644 --- a/vendor/symfony/polyfill-php72/composer.json +++ b/vendor/symfony/polyfill-php72/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } } } diff --git a/vendor/symfony/var-exporter/Internal/Exporter.php b/vendor/symfony/var-exporter/Internal/Exporter.php index a466f2d566..d1ee9879b7 100644 --- a/vendor/symfony/var-exporter/Internal/Exporter.php +++ b/vendor/symfony/var-exporter/Internal/Exporter.php @@ -222,14 +222,14 @@ class Exporter )); if ("'" === $m[2]) { - return substr($m[1], 0, -2); + return substr($m[1], 0, -2); } if ('n".\'' === substr($m[1], -4)) { - return substr_replace($m[1], "\n".$subIndent.".'".$m[2], -2); + return substr_replace($m[1], "\n".$subIndent.".'".$m[2], -2); } - return $m[1].$m[2]; + return $m[1].$m[2]; }, $code, -1, $count); if ($count && 0 === strpos($code, "''.")) { |
