diff --git a/composer.lock b/composer.lock index 1aaf2fd..89d9da1 100644 --- a/composer.lock +++ b/composer.lock @@ -504,12 +504,12 @@ "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "1444cce94b40a836958380b160a5fb7bfc165daf" + "reference": "dbe7e9d7159d767b37c05627069289a07138e13e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/1444cce94b40a836958380b160a5fb7bfc165daf", - "reference": "1444cce94b40a836958380b160a5fb7bfc165daf", + "url": "https://api.github.com/repos/top-think/framework/zipball/dbe7e9d7159d767b37c05627069289a07138e13e", + "reference": "dbe7e9d7159d767b37c05627069289a07138e13e", "shasum": "", "mirrors": [ { @@ -564,7 +564,7 @@ "orm", "thinkphp" ], - "time": "2020-01-13T05:48:05+00:00" + "time": "2020-01-14T12:45:58+00:00" }, { "name": "topthink/think-captcha", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index a56559b..11e84a3 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -728,12 +728,12 @@ "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "1444cce94b40a836958380b160a5fb7bfc165daf" + "reference": "dbe7e9d7159d767b37c05627069289a07138e13e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/1444cce94b40a836958380b160a5fb7bfc165daf", - "reference": "1444cce94b40a836958380b160a5fb7bfc165daf", + "url": "https://api.github.com/repos/top-think/framework/zipball/dbe7e9d7159d767b37c05627069289a07138e13e", + "reference": "dbe7e9d7159d767b37c05627069289a07138e13e", "shasum": "", "mirrors": [ { @@ -760,7 +760,7 @@ "mockery/mockery": "^1.2", "phpunit/phpunit": "^7.0" }, - "time": "2020-01-13T05:48:05+00:00", + "time": "2020-01-14T12:45:58+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/services.php b/vendor/services.php index 9419b6d..ae7f6d1 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\captcha\\CaptchaService', diff --git a/vendor/topthink/framework/src/think/exception/Handle.php b/vendor/topthink/framework/src/think/exception/Handle.php index 9f92054..88e8f2a 100644 --- a/vendor/topthink/framework/src/think/exception/Handle.php +++ b/vendor/topthink/framework/src/think/exception/Handle.php @@ -175,7 +175,7 @@ class Handle 'POST Data' => $this->app->request->post(), 'Files' => $this->app->request->file(), 'Cookies' => $this->app->request->cookie(), - 'Session' => $this->app->session->all(), + 'Session' => $this->app->exists('session') ? $this->app->session->all() : [], 'Server/Request Data' => $this->app->request->server(), 'Environment Variables' => $this->app->request->env(), 'ThinkPHP Constants' => $this->getConst(),