mirror
/
fenom
mirror of https://github.com/fenom-template/fenom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add hook for loads modifiers and tags

This commit is contained in:
bzick 2013-07-24 19:37:07 +04:00
parent 33a2e685e3
commit d5dcfbe410
6 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,6 +1,11 @@
CHANGELOG
=========
## 1.2.0
- Feature #29: add {unset} tag
- Add hook for loading modifiers and tags
## 1.1.0
- Bug #19: Bug with "if" expressions starting with "("

60
src/Fenom.php
View File

@ -16,7 +16,7 @@ use Fenom\Template,
* @author Ivan Shalganov <a.cobest@gmail.com>
*/
class Fenom {
const VERSION = '1.1';
const VERSION = '1.2';
/* Actions */
const INLINE_COMPILER = 1;
@ -27,7 +27,7 @@ class Fenom {
/* Options */
const DENY_METHODS = 0x10;
const DENY_INLINE_FUNCS = 0x20;
const DENY_NATIVE_FUNCS = 0x20;
const FORCE_INCLUDE = 0x40;
const AUTO_RELOAD = 0x80;
const FORCE_COMPILE = 0x100;
@ -37,6 +37,9 @@ class Fenom {
const AUTO_TRIM = 0x1000; // reserved
const DENY_STATICS = 0x2000; // reserved
/* @deprecated */
const DENY_INLINE_FUNCS = 0x20;
/* Default parsers */
const DEFAULT_CLOSE_COMPILER = 'Fenom\Compiler::stdClose';
const DEFAULT_FUNC_PARSER = 'Fenom\Compiler::stdFuncParser';
@ -50,7 +53,7 @@ class Fenom {
*/
private static $_options_list = array(
"disable_methods" => self::DENY_METHODS,
"disable_native_funcs" => self::DENY_INLINE_FUNCS,
"disable_native_funcs" => self::DENY_NATIVE_FUNCS,
"disable_cache" => self::DISABLE_CACHE,
"force_compile" => self::FORCE_COMPILE,
"auto_reload" => self::AUTO_RELOAD,
@ -461,40 +464,69 @@ class Fenom {
/**
* Return modifier function
*
* @param $modifier
* @param string $modifier
* @param Fenom\Template $template
* @return mixed
* @throws \Exception
*/
public function getModifier($modifier) {
public function getModifier($modifier, Template $template = null) {
if(isset($this->_modifiers[$modifier])) {
return $this->_modifiers[$modifier];
} elseif($this->isAllowedFunction($modifier)) {
return $modifier;
} else {
throw new \Exception("Modifier $modifier not found");
return $this->_loadModifier($modifier, $template);
}
}
/**
* Return function
*
* @param string $modifier
* @param Fenom\Template $template
* @return bool
*/
protected function _loadModifier($modifier, $template) {
return false;
}
/**
* @param string $function
* @param Fenom\Template $template
* @return bool|string
* @deprecated
*/
public function getFunction($function, Template $template = null) {
return $this->getTag($function, $template);
}
/**
* Returns tag info
*
* @param string $tag
* @param Fenom\Template $template
* @return string|bool
*/
public function getFunction($function) {
if(isset($this->_actions[$function])) {
return $this->_actions[$function];
public function getTag($tag, Template $template = null) {
if(isset($this->_actions[$tag])) {
return $this->_actions[$tag];
} else {
return false;
return $this->_loadTag($tag, $template);
}
}
/**
* @param $tag
* @param Fenom\Template $template
* @return bool
*/
protected function _loadTag($tag, Template $template) {
return false;
}
/**
* @param string $function
* @return bool
*/
public function isAllowedFunction($function) {
if($this->_options & self::DENY_INLINE_FUNCS) {
if($this->_options & self::DENY_NATIVE_FUNCS) {
return isset($this->_allowed_funcs[$function]);
} else {
return is_callable($function);

2
src/Fenom/Compiler.php
View File

@ -879,7 +879,7 @@ class Compiler {
$tpl->escape = false;
if($tokens->is(':')) {
$func = $tokens->getNext(Tokenizer::MACRO_STRING);
$tag = $tpl->getStorage()->getFunction($func);
$tag = $tpl->getStorage()->getTag($func, $tpl);
if($tag["type"] == \Fenom::INLINE_FUNCTION) {
$code = $tpl->parseAct($tokens);
} elseif ($tag["type"] == \Fenom::BLOCK_FUNCTION) {

29
src/Fenom/Template.php
View File

@ -520,22 +520,22 @@ class Template extends Render {
return $this->parseMacro($tokens, $name);
}
if($act = $this->_fenom->getFunction($action)) { // call some function
switch($act["type"]) {
if($tag = $this->_fenom->getTag($action, $this)) { // call some function
switch($tag["type"]) {
case Fenom::BLOCK_COMPILER:
$scope = new Scope($action, $this, $this->_line, $act, count($this->_stack), $this->_body);
$scope = new Scope($action, $this, $this->_line, $tag, count($this->_stack), $this->_body);
$code = $scope->open($tokens);
if(!$scope->is_closed) {
array_push($this->_stack, $scope);
}
return $code;
case Fenom::INLINE_COMPILER:
return call_user_func($act["parser"], $tokens, $this);
return call_user_func($tag["parser"], $tokens, $this);
case Fenom::INLINE_FUNCTION:
return $this->out(call_user_func($act["parser"], $act["function"], $tokens, $this));
return $this->out(call_user_func($tag["parser"], $tag["function"], $tokens, $this));
case Fenom::BLOCK_FUNCTION:
$scope = new Scope($action, $this, $this->_line, $act, count($this->_stack), $this->_body);
$scope->setFuncName($act["function"]);
$scope = new Scope($action, $this, $this->_line, $tag, count($this->_stack), $this->_body);
$scope->setFuncName($tag["function"]);
array_push($this->_stack, $scope);
$scope->escape = $this->escape;
$this->escape = false;
@ -562,10 +562,10 @@ class Template extends Render {
*
* @static
* @param Tokenizer $tokens
* @param bool $required
* @throws \LogicException
* @throws UnexpectedTokenException
* @param bool $required
* @throws TokenizeException
* @throws UnexpectedTokenException
* @throws \Exception
* @return string
*/
public function parseExp(Tokenizer $tokens, $required = false) {
@ -625,6 +625,9 @@ class Template extends Render {
$_exp[] = $tokens->getAndNext();
} elseif($tokens->isNext("(") && !$tokens->getWhitespace()) {
$func = $this->_fenom->getModifier($tokens->current());
if(!$func) {
throw new \Exception("Function ".$tokens->getAndNext()." not found");
}
$tokens->next();
$func = $func.$this->parseArgs($tokens);
if($tokens->is('|')) {
@ -1063,8 +1066,10 @@ class Template extends Render {
*/
public function parseModifier(Tokenizer $tokens, $value) {
while($tokens->is("|")) {
$mods = $this->_fenom->getModifier( $modifier_name = $tokens->getNext(Tokenizer::MACRO_STRING) );
$mods = $this->_fenom->getModifier($tokens->getNext(Tokenizer::MACRO_STRING) );
if(!$mods) {
throw new \Exception("Modifier ".$tokens->current()." not found");
}
$tokens->next();
$args = array();

2
tests/autoload.php
View File

@ -9,6 +9,8 @@ define('FENOM_RESOURCES', __DIR__."/resources");
require_once FENOM_RESOURCES."/actions.php";
require_once __DIR__."/TestCase.php";
ini_set('date.timezone', 'Europe/Moscow');
function drop() {
call_user_func_array("var_dump", func_get_args());
$e = new Exception();

2
tests/cases/Fenom/TemplateTest.php
View File

@ -319,7 +319,7 @@ class TemplateTest extends TestCase {
array('Create: {var $v = --$a++} Result: {$v} end', 'Fenom\CompileException', "Can not use two increments and/or decrements for one variable"),
array('Create: {var $v = $a|upper++} Result: {$v} end', 'Fenom\CompileException', "Unexpected token '++'"),
array('Create: {var $v = max($a,2)++} Result: {$v} end', 'Fenom\CompileException', "Unexpected token '++'"),
array('Create: {var $v = max($a,2)} Result: {$v} end', 'Fenom\CompileException', "Modifier max not found", Fenom::DENY_INLINE_FUNCS),
array('Create: {var $v = max($a,2)} Result: {$v} end', 'Fenom\CompileException', "Function max not found", Fenom::DENY_NATIVE_FUNCS),
array('Create: {var $v = 4*} Result: {$v} end', 'Fenom\CompileException', "Unexpected token '*'"),
array('Create: {var $v = ""$a} Result: {$v} end', 'Fenom\CompileException', "Unexpected token '\$a'"),
array('Create: {var $v = [1,2} Result: {$v} end', 'Fenom\CompileException', "Unexpected end of expression"),