Presenter: invalid action throws BadRequestException only during startup

This will make possible to have type hint 'string' in changeAction()

Author: dg

src/Application/UI/Presenter.php

@@ -381,19 +381,13 @@ public function getAction($fullyQualified = FALSE)
 
 
 	/**
-	 * Changes current action. Only alphanumeric characters are allowed.
+	 * Changes current action.
 	 * @param  string
 	 * @return void
 	 */
 	public function changeAction($action)
 	{
-		if (is_string($action) && Nette\Utils\Strings::match($action, '#^[a-zA-Z0-9][a-zA-Z0-9_\x7f-\xff]*\z#')) {
-			$this->action = $action;
-			$this->view = $action;
-
-		} else {
-			$this->error('Action name is not alphanumeric string.');
-		}
+		$this->action = $this->view = (string) $action;
 	}
 
 
@@ -1231,7 +1225,11 @@ private function initGlobalParameters()
 		}
 
 		// init & validate $this->action & $this->view
-		$this->changeAction(isset($selfParams[self::ACTION_KEY]) ? $selfParams[self::ACTION_KEY] : self::DEFAULT_ACTION);
+		$action = $selfParams[self::ACTION_KEY] ?? self::DEFAULT_ACTION;
+		if (!is_string($action) || !Nette\Utils\Strings::match($action, '#^[a-zA-Z0-9][a-zA-Z0-9_\x7f-\xff]*\z#')) {
+			$this->error('Action name is not valid.');
+		}
+		$this->changeAction($action);
 
 		// init $this->signalReceiver and key 'signal' in appropriate params array
 		$this->signalReceiver = $this->getUniqueId();

tests/UI/Presenter.paramChecking.phpt

@@ -38,7 +38,7 @@ $presenter->injectPrimary(
 Assert::exception(function () use ($presenter) {
 	$request = new Application\Request('Test', Http\Request::GET, ['action' => []]);
 	$presenter->run($request);
-}, Nette\Application\BadRequestException::class, 'Action name is not alphanumeric string.');
+}, Nette\Application\BadRequestException::class, 'Action name is not valid.');
 
 
 Assert::exception(function () use ($presenter) {