Skip to content

Commit

Permalink
used typehint callable
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed Jul 3, 2015
1 parent d07d7b3 commit e99c066
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
3 changes: 1 addition & 2 deletions src/Application/MicroPresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,9 @@ public function run(Application\Request $request)
/**
* Template factory.
* @param string
* @param callable
* @return Application\UI\ITemplate
*/
public function createTemplate($class = NULL, $latteFactory = NULL)
public function createTemplate($class = NULL, callable $latteFactory = NULL)
{
$latte = $latteFactory ? $latteFactory() : $this->getContext()->getByType('Nette\Bridges\ApplicationLatte\ILatteFactory')->create();
$template = $class ? new $class : new Nette\Bridges\ApplicationLatte\Template($latte);
Expand Down
2 changes: 1 addition & 1 deletion src/Application/PresenterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class PresenterFactory extends Nette\Object implements IPresenterFactory
/**
* @param callable function (string $class): IPresenter
*/
public function __construct($factory = NULL)
public function __construct(callable $factory = NULL)
{
$this->factory = $factory ?: function ($class) { return new $class; };
}
Expand Down
7 changes: 2 additions & 5 deletions src/Application/UI/Multiplier.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@ class Multiplier extends PresenterComponent
private $factory;


/**
* @param callable
*/
public function __construct($factory)
public function __construct(callable $factory)
{
parent::__construct();
$this->factory = Nette\Utils\Callback::check($factory);
$this->factory = $factory;
}


Expand Down
4 changes: 1 addition & 3 deletions src/Bridges/ApplicationDI/LatteExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,8 @@ public function loadConfiguration()
* @param callable
* @return void
*/
public function addMacro($macro)
public function addMacro(callable $macro)
{
Nette\Utils\Validators::assert($macro, 'callable');

$container = $this->getContainerBuilder();
$container->getDefinition($this->prefix('latteFactory'))
->addSetup('?->onCompile[] = function ($engine) { ' . $macro . '($engine->getCompiler()); }', ['@self']);
Expand Down

0 comments on commit e99c066

Please sign in to comment.