mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
ComposerUpdate
This commit is contained in:
parent
768ecee9db
commit
e519b92599
32
composer.lock
generated
32
composer.lock
generated
@ -74,16 +74,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
"version": "1.0.69",
|
"version": "1.0.70",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem.git",
|
"url": "https://github.com/thephpleague/flysystem.git",
|
||||||
"reference": "7106f78428a344bc4f643c233a94e48795f10967"
|
"reference": "585824702f534f8d3cf7fab7225e8466cc4b7493"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493",
|
||||||
"reference": "7106f78428a344bc4f643c233a94e48795f10967",
|
"reference": "585824702f534f8d3cf7fab7225e8466cc4b7493",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -100,7 +100,7 @@
|
|||||||
"league/flysystem-sftp": "<1.0.6"
|
"league/flysystem-sftp": "<1.0.6"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpspec/phpspec": "^3.4",
|
"phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
|
||||||
"phpunit/phpunit": "^5.7.26"
|
"phpunit/phpunit": "^5.7.26"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
@ -166,20 +166,20 @@
|
|||||||
"type": "other"
|
"type": "other"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-18T15:13:39+00:00"
|
"time": "2020-07-26T07:20:36+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem-cached-adapter",
|
"name": "league/flysystem-cached-adapter",
|
||||||
"version": "1.0.9",
|
"version": "1.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
|
"url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
|
||||||
"reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f"
|
"reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f",
|
"url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff",
|
||||||
"reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f",
|
"reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -219,7 +219,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "An adapter decorator to enable meta-data caching.",
|
"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",
|
"name": "opis/closure",
|
||||||
@ -504,16 +504,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/options-resolver",
|
"name": "symfony/options-resolver",
|
||||||
"version": "v3.4.42",
|
"version": "v3.4.43",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/options-resolver.git",
|
"url": "https://github.com/symfony/options-resolver.git",
|
||||||
"reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd"
|
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/3b9fe6db7fe3694307d182dd73983584af77d5fd",
|
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
|
||||||
"reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd",
|
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -574,7 +574,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-21T13:02:25+00:00"
|
"time": "2020-07-08T17:07:26+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "topthink/framework",
|
"name": "topthink/framework",
|
||||||
|
38
vendor/composer/installed.json
vendored
38
vendor/composer/installed.json
vendored
@ -69,17 +69,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
"version": "1.0.69",
|
"version": "1.0.70",
|
||||||
"version_normalized": "1.0.69.0",
|
"version_normalized": "1.0.70.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem.git",
|
"url": "https://github.com/thephpleague/flysystem.git",
|
||||||
"reference": "7106f78428a344bc4f643c233a94e48795f10967"
|
"reference": "585824702f534f8d3cf7fab7225e8466cc4b7493"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493",
|
||||||
"reference": "7106f78428a344bc4f643c233a94e48795f10967",
|
"reference": "585824702f534f8d3cf7fab7225e8466cc4b7493",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -96,7 +96,7 @@
|
|||||||
"league/flysystem-sftp": "<1.0.6"
|
"league/flysystem-sftp": "<1.0.6"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpspec/phpspec": "^3.4",
|
"phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
|
||||||
"phpunit/phpunit": "^5.7.26"
|
"phpunit/phpunit": "^5.7.26"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
@ -115,7 +115,7 @@
|
|||||||
"spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
|
"spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
|
||||||
"srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
|
"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",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
@ -167,17 +167,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem-cached-adapter",
|
"name": "league/flysystem-cached-adapter",
|
||||||
"version": "1.0.9",
|
"version": "1.1.0",
|
||||||
"version_normalized": "1.0.9.0",
|
"version_normalized": "1.1.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
|
"url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
|
||||||
"reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f"
|
"reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/08ef74e9be88100807a3b92cc9048a312bf01d6f",
|
"url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff",
|
||||||
"reference": "08ef74e9be88100807a3b92cc9048a312bf01d6f",
|
"reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -200,7 +200,7 @@
|
|||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-phpredis": "Pure C implemented extension for PHP"
|
"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",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -513,17 +513,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/options-resolver",
|
"name": "symfony/options-resolver",
|
||||||
"version": "v3.4.42",
|
"version": "v3.4.43",
|
||||||
"version_normalized": "3.4.42.0",
|
"version_normalized": "3.4.43.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/options-resolver.git",
|
"url": "https://github.com/symfony/options-resolver.git",
|
||||||
"reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd"
|
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/3b9fe6db7fe3694307d182dd73983584af77d5fd",
|
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
|
||||||
"reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd",
|
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -535,7 +535,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": "^5.5.9|>=7.0.8"
|
"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",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
|
@ -237,6 +237,28 @@ class CachedAdapter implements AdapterInterface
|
|||||||
return $this->adapter->readStream($path);
|
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}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
@ -328,6 +328,7 @@ abstract class AbstractCache implements CacheInterface
|
|||||||
$cachedProperties = array_flip([
|
$cachedProperties = array_flip([
|
||||||
'path', 'dirname', 'basename', 'extension', 'filename',
|
'path', 'dirname', 'basename', 'extension', 'filename',
|
||||||
'size', 'mimetype', 'visibility', 'timestamp', 'type',
|
'size', 'mimetype', 'visibility', 'timestamp', 'type',
|
||||||
|
'md5',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
foreach ($contents as $path => $object) {
|
foreach ($contents as $path => $object) {
|
||||||
|
@ -68,8 +68,8 @@ class Adapter extends AbstractCache
|
|||||||
list($cache, $complete, $expire) = json_decode($json, true);
|
list($cache, $complete, $expire) = json_decode($json, true);
|
||||||
|
|
||||||
if (! $expire || $expire > $this->getTime()) {
|
if (! $expire || $expire > $this->getTime()) {
|
||||||
$this->cache = $cache;
|
$this->cache = is_array($cache) ? $cache : [];
|
||||||
$this->complete = $complete;
|
$this->complete = is_array($complete) ? $complete : [];
|
||||||
} else {
|
} else {
|
||||||
$this->adapter->delete($this->file);
|
$this->adapter->delete($this->file);
|
||||||
}
|
}
|
||||||
|
2
vendor/league/flysystem/composer.json
vendored
2
vendor/league/flysystem/composer.json
vendored
@ -25,7 +25,7 @@
|
|||||||
"ext-fileinfo": "*"
|
"ext-fileinfo": "*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpspec/phpspec": "^3.4",
|
"phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
|
||||||
"phpunit/phpunit": "^5.7.26"
|
"phpunit/phpunit": "^5.7.26"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -206,8 +206,9 @@ class Local extends AbstractAdapter
|
|||||||
|
|
||||||
$result = compact('type', 'path', 'size', 'contents');
|
$result = compact('type', 'path', 'size', 'contents');
|
||||||
|
|
||||||
if ($mimetype = $config->get('mimetype') ?: Util::guessMimeType($path, $contents)) {
|
if ($visibility = $config->get('visibility')) {
|
||||||
$result['mimetype'] = $mimetype;
|
$this->setVisibility($path, $visibility);
|
||||||
|
$result['visibility'] = $visibility;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?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);
|
declare (strict_types = 1);
|
||||||
return array (
|
return array (
|
||||||
0 => 'think\\app\\Service',
|
0 => 'think\\app\\Service',
|
||||||
|
@ -1080,6 +1080,6 @@ class OptionsResolver implements Options
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return method_exists($type, 'getName') ? $type->getName() : (string) $type;
|
return $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user