Browse Source

renamed Application::handle() to handelRequest()

Name make more sense imo as it is not clear what it handles otherwise.
Removed unused method processRequest form console app and also refactored
console Application to be more similar to web Application.
tags/2.0.0-beta
Carsten Brandt 12 years ago
parent
commit
5ed52b98a1
  1. 4
      framework/yii/base/Application.php
  2. 25
      framework/yii/console/Application.php
  3. 3
      framework/yii/web/Application.php

4
framework/yii/base/Application.php

@ -139,7 +139,7 @@ abstract class Application extends Module
*/ */
public function run() public function run()
{ {
$response = $this->handle($this->getRequest()); $response = $this->handleRequest($this->getRequest());
$response->send(); $response->send();
return $response->exitStatus; return $response->exitStatus;
} }
@ -153,7 +153,7 @@ abstract class Application extends Module
* @param Request $request the request to be handled * @param Request $request the request to be handled
* @return Response the resulting response * @return Response the resulting response
*/ */
abstract public function handle($request); abstract public function handleRequest($request);
private $_runtimePath; private $_runtimePath;

25
framework/yii/console/Application.php

@ -88,9 +88,14 @@ class Application extends \yii\base\Application
* Handles the specified request. * Handles the specified request.
* @param Request $request the request to be handled * @param Request $request the request to be handled
* @return Response the resulting response * @return Response the resulting response
* @throws Exception when script is not running on command line.
* @throws Exception if the route is invalid
*/ */
public function handle($request) public function handleRequest($request)
{ {
if (!$request->getIsConsoleRequest()) {
throw new Exception(\Yii::t('yii', 'This script must be run from the command line.'));
}
list ($route, $params) = $request->resolve(); list ($route, $params) = $request->resolve();
$result = $this->runAction($route, $params); $result = $this->runAction($route, $params);
if ($result instanceof Response) { if ($result instanceof Response) {
@ -103,24 +108,6 @@ class Application extends \yii\base\Application
} }
/** /**
* Processes the request.
* The request is represented in terms of a controller route and action parameters.
* @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
* @throws Exception if the script is not running from the command line
*/
public function processRequest()
{
/** @var $request Request */
$request = $this->getRequest();
if ($request->getIsConsoleRequest()) {
list ($route, $params) = $request->resolve();
return $this->runAction($route, $params);
} else {
throw new Exception(\Yii::t('yii', 'This script must be run from the command line.'));
}
}
/**
* Returns the response component. * Returns the response component.
* @return Response the response component * @return Response the response component
*/ */

3
framework/yii/web/Application.php

@ -53,7 +53,7 @@ class Application extends \yii\base\Application
* @return Response the resulting response * @return Response the resulting response
* @throws HttpException if the requested route is invalid * @throws HttpException if the requested route is invalid
*/ */
public function handle($request) public function handleRequest($request)
{ {
Yii::setAlias('@wwwroot', dirname($request->getScriptFile())); Yii::setAlias('@wwwroot', dirname($request->getScriptFile()));
Yii::setAlias('@www', $request->getBaseUrl()); Yii::setAlias('@www', $request->getBaseUrl());
@ -78,7 +78,6 @@ class Application extends \yii\base\Application
} catch (InvalidRouteException $e) { } catch (InvalidRouteException $e) {
throw new HttpException(404, $e->getMessage(), $e->getCode(), $e); throw new HttpException(404, $e->getMessage(), $e->getCode(), $e);
} }
} }
private $_homeUrl; private $_homeUrl;

Loading…
Cancel
Save