Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Bridges/ApplicationDI/LatteExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class LatteExtension extends Nette\DI\CompilerExtension
public $defaults = [
'xhtml' => FALSE,
'macros' => [],
'templateClass' => NULL
];

/** @var bool */
Expand Down Expand Up @@ -52,9 +53,12 @@ public function loadConfiguration()
->addSetup('Nette\Utils\Html::$xhtml = ?', [(bool) $config['xhtml']])
->setImplement(Nette\Bridges\ApplicationLatte\ILatteFactory::class);

$builder->addDefinition($this->prefix('templateFactory'))
$templateFactory = $builder->addDefinition($this->prefix('templateFactory'))
->setClass(Nette\Application\UI\ITemplateFactory::class)
->setFactory(Nette\Bridges\ApplicationLatte\TemplateFactory::class);
if ($config['templateClass'] !== NULL) {
$templateFactory->addSetup('?->setTemplateClass(?)', ['@self', $config['templateClass']]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not simply $templateFactory->addSetup('setTemplateClass', [$config['templateClass']]);?

}

foreach ($config['macros'] as $macro) {
if (strpos($macro, '::') === FALSE && class_exists($macro)) {
Expand Down
13 changes: 12 additions & 1 deletion src/Bridges/ApplicationLatte/TemplateFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class TemplateFactory implements UI\ITemplateFactory
/** @var Nette\Caching\IStorage */
private $cacheStorage;

/** @var string */
private $templateClass = Template::class;


public function __construct(ILatteFactory $latteFactory, Nette\Http\IRequest $httpRequest = NULL,
Nette\Security\User $user = NULL, Nette\Caching\IStorage $cacheStorage = NULL)
Expand All @@ -48,7 +51,7 @@ public function __construct(ILatteFactory $latteFactory, Nette\Http\IRequest $ht
public function createTemplate(UI\Control $control = NULL)
{
$latte = $this->latteFactory->create();
$template = new Template($latte);
$template = new $this->templateClass($latte);
$presenter = $control ? $control->getPresenter(FALSE) : NULL;

if ($control instanceof UI\Presenter) {
Expand Down Expand Up @@ -112,4 +115,12 @@ public function createTemplate(UI\Control $control = NULL)
return $template;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing empty line

public function setTemplateClass($templateClass)
{
if (!class_exists($templateClass) || !is_a($templateClass, Template::class, TRUE)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO is_a(..., ..., TRUE) triggers autoloader. Otherwise it is PHP bug.

throw new Nette\InvalidArgumentException("Class $templateClass does not extend " . Template::class . ' or it does not exist.');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

without it

}
$this->templateClass = $templateClass;
}

}
73 changes: 73 additions & 0 deletions tests/Bridges.Latte/TemplateFactory.customTemplate.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?php

/**
* Test: TemplateFactory custom template
*/

use Nette\Application\UI;
use Nette\Bridges\ApplicationLatte\Template;
use Nette\Bridges\ApplicationLatte\TemplateFactory;
use Tester\Assert;


require __DIR__ . '/../bootstrap.php';


class LatteFactoryMock implements Nette\Bridges\ApplicationLatte\ILatteFactory
{
private $engine;

public function __construct(Latte\Engine $engine)
{
$this->engine = $engine;
}

public function create()
{
return $this->engine;
}
}

class TemplateMockWithoutImplement
{

}

class TemplateMock extends Nette\Bridges\ApplicationLatte\Template
{
private $file = 'ko';

public function render()
{
return strrev($this->file);
}

public function setFile($file)
{
$this->file = $file;
}

public function getFile()
{
return $this->file;
}
}


$factory = new TemplateFactory(new LatteFactoryMock(new Latte\Engine));
Assert::type(Template::class, $factory->createTemplate());


Assert::exception(function () use ($factory) {
$factory->setTemplateClass(TemplateMockWithoutImplement::class);
}, \Nette\InvalidArgumentException::class, 'Class TemplateMockWithoutImplement does not extend Nette\Bridges\ApplicationLatte\Template or it does not exist.');


$factory->setTemplateClass(TemplateMock::class);
$template = $factory->createTemplate();
Assert::type(TemplateMock::class, $template);
Assert::type(UI\ITemplate::class, $template);
Assert::same([], $template->flashes);
Assert::same('ok', $template->render());
$template->setFile('bla');
Assert::same('alb', $template->render());

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome test, thank you.