ComposerUpdate

This commit is contained in:
Anyon 2020-07-27 09:59:06 +08:00
parent 768ecee9db
commit e519b92599
9 changed files with 66 additions and 42 deletions

32
composer.lock generated
View File

@ -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",

View File

@ -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": {

View File

@ -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}
*/

View File

@ -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) {

View File

@ -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);
}

View File

@ -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": {

View File

@ -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;

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2020-07-22 14:47:23
// This file is automatically generated at:2020-07-27 09:27:37
declare (strict_types = 1);
return array (
0 => 'think\\app\\Service',

View File

@ -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;
}
}