fix:修复BUG/升级1.1.6版本
This commit is contained in:
16
vendor/topthink/think-orm/stubs/Exception.php
vendored
16
vendor/topthink/think-orm/stubs/Exception.php
vendored
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
@@ -8,25 +9,25 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: liu21st <liu21st@gmail.com>
|
||||
// +----------------------------------------------------------------------
|
||||
declare (strict_types=1);
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace think;
|
||||
|
||||
/**
|
||||
* 异常基础类
|
||||
* @package think
|
||||
* 异常基础类.
|
||||
*/
|
||||
class Exception extends \Exception
|
||||
{
|
||||
/**
|
||||
* 保存异常页面显示的额外Debug数据
|
||||
* 保存异常页面显示的额外Debug数据.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $data = [];
|
||||
|
||||
/**
|
||||
* 设置异常额外的Debug数据
|
||||
* 数据将会显示为下面的格式
|
||||
* 数据将会显示为下面的格式.
|
||||
*
|
||||
* Exception Data
|
||||
* --------------------------------------------------
|
||||
@@ -37,7 +38,6 @@ class Exception extends \Exception
|
||||
* key1 value1
|
||||
* key2 value2
|
||||
*
|
||||
* @access protected
|
||||
* @param string $label 数据分类,用于异常页面显示
|
||||
* @param array $data 需要显示的数据,必须为关联数组
|
||||
*/
|
||||
@@ -48,8 +48,8 @@ class Exception extends \Exception
|
||||
|
||||
/**
|
||||
* 获取异常额外Debug数据
|
||||
* 主要用于输出到异常页面便于调试
|
||||
* @access public
|
||||
* 主要用于输出到异常页面便于调试.
|
||||
*
|
||||
* @return array 由setData设置的Debug数据
|
||||
*/
|
||||
final public function getData()
|
||||
|
||||
20
vendor/topthink/think-orm/stubs/Facade.php
vendored
20
vendor/topthink/think-orm/stubs/Facade.php
vendored
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
// +----------------------------------------------------------------------
|
||||
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
@@ -15,7 +16,8 @@ namespace think;
|
||||
class Facade
|
||||
{
|
||||
/**
|
||||
* 始终创建新的对象实例
|
||||
* 始终创建新的对象实例.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
protected static $alwaysNewInstance;
|
||||
@@ -23,18 +25,21 @@ class Facade
|
||||
protected static $instance;
|
||||
|
||||
/**
|
||||
* 获取当前Facade对应类名
|
||||
* @access protected
|
||||
* 获取当前Facade对应类名.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected static function getFacadeClass()
|
||||
{}
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建Facade实例
|
||||
* 创建Facade实例.
|
||||
*
|
||||
* @static
|
||||
* @access protected
|
||||
* @param bool $newInstance 是否每次创建新的实例
|
||||
*
|
||||
* @param bool $newInstance 是否每次创建新的实例
|
||||
*
|
||||
* @return object
|
||||
*/
|
||||
protected static function createFacade(bool $newInstance = false)
|
||||
@@ -54,7 +59,6 @@ class Facade
|
||||
}
|
||||
|
||||
return self::$instance;
|
||||
|
||||
}
|
||||
|
||||
// 调用实际类的方法
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?php
|
||||
|
||||
if (!\class_exists('think\Exception')) {
|
||||
require __DIR__ . '/Exception.php';
|
||||
require __DIR__.'/Exception.php';
|
||||
}
|
||||
|
||||
if (!\class_exists('think\Facade')) {
|
||||
require __DIR__ . '/Facade.php';
|
||||
}
|
||||
require __DIR__.'/Facade.php';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user