Presenter: fixed creating link with required persistent parameters (#148)

Author: JanTvrdik

src/Application/LinkGenerator.php

@@ -61,7 +61,12 @@ public function link($dest, array $params = [])
 			if (method_exists($class, $method = $class::formatActionMethod($action))
 				|| method_exists($class, $method = $class::formatRenderMethod($action))
 			) {
-				UI\Presenter::argsToParams($class, $method, $params);
+				UI\Presenter::argsToParams($class, $method, $params, [], $missing);
+				if ($missing) {
+					$rp = $missing[0];
+					throw new UI\InvalidLinkException("Missing parameter \${$rp->getName()} required by {$rp->getDeclaringClass()->getName()}::{$rp->getDeclaringFunction()->getName()}()");
+				}
+
 			} elseif (array_key_exists(0, $params)) {
 				throw new UI\InvalidLinkException("Unable to pass parameters to action '$presenter:$action', missing corresponding method.");
 			}

src/Application/UI/Presenter.php

@@ -869,7 +869,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 					throw new InvalidLinkException("Unknown signal '$signal', missing handler {$reflection->getName()}::$method()");
 				}
 				// convert indexed parameters to named
-				self::argsToParams(get_class($component), $method, $args, [], $mode === 'test');
+				self::argsToParams(get_class($component), $method, $args, [], $missing);
 			}
 
 			// counterpart of IStatePersistent
@@ -911,7 +911,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 					throw new InvalidLinkException("Unable to pass parameters to action '$presenter:$action', missing corresponding method.");
 				}
 			} else {
-				self::argsToParams($presenterClass, $method, $args, $destination === 'this' ? $this->params : [], $mode === 'test');
+				self::argsToParams($presenterClass, $method, $args, $destination === 'this' ? $this->params : [], $missing);
 			}
 
 			// counterpart of IStatePersistent
@@ -936,6 +936,14 @@ protected function createRequest($component, $destination, array $args, $mode)
 			$args += $globalState;
 		}
 
+		if ($mode !== 'test' && !empty($missing)) {
+			foreach ($missing as $rp) {
+				if (!array_key_exists($rp->getName(), $args)) {
+					throw new InvalidLinkException("Missing parameter \${$rp->getName()} required by {$rp->getDeclaringClass()->getName()}::{$rp->getDeclaringFunction()->getName()}()");
+				}
+			}
+		}
+
 		// ADD ACTION & SIGNAL & FLASH
 		if ($action) {
 			$args[self::ACTION_KEY] = $action;
@@ -995,12 +1003,12 @@ protected function createRequest($component, $destination, array $args, $mode)
 	 * @param  string  method name
 	 * @param  array   arguments
 	 * @param  array   supplemental arguments
-	 * @param  bool    prevents 'Missing parameter' exception
+	 * @param  ReflectionParameter[]  missing arguments
 	 * @return void
 	 * @throws InvalidLinkException
 	 * @internal
 	 */
-	public static function argsToParams($class, $method, & $args, $supplemental = [], $ignoreMissing = FALSE)
+	public static function argsToParams($class, $method, & $args, $supplemental = [], & $missing = [])
 	{
 		$i = 0;
 		$rm = new \ReflectionMethod($class, $method);
@@ -1021,10 +1029,11 @@ public static function argsToParams($class, $method, & $args, $supplemental = []
 			}
 
 			if (!isset($args[$name])) {
-				if ($param->isDefaultValueAvailable() || $type === 'NULL' || $type === 'array' || $ignoreMissing) {
-					continue;
+				if (!$param->isDefaultValueAvailable() && $type !== 'NULL' && $type !== 'array') {
+					$missing[] = $param;
+					unset($args[$name]);
 				}
-				throw new InvalidLinkException("Missing parameter \$$name required by $class::{$rm->getName()}()");
+				continue;
 			}
 
 			if (!ComponentReflection::convertType($args[$name], $type, $isClass)) {

tests/UI/Presenter.link().php7.phpt

@@ -100,6 +100,7 @@ class TestPresenter extends Application\UI\Presenter
 		Assert::same('/index.php?pint=0&pbool=0&p=0&action=params&presenter=Test', $this->link('params', ['pint' => FALSE, 'pbool' => FALSE, 'p' => FALSE, 'parr' => NULL]));
 		Assert::same("#error: Value passed to persistent parameter 'pbool' in presenter Test must be boolean, string given.", $this->link('this', ['p' => NULL, 'pbool' => 'a']));
 		Assert::same("#error: Value passed to persistent parameter 'p' in presenter Test must be scalar, array given.", $this->link('this', ['p' => [1], 'pbool' => FALSE]));
+		Assert::same('/index.php?action=persistent&presenter=Test', $this->link('persistent'));
 
 		// Other presenter & action link
 		Assert::same('/index.php?action=product&presenter=Other', $this->link('Other:product', ['p' => $this->p]));
@@ -238,6 +239,12 @@ class TestPresenter extends Application\UI\Presenter
 	{
 	}
 
+
+	public function actionPersistent(int $pint)
+	{
+	}
+
+
 	public function handleSignal($x = 1, $y = 1)
 	{
 	}