blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-09-29 13:24:46 +08:00
parent 13efe2a562
commit a5f3b8cb78
68 changed files with 511 additions and 2984 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/admin/view/auth/index.html
View File

@ -38,35 +38,26 @@
<td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
<td class='text-center nowrap'>{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}</td>
<td class='text-center nowrap'>
{if auth("edit")}
<!--{if auth("edit")}-->
<a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑权限" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
{/if}
{if auth("apply")}
<!--{/if}-->
<!--{if auth("apply")}-->
<a class="layui-btn layui-btn-normal layui-btn-xs" data-open='{:url("apply")}?id={$vo.id}'>授 权</a>
{/if}
{if $vo.status eq 1 and auth("state")}
<!--{/if}-->
<!--{if $vo.status eq 1 and auth("state")}-->
<a class="layui-btn layui-btn-warm layui-btn-xs" data-confirm="确定禁用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
{/if}
{if $vo.status eq 0 and auth("state")}
<!--{/if}-->
<!--{if $vo.status eq 0 and auth("state")}-->
<a class="layui-btn layui-btn-warm layui-btn-xs" data-confirm="确定启用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
{/if}
{if auth("remove")}
<!--{/if}-->
<!--{if auth("remove")}-->
<a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除权限吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
{/if}
<!--{/if}-->
</td>
</tr>
{/foreach}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block}
{/block}

20
app/admin/view/menu/index.html
View File

@ -43,7 +43,6 @@
<td class='layui-hide-xs'>{$vo.url}</td>
<td class='text-center nowrap'>{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}</td>
<td class='text-center nowrap notselect'>
{if auth("add")}
<!--{if $vo.spt < 2}-->
<a class="layui-btn layui-btn-xs layui-btn-primary" data-title="添加子菜单" data-modal='{:url("add")}?pid={$vo.id}'>添 加</a>
@ -51,21 +50,18 @@
<a class="layui-btn layui-btn-xs layui-btn-disabled">添 加</a>
<!--{/if}-->
{/if}
{if auth("edit")}
<!--{if auth("edit")}-->
<a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑菜单" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
{/if}
{if $vo.status eq 1 and auth("state")}
<!--{/if}-->
<!--{if $vo.status eq 1 and auth("state")}-->
<a class="layui-btn layui-btn-warm layui-btn-xs" data-confirm="确定要禁用菜单吗？" data-action="{:url('state')}" data-value="id#{$vo.ids};status#0" data-csrf="{:systoken('state')}">禁 用</a>
{elseif auth("state")}
<!--{/if}-->
<!--{if $vo.status eq 0 and auth("state")}-->
<a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('state')}" data-value="id#{$vo.ids};status#1" data-csrf="{:systoken('state')}">启 用</a>
{/if}
{if auth("remove")}
<!--{/if}-->
<!--{if auth("remove")}-->
<a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除数据吗?" data-action="{:url('remove')}" data-value="id#{$vo.ids}" data-csrf="{:systoken('remove')}">删 除</a>
{/if}
<!--{/if}-->
</td>
</tr>
{/foreach}

2
app/admin/view/module/index.html
View File

@ -37,8 +37,6 @@
{/foreach}
</tbody>
</table>
{empty name='modules'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block}

2
app/admin/view/oplog/index.html
View File

@ -4,11 +4,9 @@
<!--{if auth('config')}-->
<a class="layui-btn layui-btn-sm layui-btn-primary" data-modal="{:url('config')}">日志配置</a>
<!--{/if}-->
<!--{if auth("clear")}-->
<button data-load='{:url("clear")}' data-confirm="确定要消除所有日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>清理日志</button>
<!--{/if}-->
<!--{if auth("remove")}-->
<button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除日志</button>
<!--{/if}-->

28
app/admin/view/queue/index.html
View File

@ -84,33 +84,35 @@
</td>
<td class='text-left nowrap'>
<div class="margin-bottom-5">
{if isset($vo.loops_time) and $vo.loops_time > 0}
<!--{if isset($vo.loops_time) and $vo.loops_time > 0}-->
<span class="layui-badge layui-bg-orange">循</span>
{/if}
<!--{/if}-->
{if $vo.rscript eq 1}
<!--{if $vo.rscript eq 1}-->
<span class="layui-badge layui-bg-green">复</span>
{else}
<!--{else}-->
<span class="layui-badge layui-bg-blue">单</span>
{/if}
<!--{/if}-->
{if $vo.status eq 1}
<!--{if $vo.status eq 1}-->
<span class="layui-badge layui-bg-black">等待处理</span>
{elseif $vo.status eq 2}
<!--{elseif $vo.status eq 2}-->
<span class="layui-badge layui-bg-green">正在处理</span>
{elseif $vo.status eq 3}
<!--{elseif $vo.status eq 3}-->
<span class="layui-badge layui-bg-blue">处理完成</span>
{elseif $vo.status eq 4 and auth('redo')}
<!--{elseif $vo.status eq 4 and auth('redo')}-->
<span class="layui-badge layui-bg-red">处理失败</span>
<a class="layui-badge layui-bg-green" data-confirm="确定要重置该任务吗？" data-queue="{:url('redo')}?code={$vo.code}">
<i class="layui-icon font-s12">&#xe669;</i>
</a>
{/if}
{if auth("remove") }
<!--{/if}-->
<!--{if auth("remove")}-->
<a class='layui-badge layui-bg-red' data-confirm="确定要删除该任务吗？" data-action='{:url("remove")}' data-value="id#{$vo.id}">
<i class="layui-icon font-s12">&#xe640;</i>
</a>
{/if}
<!--{/if}-->
<a class='layui-badge layui-bg-orange' onclick="$.loadQueue('{$vo.code}',false)">
<i class="layui-icon font-s12">&#xe705;</i>
</a>
@ -121,8 +123,6 @@
{/foreach}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block}

10
vendor/composer/autoload_classmap.php vendored
View File

