Latte: removed usage of provider 'uiPresenter'

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -115,8 +115,8 @@ public function macroLink(MacroNode $node, PhpWriter $writer)
 	{
 		$node->modifiers = preg_replace('#\|safeurl\s*(?=\||\z)#i', '', $node->modifiers);
 		return $writer->using($node)
-			->write('echo %escape(%modify('
-				. ($node->name === 'plink' ? '$this->global->uiPresenter' : '$this->global->uiControl')
+			->write('echo %escape(%modify($this->global->uiControl'
+				. ($node->name === 'plink' ? '->getPresenter()' : '')
 				. '->link(%node.word, %node.array?)))'
 			);
 	}
@@ -131,8 +131,8 @@ public function macroIfCurrent(MacroNode $node, PhpWriter $writer)
 			throw new CompileException('Modifiers are not allowed in ' . $node->getNotation());
 		}
 		return $writer->write($node->args
-			? 'if ($this->global->uiPresenter->isLinkCurrent(%node.word, %node.array?)) {'
-			: 'if ($this->global->uiPresenter->getLastCreatedRequestFlag("current")) {'
+			? 'if ($this->global->uiControl->getPresenter()->isLinkCurrent(%node.word, %node.array?)) {'
+			: 'if ($this->global->uiControl->getPresenter()->getLastCreatedRequestFlag("current")) {'
 		);
 	}
 
@@ -145,6 +145,6 @@ public function macroExtends(MacroNode $node, PhpWriter $writer)
 		if ($node->modifiers || $node->parentNode || $node->args !== 'auto') {
 			return $this->extends = false;
 		}
-		$this->extends = $writer->write('$this->parentName = $this->global->uiPresenter->findLayoutTemplateFile();');
+		$this->extends = $writer->write('$this->parentName = $this->global->uiControl->getPresenter()->findLayoutTemplateFile();');
 	}
 }

tests/Bridges.Latte/Template.getParentName().phpt

@@ -11,6 +11,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $presenter = Mockery::mock(Nette\Application\UI\Presenter::class)
 	->shouldReceive('findLayoutTemplateFile')->andReturn('layout.latte')
+	->shouldReceive('getPresenter')->andReturnSelf()
 	->mock();
 
 $latte = new Latte\Engine;
@@ -49,7 +50,7 @@ $template = $latte->createTemplate('{extends none}');
 $template->prepare();
 Assert::null($template->getParentName());
 
-$latte->addProvider('uiPresenter', $presenter);
+$latte->addProvider('uiControl', $presenter);
 $template = $latte->createTemplate('{extends auto}');
 $template->prepare();
 Assert::same('layout.latte', $template->getParentName());

tests/Bridges.Latte/UIMacros.link.2.phpt

@@ -23,6 +23,12 @@ class MockControl
 		array_unshift($args, $destination);
 		return 'link:' . strtr(json_encode($args), '"', "'");
 	}
+
+
+	public function getPresenter()
+	{
+		return new MockPresenter;
+	}
 }
 
 
@@ -50,7 +56,6 @@ $latte->setLoader(new Latte\Loaders\StringLoader);
 UIMacros::install($latte->getCompiler());
 
 $latte->addProvider('uiControl', new MockControl);
-$latte->addProvider('uiPresenter', new MockPresenter);
 $params['action'] = 'login';
 $params['arr'] = ['link' => 'login', 'param' => 123];
 

tests/Bridges.Latte/UIMacros.renderSnippets.phpt

@@ -19,7 +19,6 @@ class InnerControl extends Nette\Application\UI\Control
 	{
 		$latte = new Latte\Engine;
 		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
 		$latte->addProvider('uiControl', $this);
 		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
 		$params['say'] = 'Hello';

tests/Bridges.Latte/UIMacros.renderSnippets2.phpt

@@ -28,7 +28,6 @@ class InnerControl extends Nette\Application\UI\Control
 		$latte = new Latte\Engine;
 		$latte->setLoader(new Latte\Loaders\StringLoader);
 		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
 		$latte->addProvider('uiControl', $this);
 		$latte->addProvider('snippetBridge', new SnippetBridge($this));
 		$params['say'] = 'Hello';
@@ -41,7 +40,6 @@ class InnerControl extends Nette\Application\UI\Control
 		$latte = new Latte\Engine;
 		$latte->setLoader(new Latte\Loaders\StringLoader);
 		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
 		$latte->addProvider('uiControl', $this);
 		$latte->addProvider('snippetBridge', new SnippetBridge($this));
 		$params['say'] = 'world';

tests/Bridges.Latte/UIMacros.renderSnippets3.phpt

@@ -20,7 +20,6 @@ class TestControl extends Nette\Application\UI\Control
 		$latte = new Latte\Engine;
 		$latte->setLoader(new Latte\Loaders\StringLoader);
 		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
 		$latte->addProvider('uiControl', $this);
 		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
 		$latte->render('{snippet foo}hello{/snippet}');