Component, Form: added getPresenterIfExists()

Author: dg

src/Application/UI/Component.php

@@ -39,13 +39,22 @@ abstract class Component extends Nette\ComponentModel\Container implements ISign
 	public function getPresenter(): ?Presenter
 	{
 		if (func_num_args()) {
-			trigger_error(__METHOD__ . '() parameter $throw is deprecated, use hasPresenter()', E_USER_DEPRECATED);
+			trigger_error(__METHOD__ . '() parameter $throw is deprecated, use getPresenterIfExists()', E_USER_DEPRECATED);
 			$throw = func_get_arg(0);
 		}
 		return $this->lookup(Presenter::class, $throw ?? true);
 	}
 
 
+	/**
+	 * Returns the presenter where this component belongs to.
+	 */
+	public function getPresenterIfExists(): ?Presenter
+	{
+		return $this->lookup(Presenter::class, false);
+	}
+
+
 	/**
 	 * Returns whether there is a presenter.
 	 */

src/Application/UI/Form.php

@@ -65,13 +65,22 @@ protected function validateParent(Nette\ComponentModel\IContainer $parent): void
 	final public function getPresenter(): ?Presenter
 	{
 		if (func_num_args()) {
-			trigger_error(__METHOD__ . '() parameter $throw is deprecated, use hasPresenter()', E_USER_DEPRECATED);
+			trigger_error(__METHOD__ . '() parameter $throw is deprecated, use getPresenterIfExists()', E_USER_DEPRECATED);
 			$throw = func_get_arg(0);
 		}
 		return $this->lookup(Presenter::class, $throw ?? true);
 	}
 
 
+	/**
+	 * Returns the presenter where this component belongs to.
+	 */
+	final public function getPresenterIfExists(): ?Presenter
+	{
+		return $this->lookup(Presenter::class, false);
+	}
+
+
 	/**
 	 * Returns whether there is a presenter.
 	 */

src/Application/UI/Presenter.php

@@ -157,6 +157,12 @@ final public function getPresenter(): self
 	}
 
 
+	final public function getPresenterIfExists(): self
+	{
+		return $this;
+	}
+
+
 	final public function hasPresenter(): bool
 	{
 		return true;

src/Bridges/ApplicationLatte/TemplateFactory.php

@@ -58,7 +58,7 @@ public function createTemplate(UI\Control $control = null): UI\ITemplate
 	{
 		$latte = $this->latteFactory->create();
 		$template = new $this->templateClass($latte);
-		$presenter = ($control && $control->hasPresenter()) ? $control->getPresenter() : null;
+		$presenter = $control ? $control->getPresenterIfExists() : null;
 
 		if ($latte->onCompile instanceof \Traversable) {
 			$latte->onCompile = iterator_to_array($latte->onCompile);

tests/Bridges.Latte/TemplateFactory.nonce.presenter.phpt

@@ -24,8 +24,7 @@ $response = Mockery::mock(Nette\Http\IResponse::class);
 $response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
 
 $presenter = Mockery::mock(UI\Presenter::class);
-$presenter->shouldReceive('hasPresenter')->andReturn(true);
-$presenter->shouldReceive('getPresenter')->andReturn($presenter);
+$presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn($response);
 $presenter->shouldIgnoreMissing();