AccessPolicy refactoring

Author: dg

src/Application/UI/AccessPolicy.php

@@ -25,22 +25,27 @@ final class AccessPolicy
 
 
 	public function __construct(
-		private readonly Component $component,
 		private readonly \ReflectionClass|\ReflectionMethod $element,
 	) {
 	}
 
 
-	public function checkAccess(): void
+	public function checkAccess(Component $component): void
 	{
+		$this->presenter ??= $component->getPresenterIfExists() ??
+			throw new Nette\InvalidStateException('Presenter is required for checking requirements of ' . Reflection::toString($this->element));
+
 		$attrs = $this->getAttributes();
-		$attrs = self::applyInternalRules($attrs);
+		$attrs = self::applyInternalRules($attrs, $component);
 		foreach ($attrs as $attribute) {
 			$this->checkAttribute($attribute);
 		}
 	}
 
 
+	/**
+	 * @return Attributes\Requires[]
+	 */
 	private function getAttributes(): array
 	{
 		return array_map(
@@ -50,11 +55,11 @@ private function getAttributes(): array
 	}
 
 
-	private function applyInternalRules(array $attrs): array
+	private function applyInternalRules(array $attrs, Component $component): array
 	{
 		if (
 			$this->element instanceof \ReflectionMethod
-			&& str_starts_with($this->element->getName(), $this->component::formatSignalMethod(''))
+			&& str_starts_with($this->element->getName(), $component::formatSignalMethod(''))
 			&& !ComponentReflection::parseAnnotation($this->element, 'crossOrigin')
 			&& !Nette\Utils\Arrays::some($attrs, fn($attr) => $attr->sameOrigin === false)
 		) {
@@ -66,9 +71,6 @@ private function applyInternalRules(array $attrs): array
 
 	private function checkAttribute(Attributes\Requires $attribute): void
 	{
-		$this->presenter ??= $this->component->getPresenterIfExists() ??
-			throw new Nette\InvalidStateException('Presenter is required for checking requirements of ' . Reflection::toString($this->element));
-
 		if ($attribute->methods !== null) {
 			$this->checkHttpMethod($attribute);
 		}

src/Application/UI/Component.php

@@ -75,7 +75,7 @@ public function getUniqueId(): string
 	protected function createComponent(string $name): ?Nette\ComponentModel\IComponent
 	{
 		if (method_exists($this, $method = 'createComponent' . $name)) {
-			(new AccessPolicy($this, new \ReflectionMethod($this, $method)))->checkAccess();
+			(new AccessPolicy(new \ReflectionMethod($this, $method)))->checkAccess($this);
 		}
 		$res = parent::createComponent($name);
 		if ($res && !$res instanceof SignalReceiver && !$res instanceof StatePersistent) {
@@ -110,7 +110,7 @@ protected function tryCall(string $method, array $params): bool
 		}
 
 		$rm = $rc->getMethod($method);
-		(new AccessPolicy($this, $rm))->checkAccess();
+		(new AccessPolicy($rm))->checkAccess($this);
 		$this->checkRequirements($rm);
 		try {
 			$args = ParameterConverter::toArguments($rm, $params);

src/Application/UI/Presenter.php

@@ -187,7 +187,7 @@ public function run(Application\Request $request): Application\Response
 
 		try {
 			// CHECK REQUIREMENTS
-			(new AccessPolicy($this, static::getReflection()))->checkAccess();
+			(new AccessPolicy(static::getReflection()))->checkAccess($this);
 			$this->checkRequirements(static::getReflection());
 			$this->checkHttpMethod();