Presenter: persistent parameters are transmitted between traits (in addition to the class hierarchy) [Closes #183]

Author: dg

src/Application/UI/ComponentReflection.php

@@ -52,7 +52,7 @@ public function getPersistentParams(string $class = null): array
 				if (!$rp->isStatic() && self::parseAnnotation($rp, 'persistent')) {
 					$params[$name] = [
 						'def' => $default,
-						'since' => $isPresenter ? $class : null,
+						'since' => $isPresenter ? Nette\Utils\Reflection::getPropertyDeclaringClass($rp)->getName() : null,
 					];
 				}
 			}
@@ -94,13 +94,15 @@ public function getPersistentComponents(string $class = null): array
 	 */
 	public function saveState(Component $component, array &$params): void
 	{
+		$tree = self::getClassesAndTraits(get_class($component));
+
 		foreach ($this->getPersistentParams() as $name => $meta) {
 			if (isset($params[$name])) {
 				// injected value
 
 			} elseif (
 				array_key_exists($name, $params) // nulls are skipped
-				|| (isset($meta['since']) && !$component instanceof $meta['since']) // not related
+				|| (isset($meta['since']) && !isset($tree[$meta['since']])) // not related
 				|| !isset($component->$name)
 			) {
 				continue;
@@ -285,4 +287,23 @@ public function getMethods($filter = -1): array
 		}
 		return $res;
 	}
+
+
+	/**
+	 * return string[]
+	 */
+	public static function getClassesAndTraits(string $class): array
+	{
+		$res = [$class => $class] + class_parents($class);
+		$addTraits = function ($type) use (&$res, &$addTraits) {
+			$res += class_uses($type);
+			foreach (class_uses($type) as $trait) {
+				$addTraits($trait);
+			}
+		};
+		foreach ($res as $type) {
+			$addTraits($type);
+		}
+		return $res;
+	}
 }

src/Application/UI/Presenter.php

@@ -1100,6 +1100,7 @@ protected function getGlobalState(string $forClass = null): array
 		}
 
 		if ($forClass !== null) {
+			$tree = ComponentReflection::getClassesAndTraits($forClass);
 			$since = null;
 			foreach ($state as $key => $foo) {
 				if (!isset($sinces[$key])) {
@@ -1109,7 +1110,7 @@ protected function getGlobalState(string $forClass = null): array
 				}
 				if ($since !== $sinces[$key]) {
 					$since = $sinces[$key];
-					$ok = $since && is_a($forClass, $since, true);
+					$ok = $since && isset($tree[$since]);
 				}
 				if (!$ok) {
 					unset($state[$key]);

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

@@ -64,7 +64,7 @@ class TestPresenter extends BasePresenter
 		$this->t2 = 4;
 		Assert::same('/index.php?p2=2&p1=1&t1=3&t2=4&action=default&presenter=Test', $this->link('this'));
 		Assert::same('/index.php?p1=1&t1=3&action=default&presenter=Second', $this->link('Second:'));
-		Assert::same('/index.php?p1=1&t1=3&action=default&presenter=Third', $this->link('Third:'));
+		Assert::same('/index.php?p1=1&t1=3&t2=4&action=default&presenter=Third', $this->link('Third:'));
 
 		$this->p1 = 20;
 		Assert::same('/index.php?t1=3&action=default&presenter=Second', $this->link('Second:'));
@@ -97,27 +97,27 @@ class ThirdPresenter extends BasePresenter
 
 Assert::same([
 	'p1' => ['def' => null, 'since' => 'BasePresenter'],
-	't1' => ['def' => null, 'since' => 'BasePresenter'],
+	't1' => ['def' => null, 'since' => 'PersistentParam1'],
 ], BasePresenter::getReflection()->getPersistentParams());
 
 Assert::same([
 	'p2' => ['def' => null, 'since' => 'TestPresenter'],
 	'p1' => ['def' => null, 'since' => 'BasePresenter'],
-	't1' => ['def' => null, 'since' => 'BasePresenter'],
-	't2' => ['def' => null, 'since' => 'TestPresenter'],
+	't1' => ['def' => null, 'since' => 'PersistentParam1'],
+	't2' => ['def' => null, 'since' => 'PersistentParam2A'],
 ], TestPresenter::getReflection()->getPersistentParams());
 
 Assert::same([
 	'p1' => ['def' => 20, 'since' => 'BasePresenter'],
 	'p3' => ['def' => null, 'since' => 'SecondPresenter'],
-	't1' => ['def' => null, 'since' => 'BasePresenter'],
-	't3' => ['def' => null, 'since' => 'SecondPresenter'],
+	't1' => ['def' => null, 'since' => 'PersistentParam1'],
+	't3' => ['def' => null, 'since' => 'PersistentParam3'],
 ], SecondPresenter::getReflection()->getPersistentParams());
 
 Assert::same([
 	'p1' => ['def' => null, 'since' => 'BasePresenter'],
-	't1' => ['def' => null, 'since' => 'BasePresenter'],
-	't2' => ['def' => null, 'since' => 'ThirdPresenter'],
+	't1' => ['def' => null, 'since' => 'PersistentParam1'],
+	't2' => ['def' => null, 'since' => 'PersistentParam2A'],
 ], ThirdPresenter::getReflection()->getPersistentParams());