@ -96,16 +96,6 @@ return array(
'League\\MimeTypeDetection\\FinfoMimeTypeDetector' => $vendorDir . '/league/mime-type-detection/src/FinfoMimeTypeDetector.php',
'League\\MimeTypeDetection\\GeneratedExtensionToMimeTypeMap' => $vendorDir . '/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php',
'League\\MimeTypeDetection\\MimeTypeDetector' => $vendorDir . '/league/mime-type-detection/src/MimeTypeDetector.php',
'Opis\\Closure\\Analyzer' => $vendorDir . '/opis/closure/src/Analyzer.php',
'Opis\\Closure\\ClosureContext' => $vendorDir . '/opis/closure/src/ClosureContext.php',
'Opis\\Closure\\ClosureScope' => $vendorDir . '/opis/closure/src/ClosureScope.php',
'Opis\\Closure\\ClosureStream' => $vendorDir . '/opis/closure/src/ClosureStream.php',
'Opis\\Closure\\ISecurityProvider' => $vendorDir . '/opis/closure/src/ISecurityProvider.php',
'Opis\\Closure\\ReflectionClosure' => $vendorDir . '/opis/closure/src/ReflectionClosure.php',
'Opis\\Closure\\SecurityException' => $vendorDir . '/opis/closure/src/SecurityException.php',
'Opis\\Closure\\SecurityProvider' => $vendorDir . '/opis/closure/src/SecurityProvider.php',
'Opis\\Closure\\SelfReference' => $vendorDir . '/opis/closure/src/SelfReference.php',
'Opis\\Closure\\SerializableClosure' => $vendorDir . '/opis/closure/src/SerializableClosure.php',
'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',

1
vendor/composer/autoload_files.php vendored
View File

@ -7,6 +7,5 @@ $baseDir = dirname($vendorDir);
return array(
'9b552a3cc426e3287cc811caefa3cf53' => $vendorDir . '/topthink/think-helper/src/helper.php',
'538ca81a9a966a6716601ecf48f4eaef' => $vendorDir . '/opis/closure/functions.php',
'8dafcc6956460bc297e00381fed53e11' => $vendorDir . '/zoujingli/think-library/src/common.php',
);

1
vendor/composer/autoload_psr4.php vendored
View File

@ -18,7 +18,6 @@ return array(
'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
'Opis\\Closure\\' => array($vendorDir . '/opis/closure/src'),
'League\\MimeTypeDetection\\' => array($vendorDir . '/league/mime-type-detection/src'),
'League\\Flysystem\\Cached\\' => array($vendorDir . '/league/flysystem-cached-adapter/src'),
'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),

19
vendor/composer/autoload_static.php vendored
View File

@ -8,7 +8,6 @@ class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409
{
public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
'538ca81a9a966a6716601ecf48f4eaef' => __DIR__ . '/..' . '/opis/closure/functions.php',
'8dafcc6956460bc297e00381fed53e11' => __DIR__ . '/..' . '/zoujingli/think-library/src/common.php',
);
@ -40,10 +39,6 @@ class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409
'Psr\\Container\\' => 14,
'Psr\\Cache\\' => 10,
),
'O' =>
array (
'Opis\\Closure\\' => 13,
),
'L' =>
array (
'League\\MimeTypeDetection\\' => 25,
@ -112,10 +107,6 @@ class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409
array (
0 => __DIR__ . '/..' . '/psr/cache/src',
),
'Opis\\Closure\\' =>
array (
0 => __DIR__ . '/..' . '/opis/closure/src',
),
'League\\MimeTypeDetection\\' =>
array (
0 => __DIR__ . '/..' . '/league/mime-type-detection/src',
@ -233,16 +224,6 @@ class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409
'League\\MimeTypeDetection\\FinfoMimeTypeDetector' => __DIR__ . '/..' . '/league/mime-type-detection/src/FinfoMimeTypeDetector.php',
'League\\MimeTypeDetection\\GeneratedExtensionToMimeTypeMap' => __DIR__ . '/..' . '/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php',
'League\\MimeTypeDetection\\MimeTypeDetector' => __DIR__ . '/..' . '/league/mime-type-detection/src/MimeTypeDetector.php',
'Opis\\Closure\\Analyzer' => __DIR__ . '/..' . '/opis/closure/src/Analyzer.php',
'Opis\\Closure\\ClosureContext' => __DIR__ . '/..' . '/opis/closure/src/ClosureContext.php',
'Opis\\Closure\\ClosureScope' => __DIR__ . '/..' . '/opis/closure/src/ClosureScope.php',
'Opis\\Closure\\ClosureStream' => __DIR__ . '/..' . '/opis/closure/src/ClosureStream.php',
'Opis\\Closure\\ISecurityProvider' => __DIR__ . '/..' . '/opis/closure/src/ISecurityProvider.php',
'Opis\\Closure\\ReflectionClosure' => __DIR__ . '/..' . '/opis/closure/src/ReflectionClosure.php',
'Opis\\Closure\\SecurityException' => __DIR__ . '/..' . '/opis/closure/src/SecurityException.php',
'Opis\\Closure\\SecurityProvider' => __DIR__ . '/..' . '/opis/closure/src/SecurityProvider.php',
'Opis\\Closure\\SelfReference' => __DIR__ . '/..' . '/opis/closure/src/SelfReference.php',
'Opis\\Closure\\SerializableClosure' => __DIR__ . '/..' . '/opis/closure/src/SerializableClosure.php',
'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',

102
vendor/composer/installed.json vendored
View File

@ -280,75 +280,6 @@
}
]
},
{
"name": "opis/closure",
"version": "3.5.7",
"version_normalized": "3.5.7.0",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
"reference": "4531e53afe2fc660403e76fb7644e95998bff7bf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/4531e53afe2fc660403e76fb7644e95998bff7bf",
"reference": "4531e53afe2fc660403e76fb7644e95998bff7bf",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": "^5.4 || ^7.0"
},
"require-dev": {
"jeremeamia/superclosure": "^2.0",
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"time": "2020-09-06T17:02:15+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.5.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Opis\\Closure\\": "src/"
},
"files": [
"functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marius Sarca",
"email": "marius.sarca@gmail.com"
},
{
"name": "Sorin Sarca",
"email": "sarca_sorin@hotmail.com"
}
],
"description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
"homepage": "https://opis.io/closure",
"keywords": [
"anonymous functions",
"closure",
"function",
"serializable",
"serialization",
"serialize"
]
},
{
"name": "psr/cache",
"version": "1.0.1",
@ -649,17 +580,17 @@
},
{
"name": "topthink/framework",
"version": "v6.0.3",
"version_normalized": "6.0.3.0",
"version": "v6.0.4",
"version_normalized": "6.0.4.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "b4046fb21e6163ba23a792b694162693dbe71b4b"
"reference": "4b252d78562d4a51a501651f837c26cb9d91624f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/b4046fb21e6163ba23a792b694162693dbe71b4b",
"reference": "b4046fb21e6163ba23a792b694162693dbe71b4b",
"url": "https://api.github.com/repos/top-think/framework/zipball/4b252d78562d4a51a501651f837c26cb9d91624f",
"reference": "4b252d78562d4a51a501651f837c26cb9d91624f",
"shasum": "",
"mirrors": [
{
@ -673,7 +604,6 @@
"ext-mbstring": "*",
"league/flysystem": "^1.0",
"league/flysystem-cached-adapter": "^1.0",
"opis/closure": "^3.1",
"php": ">=7.1.0",
"psr/container": "~1.0",
"psr/log": "~1.0",
@ -686,7 +616,7 @@
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^7.0"
},
"time": "2020-06-26T16:03:10+00:00",
"time": "2020-09-29T02:19:59+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -766,17 +696,17 @@
},
{
"name": "topthink/think-orm",
"version": "v2.0.33",
"version_normalized": "2.0.33.0",
"version": "v2.0.34",
"version_normalized": "2.0.34.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-orm.git",
"reference": "35ca511a1e4d671b39f7afb4c887703c16ef6957"
"reference": "57f9b98895b0ff4ae7b7b75e51456fd8cb8fb629"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/think-orm/zipball/35ca511a1e4d671b39f7afb4c887703c16ef6957",
"reference": "35ca511a1e4d671b39f7afb4c887703c16ef6957",
"url": "https://api.github.com/repos/top-think/think-orm/zipball/57f9b98895b0ff4ae7b7b75e51456fd8cb8fb629",
"reference": "57f9b98895b0ff4ae7b7b75e51456fd8cb8fb629",
"shasum": "",
"mirrors": [
{
@ -792,7 +722,7 @@
"psr/simple-cache": "^1.0",
"topthink/think-helper": "^3.1"
},
"time": "2020-06-22T14:57:28+00:00",
"time": "2020-09-28T08:24:57+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -963,12 +893,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "3a7ff93e03acdcf5c723c7c4edcb36c9c9828e6a"
"reference": "141fa175f3cdbdb4ad2e9927d6de379fb618e75a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3a7ff93e03acdcf5c723c7c4edcb36c9c9828e6a",
"reference": "3a7ff93e03acdcf5c723c7c4edcb36c9c9828e6a",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/141fa175f3cdbdb4ad2e9927d6de379fb618e75a",
"reference": "141fa175f3cdbdb4ad2e9927d6de379fb618e75a",
"shasum": "",
"mirrors": [
{
@ -985,7 +915,7 @@
"ext-mbstring": "*",
"topthink/framework": "^6.0"
},
"time": "2020-09-27T03:40:51+00:00",
"time": "2020-09-29T05:20:22+00:00",
"type": "library",
"extra": {
"think": {

43
vendor/opis/closure/.github/workflows/tests.yml vendored
View File

@ -1,43 +0,0 @@
name: "Tests"
on:
push:
paths-ignore:
- '**.md'
pull_request:
paths-ignore:
- '**.md'
jobs:
tests:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
php: [5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
stability: [prefer-stable]
name: PHP ${{ matrix.php }}
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Cache dependencies
uses: actions/cache@v1
with:
path: ~/.composer/cache/files
key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
- name: Update composer
run: composer self-update
- name: Install dependencies
run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
- name: Execute tests
run: vendor/bin/phpunit --verbose

247
vendor/opis/closure/CHANGELOG.md vendored
View File

@ -1,247 +0,0 @@
CHANGELOG
---------
### v3.5.7, 2020.09.06
- Fixed issue [#76](https://github.com/opis/closure/issues/76).
- Fixed issue [#78](https://github.com/opis/closure/issues/78).
### v3.5.6, 2020.08.11
- Fixed issue [#70](https://github.com/opis/closure/issues/70)
### v3.5.5, 2020.06.17
- Fixed a false-positive when using `Opis\Closure\ReflectionClosure::isScopeRequired` method
### v3.5.4, 2020.06.07
- Fixed a false-positive when using `Opis\Closure\ReflectionClosure::isScopeRequired` method
- Fixed a bug related to `T_STRING_VARNAME`
### v3.5.3, 2020.05.25
- Improved parser
- The class scope optimisation is no longer used. We always bind now to the closure's original class scope.
When the class scope was `null`, the optimisation failed to work as expected and kept the wrong `SerializableClosure` scope.
### v3.5.2, 2020.05.21
- Removed extra semicolon in short closures, since is not part of the closure's body.
### v3.5.1, 2019.11.30
- Bugfix. See #47
### v3.5.0, 2019.11.29
- Added support for short closures (arrow functions)
- Added `isShortClosure` method to `Opis\Closure\ReflectionClosure`
### v3.4.2, 2019.11.29
- Added `stream_set_option()`
### v3.4.1, 2019.10.19
- Fixed a [bug](https://github.com/opis/closure/issues/40) that prevented serialization to work correctly.
### v3.4.0, 2019.09.03
- Added `createClosure` static method in `Opis\Closure\SerializableClosure`.
This method creates a new closure from arbitrary code, emulating `create_function`,
but without using eval
### v3.3.1, 2019.07.10
- Use `sha1` instead of `md5` for hashing file names in `Opis\Closure\ReflectionClosure` class
### v3.3.0, 2019.05.31
- Fixed a bug that prevented signed closures to properly work when the serialized string
contains invalid UTF-8 chars. Starting with this version `json_encode` is no longer used
when signing a closure. Backward compatibility is maintained and all closures that were
previously signed using the old method will continue to work.
### v3.2.0, 2019.05.05
- Since an unsigned closure can be unserialized when no security provider is set,
there is no reason to treat differently a signed closure in the same situation.
Therefore, the `Opis\Closure\SecurityException` exception is no longer thrown when
unserializing a signed closure, if no security provider is set.
### v3.1.6, 2019.02.22
- Fixed a bug that occurred when trying to set properties of classes that were not defined in user-land.
Those properties are now ignored.
### v3.1.5, 2019.01.14
- Improved parser
### v3.1.4, 2019.01.14
- Added support for static methods that are named using PHP keywords or magic constants.
Ex: `A::new()`, `A::use()`, `A::if()`, `A::function()`, `A::__DIR__()`, etc.
- Used `@internal` to mark classes & methods that are for internal use only and
backward compatibility is not guaranteed.
### v3.1.3, 2019.01.07
- Fixed a bug that prevented traits to be correctly resolved when used by an
anonymous class
- Fixed a bug that occurred when `$this` keyword was used inside an anonymous class
### v3.1.2, 2018.12.16
* Fixed a bug regarding comma trail in group-use statements. See [issue 23](https://github.com/opis/closure/issues/23)
### v3.1.1, 2018.10.02
* Fixed a bug where `parent` keyword was treated like a class-name and scope was not added to the
serialized closure
* Fixed a bug where return type was not properly handled for nested closures
* Support for anonymous classes was improved
### v3.1.0, 2018.09.20
* Added `transformUseVariables` and `resolveUseVariables` to
`Opis\Closure\SerializableClosure` class.
* Added `removeSecurityProvider` static method to
`Opis\Closure\SerializableClosure` class.
* Fixed some security related issues where a user was able to unserialize an unsigned
closure, even when a security provider was in use.
### v3.0.12, 2018.02.23
* Bugfix. See [issue 20](https://github.com/opis/closure/issues/20)
### v3.0.11, 2018.01.22
* Bugfix. See [issue 18](https://github.com/opis/closure/issues/18)
### v3.0.10, 2018.01.04
* Improved support for PHP 7.1 & 7.2
### v3.0.9, 2018.01.04
* Fixed a bug where the return type was not properly resolved.
See [issue 17](https://github.com/opis/closure/issues/17)
* Added more tests
### v3.0.8, 2017.12.18
* Fixed a bug. See [issue 16](https://github.com/opis/closure/issues/16)
### v3.0.7, 2017.10.31
* Bugfix: static properties are ignored now, since they are not serializable
### v3.0.6, 2017.10.06
* Fixed a bug introduced by accident in 3.0.5
### v3.0.5, 2017.09.18
* Fixed a bug related to nested references
### v3.0.4, 2017.09.18
* \[*internal*\] Refactored `SerializableClosure::mapPointers` method
* \[*internal*\] Added a new optional argument to `SerializableClosure::unwrapClosures`
* \[*internal*\] Removed `SerializableClosure::getClosurePointer` method
* Fixed various bugs
### v3.0.3, 2017.09.06
* Fixed a bug related to nested object references
* \[*internal*\] `Opis\Closure\ClosureScope` now extends `SplObjectStorage`
* \[*internal*\] The `storage` property was removed from `Opis\Closure\ClosureScope`
* \[*internal*\] The `instances` and `objects` properties were removed from `Opis\Closure\ClosureContext`
### v3.0.2, 2017.08.28
* Fixed a bug where `$this` object was not handled properly inside the
`SerializableClosre::serialize` method.
### v3.0.1, 2017.04.13
* Fixed a bug in 'ignore_next' state
### v3.0.0, 2017.04.07
* Dropped PHP 5.3 support
* Moved source files from `lib` to `src` folder
* Removed second parameter from `Opis\Closure\SerializableClosure::from` method and from constructor
* Removed `Opis\Closure\{SecurityProviderInterface, DefaultSecurityProvider, SecureClosure}` classes
* Refactored how signed closures were handled
* Added `wrapClosures` and `unwrapClosures` static methods to `Opis\Closure\SerializableClosure` class
* Added `Opis\Colosure\serialize` and `Opis\Closure\unserialize` functions
* Improved serialization. You can now serialize arbitrary objects and the library will automatically wrap all closures
### v2.4.0, 2016.12.16
* The parser was refactored and improved
* Refactored `Opis\Closure\SerializableClosure::__invoke` method
* `Opis\Closure\{ISecurityProvider, SecurityProvider}` were added
* `Opis\Closure\{SecurityProviderInterface, DefaultSecurityProvider, SecureClosure}` were deprecated
and they will be removed in the next major version
* `setSecretKey` and `addSecurityProvider` static methods were added to `Opis\Closure\SerializableClosure`
### v2.3.2, 2016.12.15
* Fixed a bug that prevented namespace resolution to be done properly
### v2.3.1, 2016.12.13
* Hotfix. See [PR](https://github.com/opis/closure/pull/7)
### v2.3.0, 2016.11.17
* Added `isBindingRequired` and `isScopeRequired` to the `Opis\Closure\ReflectionClosure` class
* Automatically detects when the scope and/or the bound object of a closure needs to be serialized.
### v2.2.1, 2016.08.20
* Fixed a bug in `Opis\Closure\ReflectionClosure::fetchItems`
### v2.2.0, 2016.07.26
* Fixed CS
* `Opis\Closure\ClosureContext`, `Opis\Closure\ClosureScope`, `Opis\Closure\SelfReference`
and `Opis\Closure\SecurityException` classes were moved into separate files
* Added support for PHP7 syntax
* Fixed some bugs in `Opis\Closure\ReflectionClosure` class
* Improved closure parser
* Added an analyzer for SuperClosure library
### v2.1.0, 2015.09.30
* Added support for the missing `__METHOD__`, `__FUNCTION__` and `__TRAIT__` magic constants
* Added some security related classes and interfaces: `Opis\Closure\SecurityProviderInterface`,
`Opis\Closure\DefaultSecurityProvider`, `Opis\Closure\SecureClosure`, `Opis\Closure\SecurityException`.
* Fiexed a bug in `Opis\Closure\ReflectionClosure::getClasses` method
* Other minor bugfixes
* Added support for static closures
* Added public `isStatic` method to `Opis\Closure\ReflectionClosure` class
### v2.0.1, 2015.09.23
* Removed `branch-alias` property from `composer.json`
* Bugfix. See [issue #6](https://github.com/opis/closure/issues/6)
### v2.0.0, 2015.07.31
* The closure parser was improved
* Class names are now automatically resolved
* Added support for the `#trackme` directive which allows tracking closure's residing source
### v1.3.0, 2014.10.18
* Added autoload file
* Changed README file
### Opis Closure 1.2.2
* Started changelog

20
vendor/opis/closure/LICENSE vendored
View File

@ -1,20 +0,0 @@
The MIT License (MIT)
Copyright (c) 2018-2019 Zindex Software
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

9
vendor/opis/closure/NOTICE vendored
View File

@ -1,9 +0,0 @@
Opis Closure
Copyright 2018-2019 Zindex Software
This product includes software developed at
Zindex Software (http://zindex.software).
This software was originally developed by Marius Sarca and Sorin Sarca
(Copyright 2014-2018). The copyright info was changed with the permission
of the original authors.

92
vendor/opis/closure/README.md vendored
View File

@ -1,92 +0,0 @@
Opis Closure
====================
[![Tests](https://github.com/opis/closure/workflows/Tests/badge.svg)](https://github.com/opis/closure/actions)
[![Latest Stable Version](https://poser.pugx.org/opis/closure/v/stable.png)](https://packagist.org/packages/opis/closure)
[![Latest Unstable Version](https://poser.pugx.org/opis/closure/v/unstable.png)](https://packagist.org/packages/opis/closure)
[![License](https://poser.pugx.org/opis/closure/license.png)](https://packagist.org/packages/opis/closure)
Serializable closures
---------------------
**Opis Closure** is a library that aims to overcome PHP's limitations regarding closure
serialization by providing a wrapper that will make all closures serializable.
**The library's key features:**
- Serialize any closure
- Serialize arbitrary objects
- Doesn't use `eval` for closure serialization or unserialization
- Works with any PHP version that has support for closures
- Supports PHP 7 syntax
- Handles all variables referenced/imported in `use()` and automatically wraps all referenced/imported closures for
proper serialization
- Handles recursive closures
- Handles magic constants like `__FILE__`, `__DIR__`, `__LINE__`, `__NAMESPACE__`, `__CLASS__`,
`__TRAIT__`, `__METHOD__` and `__FUNCTION__`.
- Automatically resolves all class names, function names and constant names used inside the closure
- Track closure's residing source by using the `#trackme` directive
- Simple and very fast parser
- Any error or exception, that might occur when executing an unserialized closure, can be caught and treated properly
- You can serialize/unserialize any closure unlimited times, even those previously unserialized
(this is possible because `eval()` is not used for unserialization)
- Handles static closures
- Supports cryptographically signed closures
- Provides a reflector that can give you information about the serialized closure
- Provides an analyzer for *SuperClosure* library
- Automatically detects when the scope and/or the bound object of a closure needs to be serialized
in order for the closure to work after deserialization
## Documentation
The full documentation for this library can be found [here][documentation].
## License
**Opis Closure** is licensed under the [MIT License (MIT)][license].
## Requirements
* PHP ^5.4 || ^7.0
## Installation
**Opis Closure** is available on [Packagist] and it can be installed from a
command line interface by using [Composer].
```bash
composer require opis/closure
```
Or you could directly reference it into your `composer.json` file as a dependency
```json
{
"require": {
"opis/closure": "^3.5"
}
}
```
### Migrating from 2.x
If your project needs to support PHP 5.3 you can continue using the `2.x` version
of **Opis Closure**. Otherwise, assuming you are not using one of the removed/refactored classes or features(see
[CHANGELOG]), migrating to version `3.x` is simply a matter of updating your `composer.json` file.
### Semantic versioning
**Opis Closure** follows [semantic versioning][SemVer] specifications.
### Arbitrary object serialization
We've added this feature in order to be able to support the serialization of a closure's bound object.
The implementation is far from being perfect, and it's really hard to make it work flawless.
We will try to improve this, but we can't guarantee anything.
So our advice regarding the `Opis\Closure\serialize|unserialize` functions is to use them with caution.
[documentation]: https://www.opis.io/closure "Opis Closure"
[license]: http://opensource.org/licenses/MIT "MIT License"
[Packagist]: https://packagist.org/packages/opis/closure "Packagist"
[Composer]: https://getcomposer.org "Composer"
[SemVer]: http://semver.org/ "Semantic versioning"
[CHANGELOG]: https://github.com/opis/closure/blob/master/CHANGELOG.md "Changelog"

39
vendor/opis/closure/autoload.php vendored
View File

@ -1,39 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
require_once 'functions.php';
spl_autoload_register(function($class){
$class = ltrim($class, '\\');
$dir = __DIR__ . '/src';
$namespace = 'Opis\Closure';
if(strpos($class, $namespace) === 0)
{
$class = substr($class, strlen($namespace));
$path = '';
if(($pos = strripos($class, '\\')) !== FALSE)
{
$path = str_replace('\\', '/', substr($class, 0, $pos)) . '/';
$class = substr($class, $pos + 1);
}
$path .= str_replace('_', '/', $class) . '.php';
$dir .= '/' . $path;
if(file_exists($dir))
{
include $dir;
return true;
}
return false;
}
return false;
});

40
vendor/opis/closure/composer.json vendored
View File

@ -1,40 +0,0 @@
{
"name": "opis/closure",
"description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
"keywords": ["closure", "serialization", "function", "serializable", "serialize", "anonymous functions"],
"homepage": "https://opis.io/closure",
"license": "MIT",
"authors": [
{
"name": "Marius Sarca",
"email": "marius.sarca@gmail.com"
},
{
"name": "Sorin Sarca",
"email": "sarca_sorin@hotmail.com"
}
],
"require": {
"php": "^5.4 || ^7.0"
},
"require-dev": {
"jeremeamia/superclosure": "^2.0",
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"autoload": {
"psr-4": {
"Opis\\Closure\\": "src/"
},
"files": ["functions.php"]
},
"autoload-dev": {
"psr-4": {
"Opis\\Closure\\Test\\": "tests/"
}
},
"extra": {
"branch-alias": {
"dev-master": "3.5.x-dev"
}
}
}

41
vendor/opis/closure/functions.php vendored
View File

@ -1,41 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
/**
* Serialize
*
* @param mixed $data
* @return string
*/
function serialize($data)
{
SerializableClosure::enterContext();
SerializableClosure::wrapClosures($data);
$data = \serialize($data);
SerializableClosure::exitContext();
return $data;
}
/**
* Unserialize
*
* @param string $data
* @param array|null $options
* @return mixed
*/
function unserialize($data, array $options = null)
{
SerializableClosure::enterContext();
$data = ($options === null || \PHP_MAJOR_VERSION < 7)
? \unserialize($data)
: \unserialize($data, $options);
SerializableClosure::unwrapClosures($data);
SerializableClosure::exitContext();
return $data;
}

62
vendor/opis/closure/src/Analyzer.php vendored
View File

@ -1,62 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
use Closure;
use SuperClosure\Analyzer\ClosureAnalyzer;
/**
* @deprecated We'll remove this class
*/
class Analyzer extends ClosureAnalyzer
{
/**
* Analyzer a given closure.
*
* @param Closure $closure
*
* @return array
*/
public function analyze(Closure $closure)
{
$reflection = new ReflectionClosure($closure);
$scope = $reflection->getClosureScopeClass();
$data = [
'reflection' => $reflection,
'code' => $reflection->getCode(),
'hasThis' => $reflection->isBindingRequired(),
'context' => $reflection->getUseVariables(),
'hasRefs' => false,
'binding' => $reflection->getClosureThis(),
'scope' => $scope ? $scope->getName() : null,
'isStatic' => $reflection->isStatic(),
];
return $data;
}
/**
* @param array $data
* @return mixed
*/
protected function determineCode(array &$data)
{
return null;
}
/**
* @param array $data
* @return mixed
*/
protected function determineContext(array &$data)
{
return null;
}
}

34
vendor/opis/closure/src/ClosureContext.php vendored
View File

@ -1,34 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
/**
* Closure context class
* @internal
*/
class ClosureContext
{
/**
* @var ClosureScope Closures scope
*/
public $scope;
/**
* @var integer
*/
public $locks;
/**
* Constructor
*/
public function __construct()
{
$this->scope = new ClosureScope();
$this->locks = 0;
}
}

25
vendor/opis/closure/src/ClosureScope.php vendored
View File

@ -1,25 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
/**
* Closure scope class
* @internal
*/
class ClosureScope extends \SplObjectStorage
{
/**
* @var integer Number of serializations in current scope
*/
public $serializations = 0;
/**
* @var integer Number of closures that have to be serialized
*/
public $toserialize = 0;
}

99
vendor/opis/closure/src/ClosureStream.php vendored
View File

@ -1,99 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
/**
* @internal
*/
class ClosureStream
{
const STREAM_PROTO = 'closure';
protected static $isRegistered = false;
protected $content;
protected $length;
protected $pointer = 0;
function stream_open($path, $mode, $options, &$opened_path)
{
$this->content = "<?php\nreturn " . substr($path, strlen(static::STREAM_PROTO . '://')) . ";";
$this->length = strlen($this->content);
return true;
}
public function stream_read($count)
{
$value = substr($this->content, $this->pointer, $count);
$this->pointer += $count;
return $value;
}
public function stream_eof()
{
return $this->pointer >= $this->length;
}
public function stream_set_option($option, $arg1, $arg2)
{
return false;
}
public function stream_stat()
{
$stat = stat(__FILE__);
$stat[7] = $stat['size'] = $this->length;
return $stat;
}
public function url_stat($path, $flags)
{
$stat = stat(__FILE__);
$stat[7] = $stat['size'] = $this->length;
return $stat;
}
public function stream_seek($offset, $whence = SEEK_SET)
{
$crt = $this->pointer;
switch ($whence) {
case SEEK_SET:
$this->pointer = $offset;
break;
case SEEK_CUR:
$this->pointer += $offset;
break;
case SEEK_END:
$this->pointer = $this->length + $offset;
break;
}
if ($this->pointer < 0 || $this->pointer >= $this->length) {
$this->pointer = $crt;
return false;
}
return true;
}
public function stream_tell()
{
return $this->pointer;
}
public static function register()
{
if (!static::$isRegistered) {
static::$isRegistered = stream_wrapper_register(static::STREAM_PROTO, __CLASS__);
}
}
}

25
vendor/opis/closure/src/ISecurityProvider.php vendored
View File

@ -1,25 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
interface ISecurityProvider
{
/**
* Sign serialized closure
* @param string $closure
* @return array
*/
public function sign($closure);
/**
* Verify signature
* @param array $data
* @return bool
*/
public function verify(array $data);
}

1042
vendor/opis/closure/src/ReflectionClosure.php vendored
View File

File diff suppressed because it is too large Load Diff

18
vendor/opis/closure/src/SecurityException.php vendored
View File

@ -1,18 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
use Exception;
/**
* Security exception class
*/
class SecurityException extends Exception
{
}

42
vendor/opis/closure/src/SecurityProvider.php vendored
View File

@ -1,42 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
class SecurityProvider implements ISecurityProvider
{
/** @var string */
protected $secret;
/**
* SecurityProvider constructor.
* @param string $secret
*/
public function __construct($secret)
{
$this->secret = $secret;
}
/**
* @inheritdoc
*/
public function sign($closure)
{
return array(
'closure' => $closure,
'hash' => base64_encode(hash_hmac('sha256', $closure, $this->secret, true)),
);
}
/**
* @inheritdoc
*/
public function verify(array $data)
{
return base64_encode(hash_hmac('sha256', $data['closure'], $this->secret, true)) === $data['hash'];
}
}

31
vendor/opis/closure/src/SelfReference.php vendored
View File

@ -1,31 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
/**
* Helper class used to indicate a reference to an object
* @internal
*/
class SelfReference
{
/**
* @var string An unique hash representing the object
*/
public $hash;
/**
* Constructor
*
* @param string $hash
*/
public function __construct($hash)
{
$this->hash = $hash;
}
}

678
vendor/opis/closure/src/SerializableClosure.php vendored
View File

@ -1,678 +0,0 @@
<?php
/* ===========================================================================
* Copyright (c) 2018-2019 Zindex Software
*
* Licensed under the MIT License
* =========================================================================== */
namespace Opis\Closure;
use Closure;
use Serializable;
use SplObjectStorage;
use ReflectionObject;
/**
* Provides a wrapper for serialization of closures
*/
class SerializableClosure implements Serializable
{
/**
* @var Closure Wrapped closure
*
* @see \Opis\Closure\SerializableClosure::getClosure()
*/
protected $closure;
/**
* @var ReflectionClosure A reflection instance for closure
*
* @see \Opis\Closure\SerializableClosure::getReflector()
*/
protected $reflector;
/**
* @var mixed Used at deserialization to hold variables
*
* @see \Opis\Closure\SerializableClosure::unserialize()
* @see \Opis\Closure\SerializableClosure::getReflector()
*/
protected $code;
/**
* @var string Closure's ID
*/
protected $reference;
/**
* @var string Closure scope
*/
protected $scope;
/**
* @var ClosureContext Context of closure, used in serialization
*/
protected static $context;
/**
* @var ISecurityProvider|null
*/
protected static $securityProvider;
/** Array recursive constant*/
const ARRAY_RECURSIVE_KEY = '¯\_(ツ)_/¯';
/**
* Constructor
*
* @param Closure $closure Closure you want to serialize
*/
public function __construct(Closure $closure)
{
$this->closure = $closure;
if (static::$context !== null) {
$this->scope = static::$context->scope;
$this->scope->toserialize++;
}
}
/**
* Get the Closure object
*
* @return Closure The wrapped closure
*/
public function getClosure()
{
return $this->closure;
}
/**
* Get the reflector for closure
*
* @return ReflectionClosure
*/
public function getReflector()
{
if ($this->reflector === null) {
$this->reflector = new ReflectionClosure($this->closure, $this->code);
$this->code = null;
}
return $this->reflector;
}
/**
* Implementation of magic method __invoke()
*/
public function __invoke()
{
return call_user_func_array($this->closure, func_get_args());
}
/**
* Implementation of Serializable::serialize()
*
* @return string The serialized closure
*/
public function serialize()
{
if ($this->scope === null) {
$this->scope = new ClosureScope();
$this->scope->toserialize++;
}
$this->scope->serializations++;
$scope = $object = null;
$reflector = $this->getReflector();
if($reflector->isBindingRequired()){
$object = $reflector->getClosureThis();
static::wrapClosures($object, $this->scope);
if($scope = $reflector->getClosureScopeClass()){
$scope = $scope->name;
}
} else {
if($scope = $reflector->getClosureScopeClass()){
$scope = $scope->name;
}
}
$this->reference = spl_object_hash($this->closure);
$this->scope[$this->closure] = $this;
$use = $this->transformUseVariables($reflector->getUseVariables());
$code = $reflector->getCode();
$this->mapByReference($use);
$ret = \serialize(array(
'use' => $use,
'function' => $code,
'scope' => $scope,
'this' => $object,
'self' => $this->reference,
));
if (static::$securityProvider !== null) {
$data = static::$securityProvider->sign($ret);
$ret = '@' . $data['hash'] . '.' . $data['closure'];
}
if (!--$this->scope->serializations && !--$this->scope->toserialize) {
$this->scope = null;
}
return $ret;
}
/**
* Transform the use variables before serialization.
*
* @param array $data The Closure's use variables
* @return array
*/
protected function transformUseVariables($data)
{
return $data;
}
/**
* Implementation of Serializable::unserialize()
*
* @param string $data Serialized data
* @throws SecurityException
*/
public function unserialize($data)
{
ClosureStream::register();
if (static::$securityProvider !== null) {
if ($data[0] !== '@') {
throw new SecurityException("The serialized closure is not signed. ".
"Make sure you use a security provider for both serialization and unserialization.");
}
if ($data[1] !== '{') {
$separator = strpos($data, '.');
if ($separator === false) {
throw new SecurityException('Invalid signed closure');
}
$hash = substr($data, 1, $separator - 1);
$closure = substr($data, $separator + 1);
$data = ['hash' => $hash, 'closure' => $closure];
unset($hash, $closure);
} else {
$data = json_decode(substr($data, 1), true);
}
if (!is_array($data) || !static::$securityProvider->verify($data)) {
throw new SecurityException("Your serialized closure might have been modified and it's unsafe to be unserialized. " .
"Make sure you use the same security provider, with the same settings, " .
"both for serialization and unserialization.");
}
$data = $data['closure'];
} elseif ($data[0] === '@') {
if ($data[1] !== '{') {
$separator = strpos($data, '.');
if ($separator === false) {
throw new SecurityException('Invalid signed closure');
}
$hash = substr($data, 1, $separator - 1);
$closure = substr($data, $separator + 1);
$data = ['hash' => $hash, 'closure' => $closure];
unset($hash, $closure);
} else {
$data = json_decode(substr($data, 1), true);
}
if (!is_array($data) || !isset($data['closure']) || !isset($data['hash'])) {
throw new SecurityException('Invalid signed closure');
}
$data = $data['closure'];
}
$this->code = \unserialize($data);
// unset data
unset($data);
$this->code['objects'] = array();
if ($this->code['use']) {
$this->scope = new ClosureScope();
$this->code['use'] = $this->resolveUseVariables($this->code['use']);
$this->mapPointers($this->code['use']);
extract($this->code['use'], EXTR_OVERWRITE | EXTR_REFS);
$this->scope = null;
}
$this->closure = include(ClosureStream::STREAM_PROTO . '://' . $this->code['function']);
if($this->code['this'] === $this){
$this->code['this'] = null;
}
$this->closure = $this->closure->bindTo($this->code['this'], $this->code['scope']);
if(!empty($this->code['objects'])){
foreach ($this->code['objects'] as $item){
$item['property']->setValue($item['instance'], $item['object']->getClosure());
}
}
$this->code = $this->code['function'];
}
/**
* Resolve the use variables after unserialization.
*
* @param array $data The Closure's transformed use variables
* @return array
*/
protected function resolveUseVariables($data)
{
return $data;
}
/**
* Wraps a closure and sets the serialization context (if any)
*
* @param Closure $closure Closure to be wrapped
*
* @return self The wrapped closure
*/
public static function from(Closure $closure)
{
if (static::$context === null) {
$instance = new static($closure);
} elseif (isset(static::$context->scope[$closure])) {
$instance = static::$context->scope[$closure];
} else {
$instance = new static($closure);
static::$context->scope[$closure] = $instance;
}
return $instance;
}
/**
* Increments the context lock counter or creates a new context if none exist
*/
public static function enterContext()
{
if (static::$context === null) {
static::$context = new ClosureContext();
}
static::$context->locks++;
}
/**
* Decrements the context lock counter and destroy the context when it reaches to 0
*/
public static function exitContext()
{
if (static::$context !== null && !--static::$context->locks) {
static::$context = null;
}
}
/**
* @param string $secret
*/
public static function setSecretKey($secret)
{
if(static::$securityProvider === null){
static::$securityProvider = new SecurityProvider($secret);
}
}
/**
* @param ISecurityProvider $securityProvider
*/
public static function addSecurityProvider(ISecurityProvider $securityProvider)
{
static::$securityProvider = $securityProvider;
}
/**
* Remove security provider
*/
public static function removeSecurityProvider()
{
static::$securityProvider = null;
}
/**
* @return null|ISecurityProvider
*/
public static function getSecurityProvider()
{
return static::$securityProvider;
}
/**
* Wrap closures
*
* @internal
* @param $data
* @param ClosureScope|SplObjectStorage|null $storage
*/
public static function wrapClosures(&$data, SplObjectStorage $storage = null)
{
if($storage === null){
$storage = static::$context->scope;
}
if($data instanceof Closure){
$data = static::from($data);
} elseif (is_array($data)){
if(isset($data[self::ARRAY_RECURSIVE_KEY])){
return;
}
$data[self::ARRAY_RECURSIVE_KEY] = true;
foreach ($data as $key => &$value){
if($key === self::ARRAY_RECURSIVE_KEY){
continue;
}
static::wrapClosures($value, $storage);
}
unset($value);
unset($data[self::ARRAY_RECURSIVE_KEY]);
} elseif($data instanceof \stdClass){
if(isset($storage[$data])){
$data = $storage[$data];
return;
}
$data = $storage[$data] = clone($data);
foreach ($data as &$value){
static::wrapClosures($value, $storage);
}
unset($value);
} elseif (is_object($data) && ! $data instanceof static){
if(isset($storage[$data])){
$data = $storage[$data];
return;
}
$instance = $data;
$reflection = new ReflectionObject($instance);
if(!$reflection->isUserDefined()){
$storage[$instance] = $data;
return;
}
$storage[$instance] = $data = $reflection->newInstanceWithoutConstructor();
do{
if(!$reflection->isUserDefined()){
break;
}
foreach ($reflection->getProperties() as $property){
if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
continue;
}
$property->setAccessible(true);
if (PHP_VERSION >= 7.4 && !$property->isInitialized($instance)) {
continue;
}
$value = $property->getValue($instance);
if(is_array($value) || is_object($value)){
static::wrapClosures($value, $storage);
}
$property->setValue($data, $value);
};
} while($reflection = $reflection->getParentClass());
}
}
/**
* Unwrap closures
*
* @internal
* @param $data
* @param SplObjectStorage|null $storage
*/
public static function unwrapClosures(&$data, SplObjectStorage $storage = null)
{
if($storage === null){
$storage = static::$context->scope;
}
if($data instanceof static){
$data = $data->getClosure();
} elseif (is_array($data)){
if(isset($data[self::ARRAY_RECURSIVE_KEY])){
return;
}
$data[self::ARRAY_RECURSIVE_KEY] = true;
foreach ($data as $key => &$value){
if($key === self::ARRAY_RECURSIVE_KEY){
continue;
}
static::unwrapClosures($value, $storage);
}
unset($data[self::ARRAY_RECURSIVE_KEY]);
}elseif ($data instanceof \stdClass){
if(isset($storage[$data])){
return;
}
$storage[$data] = true;
foreach ($data as &$property){
static::unwrapClosures($property, $storage);
}
} elseif (is_object($data) && !($data instanceof Closure)){
if(isset($storage[$data])){
return;
}
$storage[$data] = true;
$reflection = new ReflectionObject($data);
do{
if(!$reflection->isUserDefined()){
break;
}
foreach ($reflection->getProperties() as $property){
if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
continue;
}
$property->setAccessible(true);
if (PHP_VERSION >= 7.4 && !$property->isInitialized($data)) {
continue;
}
$value = $property->getValue($data);
if(is_array($value) || is_object($value)){
static::unwrapClosures($value, $storage);
$property->setValue($data, $value);
}
};
} while($reflection = $reflection->getParentClass());
}
}
/**
* Creates a new closure from arbitrary code,
* emulating create_function, but without using eval
*
* @param string$args
* @param string $code
* @return Closure
*/
public static function createClosure($args, $code)
{
ClosureStream::register();
return include(ClosureStream::STREAM_PROTO . '://function(' . $args. '){' . $code . '};');
}
/**
* Internal method used to map closure pointers
* @internal
* @param $data
*/
protected function mapPointers(&$data)
{
$scope = $this->scope;
if ($data instanceof static) {
$data = &$data->closure;
} elseif (is_array($data)) {
if(isset($data[self::ARRAY_RECURSIVE_KEY])){
return;
}
$data[self::ARRAY_RECURSIVE_KEY] = true;
foreach ($data as $key => &$value){
if($key === self::ARRAY_RECURSIVE_KEY){
continue;
} elseif ($value instanceof static) {
$data[$key] = &$value->closure;
} elseif ($value instanceof SelfReference && $value->hash === $this->code['self']){
$data[$key] = &$this->closure;
} else {
$this->mapPointers($value);
}
}
unset($value);
unset($data[self::ARRAY_RECURSIVE_KEY]);
} elseif ($data instanceof \stdClass) {
if(isset($scope[$data])){
return;
}
$scope[$data] = true;
foreach ($data as $key => &$value){
if ($value instanceof SelfReference && $value->hash === $this->code['self']){
$data->{$key} = &$this->closure;
} elseif(is_array($value) || is_object($value)) {
$this->mapPointers($value);
}
}
unset($value);
} elseif (is_object($data) && !($data instanceof Closure)){
if(isset($scope[$data])){
return;
}
$scope[$data] = true;
$reflection = new ReflectionObject($data);
do{
if(!$reflection->isUserDefined()){
break;
}
foreach ($reflection->getProperties() as $property){
if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
continue;
}
$property->setAccessible(true);
if (PHP_VERSION >= 7.4 && !$property->isInitialized($data)) {
continue;
}
$item = $property->getValue($data);
if ($item instanceof SerializableClosure || ($item instanceof SelfReference && $item->hash === $this->code['self'])) {
$this->code['objects'][] = array(
'instance' => $data,
'property' => $property,
'object' => $item instanceof SelfReference ? $this : $item,
);
} elseif (is_array($item) || is_object($item)) {
$this->mapPointers($item);
$property->setValue($data, $item);
}
}
} while($reflection = $reflection->getParentClass());
}
}
/**
* Internal method used to map closures by reference
*
* @internal
* @param mixed &$data
*/
protected function mapByReference(&$data)
{
if ($data instanceof Closure) {
if($data === $this->closure){
$data = new SelfReference($this->reference);
return;
}
if (isset($this->scope[$data])) {
$data = $this->scope[$data];
return;
}
$instance = new static($data);
if (static::$context !== null) {
static::$context->scope->toserialize--;
} else {
$instance->scope = $this->scope;
}
$data = $this->scope[$data] = $instance;
} elseif (is_array($data)) {
if(isset($data[self::ARRAY_RECURSIVE_KEY])){
return;
}
$data[self::ARRAY_RECURSIVE_KEY] = true;
foreach ($data as $key => &$value){
if($key === self::ARRAY_RECURSIVE_KEY){
continue;
}
$this->mapByReference($value);
}
unset($value);
unset($data[self::ARRAY_RECURSIVE_KEY]);
} elseif ($data instanceof \stdClass) {
if(isset($this->scope[$data])){
$data = $this->scope[$data];
return;
}
$instance = $data;
$this->scope[$instance] = $data = clone($data);
foreach ($data as &$value){
$this->mapByReference($value);
}
unset($value);
} elseif (is_object($data) && !$data instanceof SerializableClosure){
if(isset($this->scope[$data])){
$data = $this->scope[$data];
return;
}
$instance = $data;
$reflection = new ReflectionObject($data);
if(!$reflection->isUserDefined()){
$this->scope[$instance] = $data;
return;
}
$this->scope[$instance] = $data = $reflection->newInstanceWithoutConstructor();
do{
if(!$reflection->isUserDefined()){
break;
}
foreach ($reflection->getProperties() as $property){
if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
continue;
}
$property->setAccessible(true);
if (PHP_VERSION >= 7.4 && !$property->isInitialized($instance)) {
continue;
}
$value = $property->getValue($instance);
if(is_array($value) || is_object($value)){
$this->mapByReference($value);
}
$property->setValue($data, $value);
}
} while($reflection = $reflection->getParentClass());
}
}
}

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2020-09-27 12:04:48
// This file is automatically generated at:2020-09-29 13:24:31
declare (strict_types = 1);
return array (
0 => 'think\\admin\\Library',

2
vendor/topthink/framework/README.md vendored
View File

@ -13,7 +13,7 @@ ThinkPHP 6.0
ThinkPHP6.0底层架构采用PHP7.1改写和进一步优化。
[官方应用服务市场](https://www.thinkphp.cn/service) | [`ThinkPHP`开发者扶持计划](https://sites.thinkphp.cn/1782366)
[官方应用服务市场](https://market.topthink.com) | [`ThinkPHP`开发者扶持计划](https://sites.thinkphp.cn/1782366)
## 主要新特性

1
vendor/topthink/framework/composer.json vendored
View File

@ -24,7 +24,6 @@
"ext-mbstring": "*",
"league/flysystem": "^1.0",
"league/flysystem-cached-adapter": "^1.0",
"opis/closure": "^3.1",
"psr/log": "~1.0",
"psr/container": "~1.0",
"psr/simple-cache": "^1.0",

2
vendor/topthink/framework/src/think/App.php vendored
View File

@ -39,7 +39,7 @@ use think\initializer\RegisterService;
*/
class App extends Container
{
const VERSION = '6.0.3';
const VERSION = '6.0.4';
/**
* 应用调试模式

4
vendor/topthink/framework/src/think/Config.php vendored
View File

@ -116,6 +116,10 @@ class Config
*/
public function has(string $name): bool
{
if (false === strpos($name, '.') && !isset($this->config[strtolower($name)])) {
return false;
}
return !is_null($this->get($name));
}

83
vendor/topthink/framework/src/think/Console.php vendored
View File

@ -57,7 +57,7 @@ class Console
protected $catchExceptions = true;
protected $autoExit = true;
protected $definition;
protected $defaultCommand = 'list';
protected $defaultCommand = 'list';
protected $defaultCommands = [
'help' => Help::class,
@ -91,9 +91,7 @@ class Console
{
$this->app = $app;
if (!$this->app->initialized()) {
$this->app->initialize();
}
$this->initialize();
$this->definition = $this->getDefaultInputDefinition();
@ -103,6 +101,63 @@ class Console
$this->start();
}
/**
* 初始化
*/
protected function initialize()
{
if (!$this->app->initialized()) {
$this->app->initialize();
}
$this->makeRequest();
}
/**
* 构造request
*/
protected function makeRequest()
{
$uri = $this->app->config->get('app.url', 'http://localhost');
$components = parse_url($uri);
$server = $_SERVER;
if (isset($components['path'])) {
$server = array_merge($server, [
'SCRIPT_FILENAME' => $components['path'],
'SCRIPT_NAME' => $components['path'],
]);
}
if (isset($components['host'])) {
$server['SERVER_NAME'] = $components['host'];
$server['HTTP_HOST'] = $components['host'];
}
if (isset($components['scheme'])) {
if ('https' === $components['scheme']) {
$server['HTTPS'] = 'on';
$server['SERVER_PORT'] = 443;
} else {
unset($server['HTTPS']);
$server['SERVER_PORT'] = 80;
}
}
if (isset($components['port'])) {
$server['SERVER_PORT'] = $components['port'];
$server['HTTP_HOST'] .= ':' . $components['port'];
}
$server['REQUEST_URI'] = $uri;
/** @var Request $request */
$request = $this->app->make('request');
$request->withServer($server);
}
/**
* 添加初始化器
* @param Closure $callback
@ -161,7 +216,7 @@ class Console
/**
* @access public
* @param string $command
* @param array $parameters
* @param array $parameters
* @param string $driver
* @return Output|Buffer
*/
@ -226,7 +281,7 @@ class Console
/**
* 执行指令
* @access public
* @param Input $input
* @param Input $input
* @param Output $output
* @return int
*/
@ -344,7 +399,7 @@ class Console
* 添加一个指令
* @access public
* @param string|Command $command 指令对象或者指令类名
* @param string $name 指令名 留空则自动获取
* @param string $name 指令名 留空则自动获取
* @return Command|void
*/
public function addCommand($command, string $name = '')
@ -462,7 +517,7 @@ class Console
$expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
return preg_quote($matches[1]) . '[^:]*';
}, $namespace);
$namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
$namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
if (empty($namespaces)) {
$message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@ -560,7 +615,7 @@ class Console
/**
* 配置基于用户的参数和选项的输入和输出实例。
* @access protected
* @param Input $input 输入实例
* @param Input $input 输入实例
* @param Output $output 输出实例
*/
protected function configureIO(Input $input, Output $output): void
@ -590,8 +645,8 @@ class Console
* 执行指令
* @access protected
* @param Command $command 指令实例
* @param Input $input 输入实例
* @param Output $output 输出实例
* @param Input $input 输入实例
* @param Output $output 输出实例
* @return int
* @throws \Exception
*/
@ -644,8 +699,8 @@ class Console
/**
* 返回命名空间部分
* @access public
* @param string $name 指令
* @param int $limit 部分的命名空间的最大数量
* @param string $name 指令
* @param int $limit 部分的命名空间的最大数量
* @return string
*/
public function extractNamespace(string $name, int $limit = 0): string
@ -659,7 +714,7 @@ class Console
/**
* 查找可替代的建议
* @access private
* @param string $name
* @param string $name
* @param array|\Traversable $collection
* @return array
*/

9
vendor/topthink/framework/src/think/Container.php vendored
View File

@ -152,8 +152,9 @@ class Container implements ContainerInterface, ArrayAccess, IteratorAggregate, C
$this->instance($abstract, $concrete);
} else {
$abstract = $this->getAlias($abstract);
$this->bind[$abstract] = $concrete;
if ($abstract != $concrete) {
$this->bind[$abstract] = $concrete;
}
}
return $this;
@ -445,9 +446,9 @@ class Container implements ContainerInterface, ArrayAccess, IteratorAggregate, C
$args[] = $this->getObjectParam($class->getName(), $vars);
} elseif (1 == $type && !empty($vars)) {
$args[] = array_shift($vars);
} elseif (0 == $type && isset($vars[$name])) {
} elseif (0 == $type && array_key_exists($name, $vars)) {
$args[] = $vars[$name];
} elseif (0 == $type && isset($vars[$lowerName])) {
} elseif (0 == $type && array_key_exists($lowerName, $vars)) {
$args[] = $vars[$lowerName];
} elseif ($param->isDefaultValueAvailable()) {
$args[] = $param->getDefaultValue();

12
vendor/topthink/framework/src/think/Http.php vendored
View File

@ -42,6 +42,12 @@ class Http
*/
protected $path;
/**
* 路由路径
* @var string
*/
protected $routePath;
/**
* 是否绑定应用
* @var bool
@ -117,7 +123,6 @@ class Http
* 设置路由目录
* @access public
* @param string $path 路由定义目录
* @return string
*/
public function setRoutePath(string $path): void
{
@ -154,6 +159,9 @@ class Http
*/
public function run(Request $request = null): Response
{
//初始化
$this->initialize();
//自动创建request对象
$request = $request ?? $this->app->make('request', [], true);
$this->app->instance('request', $request);
@ -186,8 +194,6 @@ class Http
*/
protected function runWithRequest(Request $request)
{
$this->initialize();
// 加载全局中间件
$this->loadMiddleware();

12
vendor/topthink/framework/src/think/Lang.php vendored
View File

@ -153,6 +153,18 @@ class Lang
if (function_exists('yaml_parse_file')) {
$result = yaml_parse_file($file);
}
break;
case 'json':
$data = file_get_contents($file);
if($data !== false) {
$data = json_decode($data, true);
if(json_last_error() === JSON_ERROR_NONE) {
$result = $data;
}
}
break;
}

18
vendor/topthink/framework/src/think/Route.php vendored
View File

@ -165,12 +165,12 @@ class Route
// 读取路由映射文件
$this->import(include $this->app->getRuntimePath() . 'route.php');
}
$this->config = array_merge($this->config, $this->app->config->get('route'));
}
protected function init()
{
$this->config = array_merge($this->config, $this->app->config->get('route'));
if (!empty($this->config['middleware'])) {
$this->app->middleware->import($this->config['middleware'], 'route');
}
@ -423,7 +423,7 @@ class Route
* @param string $name 路由标识
* @param string $domain 域名
* @param string $method 请求类型
* @return RuleItem[]
* @return array
*/
public function getName(string $name = null, string $domain = null, string $method = '*'): array
{
@ -681,6 +681,18 @@ class Route
public function redirect(string $rule, string $route = '', int $status = 301): RuleItem
{
return $this->rule($rule, function () use ($status, $route) {
$search = $replace = [];
$matches = $this->request->rule()->getVars();
foreach ($matches as $key => $value) {
$search[] = '<' . $key . '>';
$replace[] = $value;
$search[] = ':' . $key;
$replace[] = $value;
}
$route = str_replace($search, $replace, $route);
return Response::create($route, 'redirect')->code($status);
}, '*');
}

3
vendor/topthink/framework/src/think/Validate.php vendored
View File

@ -605,6 +605,7 @@ class Validate
if (isset($this->append[$field])) {
// 追加额外的验证规则
$rules = array_unique(array_merge($rules, $this->append[$field]), SORT_REGULAR);
unset($this->append[$field]);
}
if (empty($rules)) {
@ -663,7 +664,7 @@ class Validate
$i++;
}
return $result;
return $result ?? true;
}
/**

2
vendor/topthink/framework/src/think/cache/driver/Redis.php vendored
View File

@ -87,7 +87,7 @@ class Redis extends Driver
}
if (0 != $this->options['select']) {
$this->handler->select($this->options['select']);
$this->handler->select( (int) $this->options['select']);
}
}

6
vendor/topthink/framework/src/think/console/command/make/stubs/command.stub vendored
View File

@ -15,12 +15,12 @@ class {%className%} extends Command
{
// 指令配置
$this->setName('{%commandName%}')
->setDescription('the {%commandName%} command');
->setDescription('the {%commandName%} command');
}
protected function execute(Input $input, Output $output)
{
// 指令输出
$output->writeln('{%commandName%}');
// 指令输出
$output->writeln('{%commandName%}');
}
}

2
vendor/topthink/framework/src/think/console/command/make/stubs/listener.stub vendored
View File

@ -13,5 +13,5 @@ class {%className%}
public function handle($event)
{
//
}
}
}

4
vendor/topthink/framework/src/think/console/command/make/stubs/service.stub vendored
View File

@ -3,9 +3,8 @@ declare (strict_types = 1);
namespace {%namespace%};
class {%className%} extends \think\Service
class {%className%} extends \think\Service
{
/**
* 注册服务
*
@ -16,7 +15,6 @@ class {%className%} extends \think\Service
//
}
/**
* 执行服务
*

12
vendor/topthink/framework/src/think/console/command/make/stubs/validate.stub vendored
View File

@ -9,17 +9,17 @@ class {%className%} extends Validate
{
/**
* 定义验证规则
* 格式：'字段名' => ['规则1','规则2'...]
* 格式：'字段名' => ['规则1','规则2'...]
*
* @var array
*/
protected $rule = [];
*/
protected $rule = [];
/**
* 定义错误信息
* 格式：'字段名.规则名' => '错误信息'
* 格式：'字段名.规则名' => '错误信息'
*
* @var array
*/
*/
protected $message = [];
}

7
vendor/topthink/framework/src/think/console/command/optimize/Route.php vendored
View File

@ -46,7 +46,7 @@ class Route extends Command
$this->app->route->lazy(false);
// 路由检测
$path = $this->app->getRootPath() . ($dir ? 'app' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR : '') . 'route' . DIRECTORY_SEPARATOR ;
$path = $this->app->getRootPath() . ($dir ? 'app' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR : '') . 'route' . DIRECTORY_SEPARATOR;
$files = is_dir($path) ? scandir($path) : [];
@ -58,10 +58,9 @@ class Route extends Command
//触发路由载入完成事件
$this->app->event->trigger(RouteLoaded::class);
$rules = $this->app->route->getName();
$content = '<?php ' . PHP_EOL . 'return ';
$content .= '\Opis\Closure\unserialize(\'' . \Opis\Closure\serialize($this->app->route->getName()) . '\');';
return $content;
return '<?php ' . PHP_EOL . 'return unserialize(\'' . serialize($rules) . '\');';
}
}

33
vendor/topthink/framework/src/think/console/input/Option.php vendored
View File

@ -11,18 +11,49 @@
namespace think\console\input;
/**
* 命令行选项
* @package think\console\input
*/
class Option
{
// 无需传值
const VALUE_NONE = 1;
// 必须传值
const VALUE_REQUIRED = 2;
// 可选传值
const VALUE_OPTIONAL = 4;
// 传数组值
const VALUE_IS_ARRAY = 8;
/**
* 选项名
* @var string
*/
private $name;
/**
* 选项短名称
* @var string
*/
private $shortcut;
/**
* 选项类型
* @var int
*/
private $mode;
/**
* 选项默认值
* @var mixed
*/
private $default;
/**
* 选项描述
* @var string
*/
private $description;
/**

40
vendor/topthink/framework/src/think/middleware/CheckRequestCache.php vendored
View File

@ -61,17 +61,24 @@ class CheckRequestCache
public function handle($request, Closure $next, $cache = null)
{
if ($request->isGet() && false !== $cache) {
$cache = $cache ?: $this->getRequestCache($request);
if (false === $this->config['request_cache_key']) {
// 关闭当前缓存
$cache = false;
}
$cache = $cache ?? $this->getRequestCache($request);
if ($cache) {
if (is_array($cache)) {
[$key, $expire, $tag] = $cache;
[$key, $expire, $tag] = array_pad($cache, 3, null);
} else {
$key = str_replace('|', '/', $request->url());
$key = md5($request->url(true));
$expire = $cache;
$tag = null;
}
$key = $this->parseCacheKey($request, $key);
if (strtotime($request->server('HTTP_IF_MODIFIED_SINCE', '')) + $expire > $request->server('REQUEST_TIME')) {
// 读取缓存
return Response::create()->code(304);
@ -111,6 +118,24 @@ class CheckRequestCache
$except = $this->config['request_cache_except'];
$tag = $this->config['request_cache_tag'];
foreach ($except as $rule) {
if (0 === stripos($request->url(), $rule)) {
return;
}
}
return [$key, $expire, $tag];
}
/**
* 读取当前地址的请求缓存信息
* @access protected
* @param Request $request
* @param mixed $key
* @return null|string
*/
protected function parseCacheKey($request, $key)
{
if ($key instanceof \Closure) {
$key = call_user_func($key, $request);
}
@ -120,12 +145,6 @@ class CheckRequestCache
return;
}
foreach ($except as $rule) {
if (0 === stripos($request->url(), $rule)) {
return;
}
}
if (true === $key) {
// 自动缓存功能
$key = '__URL__';
@ -140,6 +159,7 @@ class CheckRequestCache
if (false !== strpos($key, ':')) {
$param = $request->param();
foreach ($param as $item => $val) {
if (is_string($val) && false !== strpos($key, ':' . $item)) {
$key = str_replace(':' . $item, $val, $key);
@ -158,6 +178,6 @@ class CheckRequestCache
$key = $fun($key);
}
return [$key, $expire, $tag];
return $key;
}
}

82
vendor/topthink/framework/src/think/route/Rule.php vendored
View File

@ -237,11 +237,17 @@ abstract class Rule
*/
public function getPattern(string $name = '')
{
if ('' === $name) {
return $this->pattern;
$pattern = $this->pattern;
if ($this->parent) {
$pattern = array_merge($this->parent->getPattern(), $pattern);
}
return $this->pattern[$name] ?? null;
if ('' === $name) {
return $pattern;
}
return $pattern[$name] ?? null;
}
/**
@ -253,11 +259,26 @@ abstract class Rule
*/
public function getOption(string $name = '', $default = null)
{
if ('' === $name) {
return $this->option;
$option = $this->option;
if ($this->parent) {
$parentOption = $this->parent->getOption();
// 合并分组参数
foreach ($this->mergeOptions as $item) {
if (isset($parentOption[$item]) && isset($option[$item])) {
$option[$item] = array_merge($parentOption[$item], $option[$item]);
}
}
$option = array_merge($parentOption, $option);
}
return $this->option[$name] ?? $default;
if ('' === $name) {
return $option;
}
return $option[$name] ?? $default;
}
/**
@ -551,26 +572,6 @@ abstract class Rule
return $this;
}
/**
* 合并分组参数
* @access public
* @return array
*/
public function mergeGroupOptions(): array
{
$parentOption = $this->parent->getOption();
// 合并分组参数
foreach ($this->mergeOptions as $item) {
if (isset($parentOption[$item]) && isset($this->option[$item])) {
$this->option[$item] = array_merge($parentOption[$item], $this->option[$item]);
}
}
$this->option = array_merge($parentOption, $this->option);
return $this->option;
}
/**
* 解析匹配到的规则路由
* @access public
@ -590,24 +591,31 @@ abstract class Rule
}
// 替换路由地址中的变量
if (is_string($route) && !empty($matches)) {
$search = $replace = [];
$extraParams = true;
$search = $replace = [];
$depr = $this->router->config('pathinfo_depr');
foreach ($matches as $key => $value) {
$search[] = '<' . $key . '>';
$replace[] = $value;
foreach ($matches as $key => $value) {
$search[] = '<' . $key . '>';
$replace[] = $value;
$search[] = ':' . $key;
$replace[] = $value;
$search[] = ':' . $key;
$replace[] = $value;
if (strpos($value, $depr)) {
$extraParams = false;
}
}
if (is_string($route)) {
$route = str_replace($search, $replace, $route);
}
// 解析额外参数
$count = substr_count($rule, '/');
$url = array_slice(explode('|', $url), $count + 1);
$this->parseUrlParams(implode('|', $url), $matches);
if ($extraParams) {
$count = substr_count($rule, '/');
$url = array_slice(explode('|', $url), $count + 1);
$this->parseUrlParams(implode('|', $url), $matches);
}
$this->vars = $matches;
@ -630,7 +638,7 @@ abstract class Rule
} elseif ($route instanceof Closure) {
// 执行闭包
$result = new CallbackDispatch($request, $this, $route, $this->vars);
} elseif (false !== strpos($route, '@') || false !== strpos($route, '::')) {
} elseif (false !== strpos($route, '@') || false !== strpos($route, '::') || false !== strpos($route, '\\')) {
// 路由到类的方法
$route = str_replace('::', '@', $route);
$result = $this->dispatchMethod($request, $route);

18
vendor/topthink/framework/src/think/route/RuleGroup.php vendored
View File

@ -147,19 +147,13 @@ class RuleGroup extends Rule
// 获取当前路由规则
$method = strtolower($request->method());
$rules = $this->getRules($method);
$option = $this->getOption();
if ($this->parent) {
// 合并分组参数
$this->mergeGroupOptions();
// 合并分组变量规则
$this->pattern = array_merge($this->parent->getPattern(), $this->pattern);
if (isset($option['complete_match'])) {
$completeMatch = $option['complete_match'];
}
if (isset($this->option['complete_match'])) {
$completeMatch = $this->option['complete_match'];
}
if (!empty($this->option['merge_rule_regex'])) {
if (!empty($option['merge_rule_regex'])) {
// 合并路由正则规则进行路由匹配检查
$result = $this->checkMergeRuleRegex($request, $rules, $url, $completeMatch);
@ -179,7 +173,7 @@ class RuleGroup extends Rule
if ($this->miss && in_array($this->miss->getMethod(), ['*', $method])) {
// 未匹配所有路由的路由规则处理
$result = $this->parseRule($request, '', $this->miss->getRoute(), $url, $this->miss->mergeGroupOptions());
$result = $this->parseRule($request, '', $this->miss->getRoute(), $url, $this->miss->getOption());
} else {
$result = false;
}
@ -495,7 +489,7 @@ class RuleGroup extends Rule
}
return array_filter($this->rules, function ($item) use ($method) {
return $method == $item[0] || $item[0] == '*';
return $method == $item[0] || '*' == $item[0];
});
}

16
vendor/topthink/framework/src/think/route/RuleItem.php vendored
View File

@ -191,12 +191,12 @@ class RuleItem extends Rule
}
// 合并分组参数
$option = $this->mergeGroupOptions();
$url = $this->urlSuffixCheck($request, $url, $option);
$option = $this->getOption();
$pattern = $this->getPattern();
$url = $this->urlSuffixCheck($request, $url, $option);
if (is_null($match)) {
$match = $this->match($url, $option, $completeMatch);
$match = $this->match($url, $option, $pattern, $completeMatch);
}
if (false !== $match) {
@ -248,17 +248,17 @@ class RuleItem extends Rule
* @access private
* @param string $url URL地址
* @param array $option 路由参数
* @param bool $completeMatch 路由是否完全匹配
* @param array $pattern 变量规则
* @param bool $completeMatch 是否完全匹配
* @return array|false
*/
private function match(string $url, array $option, bool $completeMatch)
private function match(string $url, array $option, array $pattern, bool $completeMatch)
{
if (isset($option['complete_match'])) {
$completeMatch = $option['complete_match'];
}
$depr = $this->router->config('pathinfo_depr');
$pattern = array_merge($this->parent->getPattern(), $this->pattern);
$depr = $this->router->config('pathinfo_depr');
// 检查完整规则定义
if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . ($completeMatch ? '$' : '') . '/', str_replace('|', $depr, $url))) {

24
vendor/topthink/framework/src/think/route/RuleName.php vendored
View File

@ -46,10 +46,11 @@ class RuleName
public function setName(string $name, RuleItem $ruleItem, bool $first = false): void
{
$name = strtolower($name);
$item = $this->getRuleItemInfo($ruleItem);
if ($first && isset($this->item[$name])) {
array_unshift($this->item[$name], $ruleItem);
array_unshift($this->item[$name], $item);
} else {
$this->item[$name][] = $ruleItem;
$this->item[$name][] = $item;
}
}
@ -179,8 +180,8 @@ class RuleName
$result = $this->item[$name];
} else {
foreach ($this->item[$name] as $item) {
$itemDomain = $item->getDomain();
$itemMethod = $item->getMethod();
$itemDomain = $item['domain'];
$itemMethod = $item['method'];
if (($itemDomain == $domain || '-' == $itemDomain) && ('*' == $itemMethod || '*' == $method || $method == $itemMethod)) {
$result[] = $item;
@ -192,4 +193,19 @@ class RuleName
return $result;
}
/**
* 获取路由信息
* @access protected
* @param RuleItem $item 路由规则
* @return array
*/
protected function getRuleItemInfo(RuleItem $item): array
{
return [
'rule' => $item->getRule(),
'domain' => $item->getDomain(),
'method' => $item->getMethod(),
'suffix' => $item->getSuffix(),
];
}
}

6
vendor/topthink/framework/src/think/route/Url.php vendored
View File

@ -302,10 +302,10 @@ class Url
$port = $request->port();
foreach ($rule as $item) {
$url = $item->getRule();
$url = $item['rule'];
$pattern = $this->parseVar($url);
$domain = $item->getDomain();
$suffix = $item->getSuffix();
$domain = $item['domain'];
$suffix = $item['suffix'];
if ('-' == $domain) {
$domain = is_string($allowDomain) ? $allowDomain : $request->host(true);

2
vendor/topthink/framework/src/think/session/driver/File.php vendored
View File

@ -39,7 +39,7 @@ class File implements SessionHandlerInterface
$this->config = array_merge($this->config, $config);
if (empty($this->config['path'])) {
$this->config['path'] = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'session' . DIRECTORY_SEPARATOR;
$this->config['path'] = $app->getRuntimePath() . 'session' . DIRECTORY_SEPARATOR;
} elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
$this->config['path'] .= DIRECTORY_SEPARATOR;
}

1
vendor/topthink/framework/tests/ContainerTest.php vendored
View File

@ -149,6 +149,7 @@ class ContainerTest extends TestCase
$container->bind('name2', $object);
$container->bind('name3', Taylor::class);
$container->bind('name3', Taylor::class);
$container->name4 = $object;

1
vendor/topthink/framework/tests/HttpTest.php vendored
View File

@ -123,6 +123,7 @@ class HttpTest extends TestCase
$response = m::mock(Response::class);
$this->app->shouldReceive('instance')->once()->with('request', $request);
$this->app->shouldReceive('initialize')->once();
$exception = new Exception();

32
vendor/topthink/think-orm/src/db/PDOConnection.php vendored
View File

@ -203,7 +203,7 @@ abstract class PDOConnection extends Connection
* @param array $config 连接信息
* @return string
*/
abstract protected function parseDsn(array $config);
abstract protected function parseDsn(array $config): string;
/**
* 取得数据表的字段信息
@ -211,7 +211,7 @@ abstract class PDOConnection extends Connection
* @param string $tableName 数据表名称
* @return array
*/
abstract public function getFields(string $tableName);
abstract public function getFields(string $tableName): array;
/**
* 取得数据库的表信息
@ -219,7 +219,7 @@ abstract class PDOConnection extends Connection
* @param string $dbName 数据库名称
* @return array
*/
abstract public function getTables(string $dbName);
abstract public function getTables(string $dbName = ''): array;
/**
* 对返数据表字段信息进行大小写转换出来
@ -728,16 +728,13 @@ abstract class PDOConnection extends Connection
*/
public function getPDOStatement(string $sql, array $bind = [], bool $master = false, bool $procedure = false): PDOStatement
{
$this->initConnect($this->readMaster ?: $master);
// 记录SQL语句
$this->queryStr = $sql;
$this->bind = $bind;
$this->db->updateQueryTimes();
try {
$this->initConnect($this->readMaster ?: $master);
// 记录SQL语句
$this->queryStr = $sql;
$this->bind = $bind;
$this->db->updateQueryTimes();
$this->queryStartTime = microtime(true);
// 预处理
@ -1394,11 +1391,11 @@ abstract class PDOConnection extends Connection
*/
public function startTrans(): void
{
$this->initConnect(true);
++$this->transTimes;
try {
$this->initConnect(true);
++$this->transTimes;
if (1 == $this->transTimes) {
$this->linkID->beginTransaction();
} elseif ($this->transTimes > 1 && $this->supportSavepoint()) {
@ -1412,8 +1409,9 @@ abstract class PDOConnection extends Connection
--$this->transTimes;
++$this->reConnectTimes;
$this->close()->startTrans();
} else {
throw $e;
}
throw $e;
}
}

14
vendor/topthink/think-orm/src/db/concern/WhereQuery.php vendored
View File

@ -378,7 +378,7 @@ trait WhereQuery
} elseif (is_string($field)) {
if (preg_match('/[,=\<\'\"\(\s]/', $field)) {
return $this->whereRaw($field, is_array($op) ? $op : [], $logic);
} elseif (is_string($op) && strtolower($op) == 'exp') {
} elseif (is_string($op) && strtolower($op) == 'exp' && !is_null($condition)) {
$bind = isset($param[2]) && is_array($param[2]) ? $param[2] : [];
return $this->whereExp($field, $condition, $bind, $logic);
}
@ -514,17 +514,9 @@ trait WhereQuery
}
if ($condition) {
if ($query instanceof Closure) {
$query($this, $condition);
} elseif (is_array($query)) {
$this->where($query);
}
$this->where($query);
} elseif ($otherwise) {
if ($otherwise instanceof Closure) {
$otherwise($this, $condition);
} elseif (is_array($otherwise)) {
$this->where($otherwise);
}
$this->where($otherwise);
}
return $this;

135
vendor/topthink/think-orm/src/db/exception/DbException.php vendored
View File

@ -17,65 +17,94 @@ use Exception;
/**
* Database相关异常处理类
*/
class DbException extends Exception
{
/**
* DbException constructor.
* @access public
* @param string $message
* @param array $config
* @param string $sql
* @param int $code
*/
public function __construct(string $message, array $config = [], string $sql = '', int $code = 10500)
if (class_exists('think\Exception')) {
class DbException extends \think\Exception
{
$this->message = $message;
$this->code = $code;
/**
* DbException constructor.
* @access public
* @param string $message
* @param array $config
* @param string $sql
* @param int $code
*/
public function __construct(string $message, array $config = [], string $sql = '', int $code = 10500)
{
$this->message = $message;
$this->code = $code;
$this->setData('Database Status', [
'Error Code' => $code,
'Error Message' => $message,
'Error SQL' => $sql,
]);
$this->setData('Database Status', [
'Error Code' => $code,
'Error Message' => $message,
'Error SQL' => $sql,
]);
unset($config['username'], $config['password']);
$this->setData('Database Config', $config);
unset($config['username'], $config['password']);
$this->setData('Database Config', $config);
}
}
} else {
/**
* 保存异常页面显示的额外Debug数据
* @var array
*/
protected $data = [];
/**
* 设置异常额外的Debug数据
* 数据将会显示为下面的格式
*
* Exception Data
* --------------------------------------------------
* Label 1
* key1 value1
* key2 value2
* Label 2
* key1 value1
* key2 value2
*
* @param string $label 数据分类，用于异常页面显示
* @param array $data 需要显示的数据，必须为关联数组
*/
final protected function setData($label, array $data)
class DbException extends Exception
{
$this->data[$label] = $data;
}
/**
* DbException constructor.
* @access public
* @param string $message
* @param array $config
* @param string $sql
* @param int $code
*/
public function __construct(string $message, array $config = [], string $sql = '', int $code = 10500)
{
$this->message = $message;
$this->code = $code;
/**
* 获取异常额外Debug数据
* 主要用于输出到异常页面便于调试
* @return array 由setData设置的Debug数据
*/
final public function getData()
{
return $this->data;
$this->setData('Database Status', [
'Error Code' => $code,
'Error Message' => $message,
'Error SQL' => $sql,
]);
unset($config['username'], $config['password']);
$this->setData('Database Config', $config);
}
/**
* 保存异常页面显示的额外Debug数据
* @var array
*/
protected $data = [];
/**
* 设置异常额外的Debug数据
* 数据将会显示为下面的格式
*
* Exception Data
* --------------------------------------------------
* Label 1
* key1 value1
* key2 value2
* Label 2
* key1 value1
* key2 value2
*
* @param string $label 数据分类，用于异常页面显示
* @param array $data 需要显示的数据，必须为关联数组
*/
final protected function setData($label, array $data)
{
$this->data[$label] = $data;
}
/**
* 获取异常额外Debug数据
* 主要用于输出到异常页面便于调试
* @return array 由setData设置的Debug数据
*/
final public function getData()
{
return $this->data;
}
}
}

20
vendor/topthink/think-orm/src/model/Relation.php vendored
View File

@ -99,6 +99,26 @@ abstract class Relation
return $this->query;
}
/**
* 获取关联表外键
* @access public
* @return string
*/
public function getForeignKey()
{
return $this->foreignKey;
}
/**
* 获取关联表主键
* @access public
* @return string
*/
public function getLocalKey()
{
return $this->localKey;
}
/**
* 获取当前的关联模型类的实例
* @access public

8
vendor/topthink/think-orm/src/model/concern/Attribute.php vendored
View File

@ -185,7 +185,11 @@ trait Attribute
*/
protected function getRealFieldName(string $name): string
{
return $this->strict ? $name : Str::snake($name);
if ($this->convertNameToCamel || !$this->strict) {
return Str::snake($name);
}
return $name;
}
/**
@ -302,7 +306,7 @@ trait Attribute
// 只读字段不允许更新
foreach ($this->readonly as $key => $field) {
if (isset($data[$field])) {
if (array_key_exists($field, $data)) {
unset($data[$field]);
}
}

28
vendor/topthink/think-orm/src/model/concern/Conversion.php vendored
View File

@ -48,6 +48,24 @@ trait Conversion
*/
protected $resultSetType;
/**
* 数据命名是否自动转为驼峰
* @var bool
*/
protected $convertNameToCamel;
/**
* 转换数据为驼峰命名（用于输出）
* @access public
* @param bool $toCamel 是否自动驼峰命名
* @return $this
*/
public function convertNameToCamel(bool $toCamel = true)
{
$this->convertNameToCamel = $toCamel;
return $this;
}
/**
* 设置需要附加的输出属性
* @access public
@ -181,6 +199,16 @@ trait Conversion
$this->appendAttrToArray($item, $key, $name);
}
if ($this->convertNameToCamel) {
foreach ($item as $key => $val) {
$name = Str::camel($key);
if ($name !== $key) {
$item[$name] = $val;
unset($item[$key]);
}
}
}
return $item;
}

31
vendor/topthink/think-orm/src/model/relation/BelongsToMany.php vendored
View File

@ -440,20 +440,23 @@ class BelongsToMany extends Relation
protected function belongsToManyQuery(string $foreignKey, string $localKey, array $condition = []): Query
{
// 关联查询封装
$tableName = $this->query->getTable();
$table = $this->pivot->db()->getTable();
$fields = $this->getQueryFields($tableName);
if (empty($this->baseQuery)) {
$tableName = $this->query->getTable();
$table = $this->pivot->db()->getTable();
$fields = $this->getQueryFields($tableName);
if ($this->withLimit) {
$this->query->limit($this->withLimit);
}
$this->query
->field($fields)
->tableField(true, $table, 'pivot', 'pivot__')
->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $this->query->getPk())
->where($condition);
if ($this->withLimit) {
$this->query->limit($this->withLimit);
}
$this->query
->field($fields)
->tableField(true, $table, 'pivot', 'pivot__')
->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $this->query->getPk())
->where($condition);
return $this->query;
}
@ -666,7 +669,11 @@ class BelongsToMany extends Relation
$localKey = $this->localKey;
// 关联查询
$condition = ['pivot.' . $localKey, '=', $this->parent->getKey()];
if (null === $this->parent->getKey()) {
$condition = ['pivot.' . $localKey, 'exp', new Raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk())];
} else {
$condition = ['pivot.' . $localKey, '=', $this->parent->getKey()];
}
$this->belongsToManyQuery($foreignKey, $localKey, [$condition]);

2
vendor/topthink/think-orm/src/model/relation/HasOne.php vendored
View File

@ -181,7 +181,7 @@ class HasOne extends OneToOne
$fields = $this->getRelationQueryFields($fields, $model);
$softDelete = $this->query->getOptions('soft_delete');
$query = $query ?: $this->parent->db()->alias($model);
$query = $query ? $query->alias($model) : $this->parent->db()->alias($model);
return $query->field($fields)
->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType ?: $this->joinType)

4
vendor/topthink/think-orm/src/model/relation/OneToOne.php vendored
View File

@ -307,10 +307,6 @@ abstract class OneToOne extends Relation
$this->query->field($this->withField);
}
if ($this->query->getOptions('order')) {
$this->query->group($key);
}
$list = $this->query
->where($where)
->with($subRelation)

2
vendor/zoujingli/think-library/src/Library.php vendored
View File

@ -41,7 +41,7 @@ class Library extends Service
/**
* 扩展库版本号
*/
const VERSION = '6.0.15';
const VERSION = '6.0.16';
/**
* 启动服务

4
vendor/zoujingli/think-library/src/storage/AliossStorage.php vendored
View File

@ -76,14 +76,14 @@ class AliossStorage extends Storage
/**
* 获取当前实例对象
* @param null $name
* @param null|string $name
* @return static
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function instance($name = null)
public static function instance(?string $name = null)
{
return parent::instance('alioss');
}

4
vendor/zoujingli/think-library/src/storage/LocalStorage.php vendored
View File

@ -48,14 +48,14 @@ class LocalStorage extends Storage
/**
* 获取当前实例对象
* @param null $name
* @param null|string $name
* @return static
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function instance($name = null): LocalStorage
public static function instance(?string $name = null): LocalStorage
{
return parent::instance('local');
}

4
vendor/zoujingli/think-library/src/storage/QiniuStorage.php vendored
View File

@ -55,14 +55,14 @@ class QiniuStorage extends Storage
/**
* 获取当前实例对象
* @param null $name
* @param null|string $name
* @return static
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function instance($name = null)
public static function instance(?string $name = null)
{
return parent::instance('qiniu');
}