Merge branch 'honzavaclavik-master' into 'master'

Close PR #40

src/Traits/TComponent.php

@@ -34,13 +34,13 @@ protected function attachToPresenter(IComponent $component, $name = NULL)
 		$this->__testbench_presenterMock->run(new Mocks\ApplicationRequestMock);
 	}
 
-	protected function checkRenderOutput(IComponent $control, $expected)
+	protected function checkRenderOutput(IComponent $control, $expected, array $renderParameters = [])
 	{
 		if (!$control->getParent()) {
 			$this->attachToPresenter($control);
 		}
 		ob_start();
-		$control->render();
+		$control->render(...$renderParameters);
 		if (is_file($expected)) {
 			\Tester\Assert::matchFile($expected, ob_get_clean());
 		} else {

tests/Traits/TComponentTest.phpt

@@ -31,6 +31,27 @@ class TComponentTest extends \Tester\TestCase
 		$this->checkRenderOutput($control, __DIR__ . '/Component.expected');
 	}
 
+	/**
+	 * @see vendor/nette/application/tests/Bridges.Latte/UIMacros.control.2.phpt
+	 */
+	public function testRenderWithParametersNetteCompatibility() {
+		$latte = new \Latte\Engine;
+		$latte->setLoader(new \Latte\Loaders\StringLoader);
+		\Nette\Bridges\ApplicationLatte\UIMacros::install($latte->getCompiler());
+		$latte->addProvider('uiControl', new \ComponentWithParameters);
+
+		Assert::same('["var1"]', $latte->renderToString('{control cwp var1}'));
+		Assert::same('["var1",1,2]', $latte->renderToString('{control cwp var1, 1, 2}'));
+		Assert::same('[{"var1":5,"0":1,"1":2}]', $latte->renderToString('{control cwp var1 => 5, 1, 2}'));
+	}
+
+	public function testRenderWithParameters()
+	{
+		$control = new \ComponentWithParameters;
+		$this->checkRenderOutput($control, '[1]', [1]);
+		$this->checkRenderOutput($control, '[1,"2"]', [1, '2']);
+	}
+
 	public function testRenderWithExplicitAttach()
 	{
 		$this->attachToPresenter($control = new \Component);

tests/_helpers/components/ComponentWithParameters.php

@@ -0,0 +1,16 @@
+<?php
+
+class ComponentWithParameters extends \Nette\Application\UI\Control
+{
+
+	public function render($parameterOne, $parameterTwo = NULL)
+	{
+		echo json_encode(func_get_args(), JSON_OBJECT_AS_ARRAY);
+	}
+
+	public function getComponent($name, $need = TRUE)
+	{
+		return new self;
+	}
+
+}