Engine: single block rendering does not abuse params

Author: dg

src/Latte/Engine.php

@@ -77,8 +77,8 @@ public function __construct()
 	 */
 	public function render(string $name, $params = [], string $block = null): void
 	{
-		$this->createTemplate($name, (array) $params + ($block ? ['_renderblock' => $block] : []))
-			->render();
+		$this->createTemplate($name, (array) $params)
+			->render($block);
 	}
 
 
@@ -88,8 +88,8 @@ public function render(string $name, $params = [], string $block = null): void
 	 */
 	public function renderToString(string $name, $params = [], string $block = null): string
 	{
-		$template = $this->createTemplate($name, (array) $params + ($block ? ['_renderblock' => $block] : []));
-		return $template->capture([$template, 'render']);
+		$template = $this->createTemplate($name, (array) $params);
+		return $template->capture(function () use ($template, $block) { $template->render($block); });
 	}
 
 

src/Latte/Runtime/Template.php

@@ -132,7 +132,7 @@ public function getReferenceType(): ?string
 	 * Renders template.
 	 * @internal
 	 */
-	public function render(): void
+	public function render(string $block = null): void
 	{
 		$this->prepare();
 
@@ -154,14 +154,14 @@ public function render(): void
 			ob_start(function () {});
 			$params = $this->main();
 			ob_end_clean();
-			$this->createTemplate($this->parentName, $params, 'extends')->render();
+			$this->createTemplate($this->parentName, $params, 'extends')->render($block);
 			return;
 
-		} elseif (!empty($this->params['_renderblock'])) { // single block rendering
+		} elseif ($block !== null) { // single block rendering
 			$tmp = $this;
 			while (in_array($this->referenceType, ['extends', null], true) && ($tmp = $tmp->referringTemplate));
 			if (!$tmp) {
-				$this->renderBlock($this->params['_renderblock'], $this->params);
+				$this->renderBlock($block, $this->params);
 				return;
 			}
 		}