LatteExtension: added support for macro factories defined as DI services

Author: hrach

src/Bridges/ApplicationDI/LatteExtension.php

@@ -57,9 +57,6 @@ public function loadConfiguration()
 			->setFactory(Nette\Bridges\ApplicationLatte\TemplateFactory::class);
 
 		foreach ($config['macros'] as $macro) {
-			if (strpos($macro, '::') === FALSE && class_exists($macro)) {
-				$macro .= '::install';
-			}
 			$this->addMacro($macro);
 		}
 
@@ -71,14 +68,28 @@ public function loadConfiguration()
 
 
 	/**
-	 * @param  callable
+	 * @param  string
 	 * @return void
 	 */
-	public function addMacro(callable $macro)
+	public function addMacro($macro)
 	{
 		$builder = $this->getContainerBuilder();
-		$builder->getDefinition($this->prefix('latteFactory'))
-			->addSetup('?->onCompile[] = function ($engine) { ' . $macro . '($engine->getCompiler()); }', ['@self']);
+		$definition = $builder->getDefinition($this->prefix('latteFactory'));
+
+		if (isset($macro[0]) && $macro[0] === '@') {
+			if (strpos($macro, '::') === FALSE) {
+				$method = 'install';
+			} else {
+				list($macro, $method) = explode('::', $macro);
+			}
+			$definition->addSetup('?->onCompile[] = function ($engine) { ?->' . $method . '($engine->getCompiler()); }', ['@self', $macro]);
+
+		} else {
+			if (strpos($macro, '::') === FALSE && class_exists($macro)) {
+				$macro .= '::install';
+			}
+			$definition->addSetup('?->onCompile[] = function ($engine) { ' . $macro . '($engine->getCompiler()); }', ['@self']);
+		}
 	}
 
 }

tests/Bridges.DI/LatteExtension.basic.phpt

@@ -50,6 +50,36 @@ class FooMacros extends Latte\Macros\MacroSet
 }
 
 
+class NonStaticMacrosFactory
+{
+
+	/** @var string */
+	private $parameter;
+
+
+	public function __construct($parameter)
+	{
+		$this->parameter = $parameter;
+	}
+
+
+	public function install(Latte\Compiler $compiler)
+	{
+		$macros = new Latte\Macros\MacroSet($compiler);
+		$macros->addMacro('foo', 'foo ' . $this->parameter);
+		Notes::add(get_class($this) . '::install');
+	}
+
+
+	public function create(Latte\Compiler $compiler)
+	{
+		$macros = new Latte\Macros\MacroSet($compiler);
+		$macros->addMacro('foo2', 'foo ' . $this->parameter);
+		Notes::add(get_class($this) . '::create');
+	}
+}
+
+
 class AnotherExtension extends Nette\DI\CompilerExtension
 {
 
@@ -69,6 +99,11 @@ latte:
 	macros:
 		- LoremIpsumMacros
 		- IpsumLoremMacros::install
+		- @macroFactory
+		- @macroFactory::create
+
+services:
+	macroFactory: NonStaticMacrosFactory(foo)
 ', 'neon'));
 
 $compiler = new DI\Compiler;
@@ -86,5 +121,7 @@ $container->getService('nette.latteFactory')->create()->setLoader(new Latte\Load
 Assert::same([
 	'LoremIpsumMacros',
 	'IpsumLoremMacros',
+	'NonStaticMacrosFactory::install',
+	'NonStaticMacrosFactory::create',
 	'FooMacros',
 ], Notes::fetch());