删除 request 及 response

hongshu7 · Jan 21, 2018 · 462ccee · 462ccee
1 parent 7c42c56
commit 462ccee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 59 deletions.
diff --git a/src/Fasim/Core/Application.php b/src/Fasim/Core/Application.php
@@ -234,13 +234,6 @@ protected function registerFacdes() {
 		$this->singleton('security', function($app) {
 			return new Security();
 		});
-		//兼容
-		$this->singleton('request', function($app) {
-			return $this->make('input');
-		});
-		$this->singleton('response', function($app) {
-			return $this->make('output');
-		});
 
 	}
 
@@ -355,7 +348,7 @@ public function run() {
 				'message' => $exception->getMessage(),
 				'file' => $exception->getFile(),
 				'line' => $exception->getLine(),
-				'trace' => $exception->getBackTrace()
+				'trace' => $exception->getTrace()
 			];
 			$data = [
 				'error' => $error,

diff --git a/src/Fasim/Core/Controller.php b/src/Fasim/Core/Controller.php
@@ -41,14 +41,14 @@ class Controller {
 	public $config;
 	/**
 	 * 系统输入类
-	 * @var Request
+	 * @var Input
 	 */
-	public $request;
+	public $input;
 	/**
 	 * 系统输出类
-	 * @var Response
+	 * @var Output
 	 */
-	public $response;
+	public $output;
 	/**
 	 * Session类
 	 * @var Session
@@ -73,9 +73,6 @@ public function __construct($app, $controllerName) {
 
 		$this->input = $this->app->make('input');
 		$this->output = $this->app->make('output');
-		//兼容旧的
-		$this->request = $this->input;
-		$this->response = $this->output;
 
 		$this->session = \Fasim\Session\SessionFactory::getSession();
 

diff --git a/src/Fasim/Facades/Request.php b/src/Fasim/Facades/Request.php
diff --git a/src/Fasim/Facades/Response.php b/src/Fasim/Facades/Response.php