added macro {php} as a future replacement for {?}

src/Latte/Macros/CoreMacros.php

@@ -79,6 +79,7 @@ public static function install(Latte\Compiler $compiler)
 		$me->addMacro('use', array($me, 'macroUse'));
 		$me->addMacro('contentType', array($me, 'macroContentType'));
 		$me->addMacro('status', array($me, 'macroStatus'));
+		$me->addMacro('php', array($me, 'macroExpr'));
 
 		$me->addMacro('class', NULL, NULL, array($me, 'macroClass'));
 		$me->addMacro('attr', NULL, NULL, array($me, 'macroAttr'));
@@ -374,7 +375,7 @@ public function macroVar(MacroNode $node, PhpWriter $writer)
 	 */
 	public function macroExpr(MacroNode $node, PhpWriter $writer)
 	{
-		return $writer->write(($node->name === '?' ? '' : 'echo ') . '%modify(%node.args)');
+		return $writer->write(($node->name === '=' ? 'echo ' : '') . '%modify(%node.args)');
 	}
 
 

tests/Latte/macros.php.phpt

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Test: Latte\Engine: {php}
+ */
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+
+Assert::match('%A%
+<?php $a = \'test\' ? array() : NULL ;
+', $latte->compile('
+{php}
+{php $a = test ? []}
+'));
+
+Assert::match('%A%
+<?php $a = \'test\' ? array() : NULL ;
+', $latte->compile('
+{?}
+{? $a = test ? []}
+'));