mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15 from klkvsk/fix-functions-args

Browse Source 
Fix for default arguments in custom template functions + tests
This commit is contained in:
Ivan Shalganov 2013-07-18 14:34:12 -07:00
commit ce8f0201cc
3 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fenom/Compiler.php
View File

@ -615,7 +615,7 @@ class Compiler {
} elseif(isset($params[ $param->getPosition() ])) {
$args[] = $params[ $param->getPosition() ];
} elseif($param->isOptional()) {
$args[] = $param->getDefaultValue();
$args[] = var_export($param->getDefaultValue(), true);
}
}
return "$function(".implode(", ", $args).')';

8
src/Fenom/Template.php
View File

@ -644,7 +644,11 @@ class Template extends Render {
} else {
break;
}
} else {
} elseif($tokens->is('[')) {
$_exp .= $this->parseArray($tokens);
} else {
break;
}
}
@ -1126,7 +1130,7 @@ class Template extends Render {
}
if($tokens->is("=")) {
$tokens->next();
$params[ $key ] = $this->parseExp($tokens);
$params[ $key ] = $this->parseExp($tokens);
} else {
$params[ $key ] = 'true';
}

70
tests/cases/Fenom/FunctionsTest.php Normal file
View File

@ -0,0 +1,70 @@
<?php
namespace Fenom;
class FunctionsTest extends TestCase {
const FUNCTION_ARGUMENT_CONSTANT = 1;
public static function functionSum($of = array()) {
return array_sum($of);
}
public static function functionPow($a, $n = 2) {
return pow($a, $n);
}
public static function functionInc($a, $i = self::FUNCTION_ARGUMENT_CONSTANT) {
return $a + $i;
}
public function setUp() {
parent::setUp();
$this->fenom->addFunctionSmart('sum', __CLASS__ . '::functionSum');
$this->fenom->addFunctionSmart('pow', __CLASS__ . '::functionPow');
$this->fenom->addFunctionSmart('inc', __CLASS__ . '::functionInc');
$this->tpl('function_params_scalar.tpl', '{pow a=2 n=3}');
$this->tpl('function_params_dynamic.tpl', '{pow a=$a n=$n}');
$this->tpl('function_default_param_scalar.tpl', '{pow a=2}');
$this->tpl('function_default_param_empty_array.tpl', '{sum}');
$this->tpl('function_default_param_const.tpl', '{inc a=1}');
$this->tpl('function_array_param.tpl', '{sum of=[1, 2, 3, 4, 5]}');
$this->tpl('function_array_param_pos.tpl', '{sum [1, 2, 3, 4, 5]}');
}
public function testFunctionWithParams() {
$output = $this->fenom->fetch('function_params_scalar.tpl');
$this->assertEquals('8', $output);
}
public function testFunctionWithDynamicParams() {
$output = $this->fenom->fetch('function_params_dynamic.tpl', array('a' => 3, 'n' => 4));
$this->assertEquals('81', $output);
}
public function testFunctionWithDefaultParamScalar() {
$output = $this->fenom->fetch('function_default_param_scalar.tpl');
$this->assertEquals('4', $output);
}
public function testFunctionWithDefaultParamArray() {
$output = $this->fenom->fetch('function_default_param_empty_array.tpl');
$this->assertEquals('0', $output);
}
public function testFunctionWithDefaultParamConst() {
$output = $this->fenom->fetch('function_default_param_const.tpl');
$this->assertEquals('2', $output);
}
public function testFunctionWithArrayNamedParam() {
$output = $this->fenom->fetch('function_array_param.tpl');
$this->assertEquals('15', $output);
}
public function testFunctionWithArrayPositionalParam() {
$output = $this->fenom->fetch('function_array_param_pos.tpl');
$this->assertEquals('15', $output);
}
}