Presenter: isLinkCurrent is compatible with PHP 7 typehints [Closes #126]

Author: dg

src/Application/UI/Presenter.php

@@ -874,7 +874,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);
+				self::argsToParams(get_class($component), $method, $args, [], $mode === 'test');
 			}
 
 			// counterpart of IStatePersistent
@@ -915,12 +915,8 @@ protected function createRequest($component, $destination, array $args, $mode)
 				if (array_key_exists(0, $args)) {
 					throw new InvalidLinkException("Unable to pass parameters to action '$presenter:$action', missing corresponding method.");
 				}
-
-			} elseif ($destination === 'this') {
-				self::argsToParams($presenterClass, $method, $args, $this->params);
-
 			} else {
-				self::argsToParams($presenterClass, $method, $args);
+				self::argsToParams($presenterClass, $method, $args, $destination === 'this' ? $this->params : [], $mode === 'test');
 			}
 
 			// counterpart of IStatePersistent
@@ -1004,11 +1000,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
 	 * @return void
 	 * @throws InvalidLinkException
 	 * @internal
 	 */
-	public static function argsToParams($class, $method, & $args, $supplemental = [])
+	public static function argsToParams($class, $method, & $args, $supplemental = [], $ignoreMissing = FALSE)
 	{
 		$i = 0;
 		$rm = new \ReflectionMethod($class, $method);
@@ -1029,7 +1026,7 @@ public static function argsToParams($class, $method, & $args, $supplemental = []
 			}
 
 			if (!isset($args[$name])) {
-				if ($param->isDefaultValueAvailable() || $type === 'NULL' || $type === 'array') {
+				if ($param->isDefaultValueAvailable() || $type === 'NULL' || $type === 'array' || $ignoreMissing) {
 					continue;
 				}
 				throw new InvalidLinkException("Missing parameter \$$name required by $class::{$rm->getName()}()");

tests/UI/PresenterComponent.isLinkCurrent().php7.phpt

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Test: Nette\Application\UI\PresenterComponent::isLinkCurrent()
+ * @phpVersion 7
+ */
+
+use Nette\Application;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/MockPresenterFactory.php';
+
+class TestPresenter extends Application\UI\Presenter
+{
+
+	public function actionDefault(int $int, bool $bool)
+	{
+	}
+
+	public function handleSignal()
+	{
+	}
+
+	public function handleOtherSignal()
+	{
+	}
+
+}
+
+class TestControl extends Application\UI\Control
+{
+
+	public function handleClick(int $x)
+	{
+	}
+
+	public function handleOtherSignal()
+	{
+	}
+
+}
+
+require __DIR__ . '/PresenterComponent.isLinkCurrent().asserts.php';