From e519b9259948edb6704ffddff21b51ff062be9e2 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 27 Jul 2020 09:59:06 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 32 ++++++++-------- vendor/composer/installed.json | 38 +++++++++---------- .../src/CachedAdapter.php | 22 +++++++++++ .../src/Storage/AbstractCache.php | 1 + .../src/Storage/Adapter.php | 4 +- vendor/league/flysystem/composer.json | 2 +- vendor/league/flysystem/src/Adapter/Local.php | 5 ++- vendor/services.php | 2 +- .../options-resolver/OptionsResolver.php | 2 +- 9 files changed, 66 insertions(+), 42 deletions(-) diff --git a/composer.lock b/composer.lock index fb89dc893..68070805e 100644 --- a/composer.lock +++ b/composer.lock @@ -74,16 +74,16 @@ }, { "name": "league/flysystem", - "version": "1.0.69", + "version": "1.0.70", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "7106f78428a344bc4f643c233a94e48795f10967" + "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967", - "reference": "7106f78428a344bc4f643c233a94e48795f10967", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493", + "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493", "shasum": "", "mirrors": [ { @@ -100,7 +100,7 @@ "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "phpspec/phpspec": "^3.4", + "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0", "phpunit/phpunit": "^5.7.26" }, "suggest": { @@ -166,20 +166,20 @@ "type": "other" } ], - "time": "2020-05-18T15:13:39+00:00" + "time": "2020-07-26T07:20:36+00:00" }, { "name": "league/flysystem-cached-adapter", - "version": "1.0.9", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-cached-adapter.git", - "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f" + "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f", - "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f", + "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff", + "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff", "shasum": "", "mirrors": [ { @@ -219,7 +219,7 @@ } ], "description": "An adapter decorator to enable meta-data caching.", - "time": "2018-07-09T20:51:04+00:00" + "time": "2020-07-25T15:56:04+00:00" }, { "name": "opis/closure", @@ -504,16 +504,16 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.42", + "version": "v3.4.43", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd" + "reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3b9fe6db7fe3694307d182dd73983584af77d5fd", - "reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5", + "reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5", "shasum": "", "mirrors": [ { @@ -574,7 +574,7 @@ "type": "tidelift" } ], - "time": "2020-05-21T13:02:25+00:00" + "time": "2020-07-08T17:07:26+00:00" }, { "name": "topthink/framework", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8d19c7203..45e55aad7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -69,17 +69,17 @@ }, { "name": "league/flysystem", - "version": "1.0.69", - "version_normalized": "1.0.69.0", + "version": "1.0.70", + "version_normalized": "1.0.70.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "7106f78428a344bc4f643c233a94e48795f10967" + "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967", - "reference": "7106f78428a344bc4f643c233a94e48795f10967", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493", + "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493", "shasum": "", "mirrors": [ { @@ -96,7 +96,7 @@ "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "phpspec/phpspec": "^3.4", + "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0", "phpunit/phpunit": "^5.7.26" }, "suggest": { @@ -115,7 +115,7 @@ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, - "time": "2020-05-18T15:13:39+00:00", + "time": "2020-07-26T07:20:36+00:00", "type": "library", "extra": { "branch-alias": { @@ -167,17 +167,17 @@ }, { "name": "league/flysystem-cached-adapter", - "version": "1.0.9", - "version_normalized": "1.0.9.0", + "version": "1.1.0", + "version_normalized": "1.1.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-cached-adapter.git", - "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f" + "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f", - "reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f", + "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff", + "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff", "shasum": "", "mirrors": [ { @@ -200,7 +200,7 @@ "suggest": { "ext-phpredis": "Pure C implemented extension for PHP" }, - "time": "2018-07-09T20:51:04+00:00", + "time": "2020-07-25T15:56:04+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -513,17 +513,17 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.42", - "version_normalized": "3.4.42.0", + "version": "v3.4.43", + "version_normalized": "3.4.43.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd" + "reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3b9fe6db7fe3694307d182dd73983584af77d5fd", - "reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5", + "reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5", "shasum": "", "mirrors": [ { @@ -535,7 +535,7 @@ "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2020-05-21T13:02:25+00:00", + "time": "2020-07-08T17:07:26+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/league/flysystem-cached-adapter/src/CachedAdapter.php b/vendor/league/flysystem-cached-adapter/src/CachedAdapter.php index 9a1321c87..dcdae9ebc 100644 --- a/vendor/league/flysystem-cached-adapter/src/CachedAdapter.php +++ b/vendor/league/flysystem-cached-adapter/src/CachedAdapter.php @@ -237,6 +237,28 @@ class CachedAdapter implements AdapterInterface return $this->adapter->readStream($path); } + /** + * Get the path prefix. + * + * @return string|null path prefix or null if pathPrefix is empty + */ + public function getPathPrefix() + { + return $this->adapter->getPathPrefix(); + } + + /** + * Prefix a path. + * + * @param string $path + * + * @return string prefixed path + */ + public function applyPathPrefix($path) + { + return $this->adapter->applyPathPrefix($path); + } + /** * {@inheritdoc} */ diff --git a/vendor/league/flysystem-cached-adapter/src/Storage/AbstractCache.php b/vendor/league/flysystem-cached-adapter/src/Storage/AbstractCache.php index c2076d490..141b46822 100644 --- a/vendor/league/flysystem-cached-adapter/src/Storage/AbstractCache.php +++ b/vendor/league/flysystem-cached-adapter/src/Storage/AbstractCache.php @@ -328,6 +328,7 @@ abstract class AbstractCache implements CacheInterface $cachedProperties = array_flip([ 'path', 'dirname', 'basename', 'extension', 'filename', 'size', 'mimetype', 'visibility', 'timestamp', 'type', + 'md5', ]); foreach ($contents as $path => $object) { diff --git a/vendor/league/flysystem-cached-adapter/src/Storage/Adapter.php b/vendor/league/flysystem-cached-adapter/src/Storage/Adapter.php index 3aa8b1aee..649a60e3b 100644 --- a/vendor/league/flysystem-cached-adapter/src/Storage/Adapter.php +++ b/vendor/league/flysystem-cached-adapter/src/Storage/Adapter.php @@ -68,8 +68,8 @@ class Adapter extends AbstractCache list($cache, $complete, $expire) = json_decode($json, true); if (! $expire || $expire > $this->getTime()) { - $this->cache = $cache; - $this->complete = $complete; + $this->cache = is_array($cache) ? $cache : []; + $this->complete = is_array($complete) ? $complete : []; } else { $this->adapter->delete($this->file); } diff --git a/vendor/league/flysystem/composer.json b/vendor/league/flysystem/composer.json index 51169de0e..b0a68ec4b 100644 --- a/vendor/league/flysystem/composer.json +++ b/vendor/league/flysystem/composer.json @@ -25,7 +25,7 @@ "ext-fileinfo": "*" }, "require-dev": { - "phpspec/phpspec": "^3.4", + "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0", "phpunit/phpunit": "^5.7.26" }, "autoload": { diff --git a/vendor/league/flysystem/src/Adapter/Local.php b/vendor/league/flysystem/src/Adapter/Local.php index 2b892ab74..747c463ec 100644 --- a/vendor/league/flysystem/src/Adapter/Local.php +++ b/vendor/league/flysystem/src/Adapter/Local.php @@ -206,8 +206,9 @@ class Local extends AbstractAdapter $result = compact('type', 'path', 'size', 'contents'); - if ($mimetype = $config->get('mimetype') ?: Util::guessMimeType($path, $contents)) { - $result['mimetype'] = $mimetype; + if ($visibility = $config->get('visibility')) { + $this->setVisibility($path, $visibility); + $result['visibility'] = $visibility; } return $result; diff --git a/vendor/services.php b/vendor/services.php index f7cb84b62..8a0f3a13f 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/symfony/options-resolver/OptionsResolver.php b/vendor/symfony/options-resolver/OptionsResolver.php index 7354caf8a..cf8c36645 100644 --- a/vendor/symfony/options-resolver/OptionsResolver.php +++ b/vendor/symfony/options-resolver/OptionsResolver.php @@ -1080,6 +1080,6 @@ class OptionsResolver implements Options return null; } - return method_exists($type, 'getName') ? $type->getName() : (string) $type; + return $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type; } }