renamed parameter $need -> $throw, $code -> $httpCode

Author: dg

src/Application/MicroPresenter.php

@@ -133,9 +133,9 @@ public function createTemplate($class = NULL, callable $latteFactory = NULL)
 	 * @param  int HTTP code
 	 * @return Nette\Application\Responses\RedirectResponse
 	 */
-	public function redirectUrl($url, $code = Http\IResponse::S302_FOUND)
+	public function redirectUrl($url, $httpCode = Http\IResponse::S302_FOUND)
 	{
-		return new Responses\RedirectResponse($url, $code);
+		return new Responses\RedirectResponse($url, $httpCode);
 	}
 
 
@@ -146,9 +146,9 @@ public function redirectUrl($url, $code = Http\IResponse::S302_FOUND)
 	 * @return void
 	 * @throws Nette\Application\BadRequestException
 	 */
-	public function error($message = NULL, $code = Http\IResponse::S404_NOT_FOUND)
+	public function error($message = NULL, $httpCode = Http\IResponse::S404_NOT_FOUND)
 	{
-		throw new Application\BadRequestException($message, $code);
+		throw new Application\BadRequestException($message, $httpCode);
 	}
 
 

src/Application/Responses/RedirectResponse.php

@@ -22,17 +22,17 @@ class RedirectResponse implements Nette\Application\IResponse
 	private $url;
 
 	/** @var int */
-	private $code;
+	private $httpCode;
 
 
 	/**
 	 * @param  string  URI
 	 * @param  int     HTTP code 3xx
 	 */
-	public function __construct($url, $code = Http\IResponse::S302_FOUND)
+	public function __construct($url, $httpCode = Http\IResponse::S302_FOUND)
 	{
 		$this->url = (string) $url;
-		$this->code = (int) $code;
+		$this->httpCode = (int) $httpCode;
 	}
 
 
@@ -50,7 +50,7 @@ public function getUrl()
 	 */
 	public function getCode()
 	{
-		return $this->code;
+		return $this->httpCode;
 	}
 
 
@@ -60,7 +60,7 @@ public function getCode()
 	 */
 	public function send(Http\IRequest $httpRequest, Http\IResponse $httpResponse)
 	{
-		$httpResponse->redirect($this->url, $this->code);
+		$httpResponse->redirect($this->url, $this->httpCode);
 	}
 
 }

src/Application/UI/Component.php

@@ -34,9 +34,9 @@ abstract class Component extends Nette\ComponentModel\Container implements ISign
 	 * @param  bool   throw exception if presenter doesn't exist?
 	 * @return Presenter|NULL
 	 */
-	public function getPresenter($need = TRUE)
+	public function getPresenter($throw = TRUE)
 	{
-		return $this->lookup(Presenter::class, $need);
+		return $this->lookup(Presenter::class, $throw);
 	}
 
 

src/Application/UI/Form.php

@@ -45,9 +45,9 @@ protected function validateParent(Nette\ComponentModel\IContainer $parent)
 	 * @param  bool   throw exception if presenter doesn't exist?
 	 * @return Presenter|NULL
 	 */
-	public function getPresenter($need = TRUE)
+	public function getPresenter($throw = TRUE)
 	{
-		return $this->lookup(Presenter::class, $need);
+		return $this->lookup(Presenter::class, $throw);
 	}
 
 

src/Application/UI/Presenter.php

@@ -144,7 +144,7 @@ public function getRequest()
 	 * Returns self.
 	 * @return Presenter
 	 */
-	public function getPresenter($need = TRUE)
+	public function getPresenter($throw = TRUE)
 	{
 		return $this;
 	}
@@ -667,18 +667,18 @@ public function forward($destination, $args = [])
 	 * @return void
 	 * @throws Nette\Application\AbortException
 	 */
-	public function redirectUrl($url, $code = NULL)
+	public function redirectUrl($url, $httpCode = NULL)
 	{
 		if ($this->isAjax()) {
 			$this->payload->redirect = (string) $url;
 			$this->sendPayload();
 
-		} elseif (!$code) {
-			$code = $this->httpRequest->isMethod('post')
+		} elseif (!$httpCode) {
+			$httpCode = $this->httpRequest->isMethod('post')
 				? Http\IResponse::S303_POST_GET
 				: Http\IResponse::S302_FOUND;
 		}
-		$this->sendResponse(new Responses\RedirectResponse($url, $code));
+		$this->sendResponse(new Responses\RedirectResponse($url, $httpCode));
 	}
 
 
@@ -689,9 +689,9 @@ public function redirectUrl($url, $code = NULL)
 	 * @return void
 	 * @throws Nette\Application\BadRequestException
 	 */
-	public function error($message = NULL, $code = Http\IResponse::S404_NOT_FOUND)
+	public function error($message = NULL, $httpCode = Http\IResponse::S404_NOT_FOUND)
 	{
-		throw new Application\BadRequestException($message, $code);
+		throw new Application\BadRequestException($message, $httpCode);
 	}
 
 

src/Application/exceptions.php

@@ -42,9 +42,9 @@ class BadRequestException extends \Exception
 	protected $code = 404;
 
 
-	public function __construct($message = '', $code = 0, \Exception $previous = NULL)
+	public function __construct($message = '', $httpCode = 0, \Exception $previous = NULL)
 	{
-		parent::__construct($message, $code < 200 || $code > 504 ? $this->code : $code, $previous);
+		parent::__construct($message, $httpCode ?: $this->code, $previous);
 	}
 
 }