Presenter: link(), redirect() and forward() more precise recognizes between variadic vs array parameter

Author: dg

src/Application/UI/Presenter.php

@@ -653,7 +653,8 @@ public function forward($destination, $args = [])
 			$this->sendResponse(new Responses\ForwardResponse($destination));
 		}
 
-		$this->createRequest($this, $destination, is_array($args) ? $args : array_slice(func_get_args(), 1), 'forward');
+		$args = func_num_args() < 3 && is_array($args) ? $args : array_slice(func_get_args(), 1);
+		$this->createRequest($this, $destination, $args, 'forward');
 		$this->sendResponse(new Responses\ForwardResponse($this->lastCreatedRequest));
 	}
 

src/Application/UI/PresenterComponent.php

@@ -281,7 +281,8 @@ public static function formatSignalMethod($signal)
 	public function link($destination, $args = [])
 	{
 		try {
-			return $this->getPresenter()->createRequest($this, $destination, is_array($args) ? $args : array_slice(func_get_args(), 1), 'link');
+			$args = func_num_args() < 3 && is_array($args) ? $args : array_slice(func_get_args(), 1);
+			return $this->getPresenter()->createRequest($this, $destination, $args, 'link');
 
 		} catch (InvalidLinkException $e) {
 			return $this->getPresenter()->handleInvalidLink($e);
@@ -297,7 +298,8 @@ public function link($destination, $args = [])
 	 */
 	public function lazyLink($destination, $args = [])
 	{
-		return new Link($this, $destination, is_array($args) ? $args : array_slice(func_get_args(), 1));
+		$args = func_num_args() < 3 && is_array($args) ? $args : array_slice(func_get_args(), 1);
+		return new Link($this, $destination, $args);
 	}
 
 
@@ -311,7 +313,8 @@ public function lazyLink($destination, $args = [])
 	public function isLinkCurrent($destination = NULL, $args = [])
 	{
 		if ($destination !== NULL) {
-			$this->getPresenter()->createRequest($this, $destination, is_array($args) ? $args : array_slice(func_get_args(), 1), 'test');
+			$args = func_num_args() < 3 && is_array($args) ? $args : array_slice(func_get_args(), 1);
+			$this->getPresenter()->createRequest($this, $destination, $args, 'test');
 		}
 		return $this->getPresenter()->getLastCreatedRequestFlag('current');
 	}
@@ -328,11 +331,11 @@ public function isLinkCurrent($destination = NULL, $args = [])
 	public function redirect($code, $destination = NULL, $args = [])
 	{
 		if (!is_numeric($code)) { // first parameter is optional
-			$args = is_array($destination) ? $destination : array_slice(func_get_args(), 1);
+			$args = func_num_args() < 3 && is_array($destination) ? $destination : array_slice(func_get_args(), 1);
 			$destination = $code;
 			$code = NULL;
 
-		} elseif (!is_array($args)) {
+		} elseif (func_num_args() < 4 && !is_array($args)) {
 			$args = array_slice(func_get_args(), 2);
 		}
 

tests/Application/Presenter.link().phpt

@@ -104,7 +104,8 @@ class TestPresenter extends Application\UI\Presenter
 		Assert::same('/index.php?y=2&action=default&do=buy&presenter=Test', $this->link('buy!', 1, 2));
 		Assert::same('/index.php?y=2&bool=1&str=1&action=default&do=buy&presenter=Test', $this->link('buy!', '1', '2', TRUE, TRUE));
 		Assert::same('/index.php?y=2&str=0&action=default&do=buy&presenter=Test', $this->link('buy!', '1', '2', FALSE, FALSE));
-		Assert::same('/index.php?action=default&do=buy&presenter=Test', $this->link('buy!', [1], (object) [1]));
+		Assert::same('/index.php?action=default&do=buy&presenter=Test', $this->link('buy!', [1]));
+		Assert::same("#error: Invalid value for parameter 'x' in method TestPresenter::handlebuy(), expected integer.", $this->link('buy!', [1], (object) [1]));
 		Assert::same('/index.php?y=2&action=default&do=buy&presenter=Test', $this->link('buy!', [1, 'y' => 2]));
 		Assert::same('/index.php?y=2&action=default&do=buy&presenter=Test', $this->link('buy!', ['x' => 1, 'y' => 2, 'var1' => $this->var1]));
 		Assert::same('#error: Signal must be non-empty string.', $this->link('!'));
@@ -120,7 +121,8 @@ class TestPresenter extends Application\UI\Presenter
 		Assert::same('#error: Signal must be non-empty string.', $this['mycontrol']->link('', 0, 1));
 		Assert::same('/index.php?mycontrol-x=0&mycontrol-y=1&action=default&do=mycontrol-click&presenter=Test', $this['mycontrol']->link('click', 0, 1));
 		Assert::same('/index.php?mycontrol-x=0a&mycontrol-y=1a&action=default&do=mycontrol-click&presenter=Test', $this['mycontrol']->link('click', '0a', '1a'));
-		Assert::same('/index.php?mycontrol-x=1&action=default&do=mycontrol-click&presenter=Test', $this['mycontrol']->link('click', [1], (object) [1]));
+		Assert::same('/index.php?mycontrol-x=1&action=default&do=mycontrol-click&presenter=Test', $this['mycontrol']->link('click', [1]));
+		Assert::same("#error: Invalid value for parameter 'x' in method TestControl::handleclick(), expected scalar.", $this['mycontrol']->link('click', [1], (object) [1]));
 		Assert::same('/index.php?mycontrol-x=1&action=default&do=mycontrol-click&presenter=Test', $this['mycontrol']->link('click', TRUE, FALSE));
 		Assert::same('/index.php?action=default&do=mycontrol-click&presenter=Test', $this['mycontrol']->link('click', NULL, ''));
 		Assert::same('#error: Passed more parameters than method TestControl::handleClick() expects.', $this['mycontrol']->link('click', 1, 2, 3));