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 2018-12-04 15:12:06 +08:00
parent 06699cbaf3
commit 4ef8946cb1
20 changed files with 121 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thinkphp/library/think/App.php
View File

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.29 LTS';
const VERSION = '5.1.30 LTS';
/**
* 当前模块路径

20
thinkphp/library/think/Request.php
View File

@ -1314,6 +1314,21 @@ class Request
return isset($this->header[$name]) ? $this->header[$name] : $default;
}
/**
* 递归重置数组指针
* @access public
* @param array $data 数据源
* @return void
*/
public function arrayReset(array &$data) {
foreach ($data as &$value) {
if (is_array($value)) {
$this->arrayReset($value);
}
}
reset($data);
}
/**
* 获取变量 支持过滤和默认值
* @access public
@ -1353,7 +1368,10 @@ class Request
if (is_array($data)) {
array_walk_recursive($data, [$this, 'filterValue'], $filter);
reset($data);
if (version_compare(PHP_VERSION, '7.1.0', '<')) {
// 恢复PHP版本低于 7.1 时 array_walk_recursive 中消耗的内部指针
$this->arrayReset($data);
}
} else {
$this->filterValue($data, $name, $filter);
}

4
thinkphp/library/think/Route.php
View File

@ -424,9 +424,9 @@ class Route
* @param string $domain 域名
* @return mixed
*/
public function getName($name = null, $domain = null)
public function getName($name = null, $domain = null, $method = '*')
{
return $this->app['rule_name']->get($name, $domain);
return $this->app['rule_name']->get($name, $domain, $method);
}
/**

2
thinkphp/library/think/Url.php
View File

@ -354,7 +354,7 @@ class Url
continue;
}
if ($this->app['request']->port() != 80) {
if (!in_array($this->app['request']->port(), [80, 443])) {
$domain .= ':' . $this->app['request']->port();
}

13
thinkphp/library/think/Validate.php
View File

@ -517,6 +517,8 @@ class Validate
}
$i = 0;
$result = true;
foreach ($rules as $key => $rule) {
if ($rule instanceof \Closure) {
$result = call_user_func_array($rule, [$value, $data]);
@ -527,17 +529,18 @@ class Validate
if (isset($this->append[$field]) && in_array($info, $this->append[$field])) {
} elseif (isset($this->remove[$field]) && in_array($info, $this->remove[$field])) {
} elseif (array_key_exists($field, $this->remove) && (null === $this->remove[$field] || in_array($info, $this->remove[$field]))) {
// 规则已经移除
$i++;
continue;
}
if ('must' == $info || 0 === strpos($info, 'require') || (!is_null($value) && '' !== $value)) {
// 验证类型
$callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
// 验证类型
if (isset(self::$type[$type])) {
$result = call_user_func_array(self::$type[$type], [$value, $rule, $data, $field, $title]);
} elseif ('must' == $info || 0 === strpos($info, 'require') || (!is_null($value) && '' !== $value)) {
// 验证数据
$result = call_user_func_array($callback, [$value, $rule, $data, $field, $title]);
$result = call_user_func_array([$this, $type], [$value, $rule, $data, $field, $title]);
} else {
$result = true;
}

4
thinkphp/library/think/console/command/optimize/Autoload.php
View File

@ -38,8 +38,8 @@ EOF;
$app = Container::get('app');
$namespacesToScan = [
$app->getNamespace() . '\\' => realpath(rtrim($app->getAppPath())),
'think\\' => $app->getAppPath() . 'library/think',
'traits\\' => $app->getAppPath() . 'library/traits',
'think\\' => $app->getThinkPath() . 'library/think',
'traits\\' => $app->getThinkPath() . 'library/traits',
'' => realpath(rtrim($app->getRootPath() . 'extend')),
];

7
thinkphp/library/think/db/Builder.php
View File

@ -411,8 +411,11 @@ abstract class Builder
}
if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
$name = $query->bind($value, $bindType);
$value = ':' . $name;
if (0 === strpos($value, ':') && $query->isBind(substr($value, 1))) {
} else {
$name = $query->bind($value, $bindType);
$value = ':' . $name;
}
}
// 解析查询表达式

8
thinkphp/library/think/db/Connection.php
View File

@ -1309,12 +1309,12 @@ abstract class Connection
* @access public
* @param Query $query 查询对象
* @param string $aggregate 聚合方法
* @param string $field 字段名
* @param mixed $field 字段名
* @return mixed
*/
public function aggregate(Query $query, $aggregate, $field)
{
if (0 === stripos($field, 'DISTINCT ')) {
if (is_string($field) && 0 === stripos($field, 'DISTINCT ')) {
list($distinct, $field) = explode(' ', $field);
}
@ -1463,10 +1463,12 @@ abstract class Connection
$value = is_array($val) ? $val[0] : $val;
$type = is_array($val) ? $val[1] : PDO::PARAM_STR;
if (PDO::PARAM_INT == $type || self::PARAM_FLOAT == $type) {
if (self::PARAM_FLOAT == $type) {
$value = (float) $value;
} elseif (PDO::PARAM_STR == $type) {
$value = '\'' . addslashes($value) . '\'';
} elseif (PDO::PARAM_INT == $type && '' === $value) {
$value = 0;
}
// 判断占位符

4
thinkphp/library/think/db/Query.php
View File

@ -326,7 +326,7 @@ class Query
*/
public function execute($sql, $bind = [])
{
return $this->connection->execute($sql, $bind);
return $this->connection->execute($sql, $bind, $this);
}
/**
@ -3567,7 +3567,7 @@ class Query
$options['order'] = explode(',', $options['order']);
}
foreach ($options['order'] as $key => $val) {
if (is_numeric($key)) {
if (is_numeric($key) && is_string($val)) {
if (strpos($val, ' ')) {
list($field, $sort) = explode(' ', $val);
if (array_key_exists($field, $options['map'])) {

16
thinkphp/library/think/model/concern/Attribute.php
View File

@ -371,7 +371,7 @@ trait Attribute
case 'datetime':
case 'date':
$format = !empty($param) ? $param : $this->dateFormat;
$value = $this->formatDateTime(time(), $format);
$value = $this->formatDateTime($format . '.u');
break;
case 'timestamp':
case 'integer':
@ -384,9 +384,9 @@ trait Attribute
'date',
'timestamp',
])) {
$value = $this->formatDateTime(time(), $this->dateFormat);
$value = $this->formatDateTime($this->dateFormat . '.u');
} else {
$value = $this->formatDateTime(time(), $this->dateFormat, true);
$value = time();
}
return $value;
@ -433,7 +433,7 @@ trait Attribute
case 'datetime':
$format = !empty($param) ? $param : $this->dateFormat;
$value = is_numeric($value) ? $value : strtotime($value);
$value = $this->formatDateTime($value, $format);
$value = $this->formatDateTime($format, $value);
break;
case 'object':
if (is_object($value)) {
@ -500,9 +500,9 @@ trait Attribute
'date',
'timestamp',
])) {
$value = $this->formatDateTime(strtotime($value), $this->dateFormat);
$value = $this->formatDateTime($this->dateFormat, $value);
} else {
$value = $this->formatDateTime($value, $this->dateFormat);
$value = $this->formatDateTime($this->dateFormat, $value, true);
}
} elseif ($notFound) {
$value = $this->getRelationAttribute($name, $item);
@ -588,13 +588,13 @@ trait Attribute
case 'timestamp':
if (!is_null($value)) {
$format = !empty($param) ? $param : $this->dateFormat;
$value = $this->formatDateTime($value, $format);
$value = $this->formatDateTime($format, $value, true);
}
break;
case 'datetime':
if (!is_null($value)) {
$format = !empty($param) ? $param : $this->dateFormat;
$value = $this->formatDateTime(strtotime($value), $format);
$value = $this->formatDateTime($format, $value);
}
break;
case 'json':

2
thinkphp/library/think/model/concern/SoftDelete.php
View File

@ -140,7 +140,7 @@ trait SoftDelete
public static function destroy($data, $force = false)
{
// 包含软删除数据
$query = self::withTrashed();
$query = (new static())->db(false);
if (is_array($data) && key($data) !== 0) {
$query->where($data);

23
thinkphp/library/think/model/concern/TimeStamp.php
View File

@ -11,6 +11,8 @@
namespace think\model\concern;
use DateTime;
/**
* 自动时间戳
*/
@ -43,24 +45,31 @@ trait TimeStamp
/**
* 时间日期字段格式化处理
* @access protected
* @param mixed $time 时间日期表达式
* @param mixed $format 日期格式
* @param mixed $time 时间日期表达式
* @param bool $timestamp 是否进行时间戳转换
* @return mixed
*/
protected function formatDateTime($time, $format, $timestamp = false)
protected function formatDateTime($format, $time = 'now', $timestamp = false)
{
if (empty($time)) {
return;
}
if (false !== strpos($format, '\\')) {
$time = new $format($time);
} elseif (!$timestamp && false !== $format) {
$time = date($format, $time);
if (false === $format) {
return $time;
} elseif (false !== strpos($format, '\\')) {
return new $format($time);
}
return $time;
if ($timestamp) {
$dateTime = new DateTime();
$dateTime->setTimestamp($time);
} else {
$dateTime = new DateTime($time);
}
return $dateTime->format($format);
}
/**

5
thinkphp/library/think/route/RuleName.php
View File

@ -107,13 +107,14 @@ class RuleName
* @param string $domain 域名
* @return array|null
*/
public function get($name = null, $domain = null)
public function get($name = null, $domain = null, $method = '*')
{
if (is_null($name)) {
return $this->item;
}
$name = strtolower($name);
$method = strtolower($method);
if (isset($this->item[$name])) {
if (is_null($domain)) {
@ -121,7 +122,7 @@ class RuleName
} else {
$result = [];
foreach ($this->item[$name] as $item) {
if ($item[2] == $domain) {
if ($item[2] == $domain && ('*' == $item[4] || $method == $item[4])) {
$result[] = $item;
}
}

4
thinkphp/library/think/route/dispatch/Url.php
View File

@ -116,7 +116,9 @@ class Url extends Dispatch
$host = $this->request->host(true);
if ($this->rule->getRouter()->getName($name, $host) || $this->rule->getRouter()->getName($name2, $host)) {
$method = $this->request->method();
if ($this->rule->getRouter()->getName($name, $host, $method) || $this->rule->getRouter()->getName($name2, $host, $method)) {
return true;
}

40
thinkphp/library/think/validate/ValidateRule.php
View File

@ -36,25 +36,25 @@ namespace think\validate;
* @method ValidateRule regex(mixed $rule, string $msg = '') static 使用正则验证数据
* @method ValidateRule token(mixed $rule='__token__', string $msg = '') static 验证表单令牌
* @method ValidateRule is(mixed $rule, string $msg = '') static 验证字段值是否为有效格式
* @method ValidateRule isRequire(mixed $rule, string $msg = '') static 验证字段必须
* @method ValidateRule isNumber(mixed $rule, string $msg = '') static 验证字段值是否为数字
* @method ValidateRule isArray(mixed $rule, string $msg = '') static 验证字段值是否为数组
* @method ValidateRule isInteger(mixed $rule, string $msg = '') static 验证字段值是否为整形
* @method ValidateRule isFloat(mixed $rule, string $msg = '') static 验证字段值是否为浮点数
* @method ValidateRule isMobile(mixed $rule, string $msg = '') static 验证字段值是否为手机
* @method ValidateRule isIdCard(mixed $rule, string $msg = '') static 验证字段值是否为身份证号码
* @method ValidateRule isChs(mixed $rule, string $msg = '') static 验证字段值是否为中文
* @method ValidateRule isChsDash(mixed $rule, string $msg = '') static 验证字段值是否为中文字母及下划线
* @method ValidateRule isChsAlpha(mixed $rule, string $msg = '') static 验证字段值是否为中文和字母
* @method ValidateRule isChsAlphaNum(mixed $rule, string $msg = '') static 验证字段值是否为中文字母和数字
* @method ValidateRule isDate(mixed $rule, string $msg = '') static 验证字段值是否为有效格式
* @method ValidateRule isBool(mixed $rule, string $msg = '') static 验证字段值是否为布尔值
* @method ValidateRule isAlpha(mixed $rule, string $msg = '') static 验证字段值是否为字母
* @method ValidateRule isAlphaDash(mixed $rule, string $msg = '') static 验证字段值是否为字母和下划线
* @method ValidateRule isAlphaNum(mixed $rule, string $msg = '') static 验证字段值是否为字母和数字
* @method ValidateRule isAccepted(mixed $rule, string $msg = '') static 验证字段值是否为yes, on, 或是 1
* @method ValidateRule isEmail(mixed $rule, string $msg = '') static 验证字段值是否为有效邮箱格式
* @method ValidateRule isUrl(mixed $rule, string $msg = '') static 验证字段值是否为有效URL地址
* @method ValidateRule isRequire(mixed $rule = null, string $msg = '') static 验证字段必须
* @method ValidateRule isNumber(mixed $rule = null, string $msg = '') static 验证字段值是否为数字
* @method ValidateRule isArray(mixed $rule = null, string $msg = '') static 验证字段值是否为数组
* @method ValidateRule isInteger(mixed $rule = null, string $msg = '') static 验证字段值是否为整形
* @method ValidateRule isFloat(mixed $rule = null, string $msg = '') static 验证字段值是否为浮点数
* @method ValidateRule isMobile(mixed $rule = null, string $msg = '') static 验证字段值是否为手机
* @method ValidateRule isIdCard(mixed $rule = null, string $msg = '') static 验证字段值是否为身份证号码
* @method ValidateRule isChs(mixed $rule = null, string $msg = '') static 验证字段值是否为中文
* @method ValidateRule isChsDash(mixed $rule = null, string $msg = '') static 验证字段值是否为中文字母及下划线
* @method ValidateRule isChsAlpha(mixed $rule = null, string $msg = '') static 验证字段值是否为中文和字母
* @method ValidateRule isChsAlphaNum(mixed $rule = null, string $msg = '') static 验证字段值是否为中文字母和数字
* @method ValidateRule isDate(mixed $rule = null, string $msg = '') static 验证字段值是否为有效格式
* @method ValidateRule isBool(mixed $rule = null, string $msg = '') static 验证字段值是否为布尔值
* @method ValidateRule isAlpha(mixed $rule = null, string $msg = '') static 验证字段值是否为字母
* @method ValidateRule isAlphaDash(mixed $rule = null, string $msg = '') static 验证字段值是否为字母和下划线
* @method ValidateRule isAlphaNum(mixed $rule = null, string $msg = '') static 验证字段值是否为字母和数字
* @method ValidateRule isAccepted(mixed $rule = null, string $msg = '') static 验证字段值是否为yes, on, 或是 1
* @method ValidateRule isEmail(mixed $rule = null, string $msg = '') static 验证字段值是否为有效邮箱格式
* @method ValidateRule isUrl(mixed $rule = null, string $msg = '') static 验证字段值是否为有效URL地址
* @method ValidateRule activeUrl(mixed $rule, string $msg = '') static 验证是否为合格的域名或者IP
* @method ValidateRule ip(mixed $rule, string $msg = '') static 验证是否有效IP
* @method ValidateRule fileExt(mixed $rule, string $msg = '') static 验证文件后缀
@ -69,7 +69,7 @@ namespace think\validate;
* @method ValidateRule requireIf(mixed $rule, string $msg = '') static 验证某个字段等于某个值的时候必须
* @method ValidateRule requireCallback(mixed $rule, string $msg = '') static 通过回调方法验证某个字段是否必须
* @method ValidateRule requireWith(mixed $rule, string $msg = '') static 验证某个字段有值的情况下必须
* @method ValidateRule must(mixed $rule=null, string $msg = '') static 必须验证
* @method ValidateRule must(mixed $rule = null, string $msg = '') static 必须验证
*/
class ValidateRule
{

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit58a41c7e987cfb68eb98c0d5d6f8df7f::getLoader();
return ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit58a41c7e987cfb68eb98c0d5d6f8df7f
class ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit58a41c7e987cfb68eb98c0d5d6f8df7f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit58a41c7e987cfb68eb98c0d5d6f8df7f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit58a41c7e987cfb68eb98c0d5d6f8df7f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57', '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\ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit58a41c7e987cfb68eb98c0d5d6f8df7f
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire58a41c7e987cfb68eb98c0d5d6f8df7f($fileIdentifier, $file);
composerRequiref061ffbd27d2aca36162b5280255ea57($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire58a41c7e987cfb68eb98c0d5d6f8df7f($fileIdentifier, $file)
function composerRequiref061ffbd27d2aca36162b5280255ea57($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f
class ComposerStaticInitf061ffbd27d2aca36162b5280255ea57
{
public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -320,9 +320,9 @@ class ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit58a41c7e987cfb68eb98c0d5d6f8df7f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$classMap;
}, null, ClassLoader::class);
}

24
vendor/composer/installed.json vendored
View File

@ -177,17 +177,17 @@
},
{
"name": "symfony/options-resolver",
"version": "v3.4.18",
"version_normalized": "3.4.18.0",
"version": "v3.4.19",
"version_normalized": "3.4.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d"
"reference": "2cf5aa084338c1f67166013aebe87e2026bbe953"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
"reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/2cf5aa084338c1f67166013aebe87e2026bbe953",
"reference": "2cf5aa084338c1f67166013aebe87e2026bbe953",
"shasum": "",
"mirrors": [
{
@ -199,7 +199,7 @@
"require": {
"php": "^5.5.9|>=7.0.8"
},
"time": "2018-09-17T17:29:18+00:00",
"time": "2018-11-11T19:48:54+00:00",
"type": "library",
"extra": {
"branch-alias": {
@ -239,17 +239,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.29",
"version_normalized": "5.1.29.0",
"version": "v5.1.30",
"version_normalized": "5.1.30.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "f1d8ee3a91e8f504507edb5dcc49c50c47b4500f"
"reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/f1d8ee3a91e8f504507edb5dcc49c50c47b4500f",
"reference": "f1d8ee3a91e8f504507edb5dcc49c50c47b4500f",
"url": "https://api.github.com/repos/top-think/framework/zipball/4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
"reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
"shasum": "",
"mirrors": [
{
@ -271,7 +271,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-11-11T01:17:33+00:00",
"time": "2018-11-30T07:46:23+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",

2
vendor/symfony/options-resolver/phpunit.xml.dist vendored
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="vendor/autoload.php"