mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
[更新]composer更新第三方组件
This commit is contained in:
Anyon
parent
ec30d927a7
commit
2ab4cd3cad
@ -142,7 +142,7 @@ return [
|
||||
// | 异常及错误设置
|
||||
// +----------------------------------------------------------------------
|
||||
// 异常页面的模板文件
|
||||
'exception_tmpl' => APP_PATH . 'extra' . DS . 'view' . DS . 'handler.exception.html',
|
||||
// 'exception_tmpl' => APP_PATH . 'extra' . DS . 'view' . DS . 'handler.exception.html',
|
||||
// 错误显示信息,非调试模式有效
|
||||
'error_message' => '页面错误！请稍后再试～',
|
||||
// 显示错误信息
|
||||
|
||||
@ -155,6 +155,8 @@ return [
|
||||
'show_error_msg' => false,
|
||||
// 异常处理handle类 留空使用 \think\exception\Handle
|
||||
'exception_handle' => '',
|
||||
// 是否记录trace信息到日志
|
||||
'record_trace' => false,
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | 日志设置
|
||||
|
||||
@ -353,7 +353,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
|
||||
// 检测修改器
|
||||
$method = 'set' . Loader::parseName($name, 1) . 'Attr';
|
||||
if (method_exists($this, $method)) {
|
||||
$value = $this->$method($value, array_merge($this->data, $data));
|
||||
$value = $this->$method($value, array_merge($this->data, $data), $this->relation);
|
||||
} elseif (isset($this->type[$name])) {
|
||||
// 类型转换
|
||||
$value = $this->writeTransform($value, $this->type[$name]);
|
||||
@ -532,7 +532,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
|
||||
// 检测属性获取器
|
||||
$method = 'get' . Loader::parseName($name, 1) . 'Attr';
|
||||
if (method_exists($this, $method)) {
|
||||
$value = $this->$method($value, $this->data);
|
||||
$value = $this->$method($value, $this->data, $this->relation);
|
||||
} elseif (isset($this->type[$name])) {
|
||||
// 类型转换
|
||||
$value = $this->readTransform($value, $this->type[$name]);
|
||||
@ -1094,19 +1094,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
|
||||
|
||||
protected function checkAllowField($auto = [])
|
||||
{
|
||||
if (!empty($this->field)) {
|
||||
if (!empty($this->origin)) {
|
||||
$this->field = array_keys($this->origin);
|
||||
$field = $this->field;
|
||||
} elseif (true === $this->field) {
|
||||
$this->field = $this->getQuery()->getTableInfo('', 'fields');
|
||||
$field = $this->field;
|
||||
} else {
|
||||
$field = array_merge($this->field, $auto);
|
||||
}
|
||||
if (true === $this->field) {
|
||||
$this->field = $this->getQuery()->getTableInfo('', 'fields');
|
||||
$field = $this->field;
|
||||
} elseif (!empty($this->field)) {
|
||||
$field = array_merge($this->field, $auto);
|
||||
} else {
|
||||
$field = [];
|
||||
|
||||
}
|
||||
|
||||
return $field;
|
||||
}
|
||||
|
||||
|
||||
@ -52,6 +52,10 @@ class Handle
|
||||
$log = "[{$data['code']}]{$data['message']}";
|
||||
}
|
||||
|
||||
if (Config::get('record_trace')) {
|
||||
$log .= "\r\n" . $exception->getTraceAsString();
|
||||
}
|
||||
|
||||
Log::record($log, 'error');
|
||||
}
|
||||
}
|
||||
|
||||
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -4,4 +4,4 @@
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit2143ab0f4063c032301809ef6ced3484::getLoader();
|
||||
return ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7::getLoader();
|
||||
|
||||
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit2143ab0f4063c032301809ef6ced3484
|
||||
class ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -19,15 +19,15 @@ class ComposerAutoloaderInit2143ab0f4063c032301809ef6ced3484
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit2143ab0f4063c032301809ef6ced3484', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit2143ab0f4063c032301809ef6ced3484', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit7a89897f38ba6b2cbfe9f97509e03de7', 'loadClassLoader'));
|
||||
|
||||
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
||||
if ($useStaticLoader) {
|
||||
require_once __DIR__ . '/autoload_static.php';
|
||||
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit2143ab0f4063c032301809ef6ced3484::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::getInitializer($loader));
|
||||
} else {
|
||||
$map = require __DIR__ . '/autoload_namespaces.php';
|
||||
foreach ($map as $namespace => $path) {
|
||||
@ -48,19 +48,19 @@ class ComposerAutoloaderInit2143ab0f4063c032301809ef6ced3484
|
||||
$loader->register(true);
|
||||
|
||||
if ($useStaticLoader) {
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit2143ab0f4063c032301809ef6ced3484::$files;
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$files;
|
||||
} else {
|
||||
$includeFiles = require __DIR__ . '/autoload_files.php';
|
||||
}
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequire2143ab0f4063c032301809ef6ced3484($fileIdentifier, $file);
|
||||
composerRequire7a89897f38ba6b2cbfe9f97509e03de7($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
||||
function composerRequire2143ab0f4063c032301809ef6ced3484($fileIdentifier, $file)
|
||||
function composerRequire7a89897f38ba6b2cbfe9f97509e03de7($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
require $file;
|
||||
|
||||
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit2143ab0f4063c032301809ef6ced3484
|
||||
class ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7
|
||||
{
|
||||
public static $files = array (
|
||||
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
|
||||
@ -383,9 +383,9 @@ class ComposerStaticInit2143ab0f4063c032301809ef6ced3484
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit2143ab0f4063c032301809ef6ced3484::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit2143ab0f4063c032301809ef6ced3484::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit2143ab0f4063c032301809ef6ced3484::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit7a89897f38ba6b2cbfe9f97509e03de7::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
||||
12
vendor/composer/installed.json
vendored
12
vendor/composer/installed.json
vendored
@ -174,12 +174,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/framework.git",
|
||||
"reference": "90d71bbc76d0915e0cf51ecad57350c0c79d5a3f"
|
||||
"reference": "e428c43ec5138c989cfdb38ac300a964ad77f9cb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://files.phpcomposer.com/files/top-think/framework/90d71bbc76d0915e0cf51ecad57350c0c79d5a3f.zip",
|
||||
"reference": "90d71bbc76d0915e0cf51ecad57350c0c79d5a3f",
|
||||
"url": "https://files.phpcomposer.com/files/top-think/framework/e428c43ec5138c989cfdb38ac300a964ad77f9cb.zip",
|
||||
"reference": "e428c43ec5138c989cfdb38ac300a964ad77f9cb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -194,7 +194,7 @@
|
||||
"phpunit/phpunit": "4.8.*",
|
||||
"sebastian/phpcpd": "2.*"
|
||||
},
|
||||
"time": "2017-07-04T03:46:13+00:00",
|
||||
"time": "2017-07-05T03:35:06+00:00",
|
||||
"type": "think-framework",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -381,8 +381,8 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/options-resolver",
|
||||
"version": "v3.3.3",
|
||||
"version_normalized": "3.3.3.0",
|
||||
"version": "v3.3.4",
|
||||
"version_normalized": "3.3.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/options-resolver.git",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user