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

Improve #41

Browse Source
This commit is contained in:
bzick
2013-08-12 20:14:35 +04:00
parent 982b284f60
commit 25975a6782
4 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Fenom/Compiler.php
View File

@@ -33,14 +33,6 @@ class Compiler
public static function tagInclude(Tokenizer $tokens, Template $tpl)
{
$name = false;
// if($tokens->is('[')) {
// $tokens->next();
// if(!$name && $tokens->is(T_CONSTANT_ENCAPSED_STRING)) {
// if($tpl->getStorage()->templateExists($_name = substr($tokens->getAndNext(), 1, -1))) {
// $name = $_name;
// }
// }
// }
$cname = $tpl->parsePlainArg($tokens, $name);
$p = $tpl->parseParams($tokens);
if ($p) { // if we have additionally variables
@@ -706,7 +698,7 @@ class Compiler
*/
public static function varOpen(Tokenizer $tokens, Scope $scope)
{
$var = $scope->tpl->parseVariable($tokens, Template::DENY_MODS);
$var = $scope->tpl->parseVar($tokens);
if ($tokens->is('=')) { // inline tag {var ...}
$scope->is_closed = true;
$tokens->next();

18
src/Fenom/Render.php
View File

@@ -235,4 +235,22 @@ class Render extends \ArrayObject
{
throw new \BadMethodCallException("Unknown method " . $method);
}
public function __get($name)
{
if($name == 'info') {
return array(
'name' => $this->_name,
'schema' => $this->_scm,
'time' => $this->_time
);
} else {
return null;
}
}
public function __isset($name)
{
return $name == 'info';
}
}

19
src/Fenom/Template.php
View File

@@ -918,15 +918,16 @@ class Template extends Render
{
$is_var = false;
$vars = array(
'get' => '$_GET',
'post' => '$_POST',
'get' => '$_GET',
'post' => '$_POST',
'session' => '$_SESSION',
'cookie' => '$_COOKIE',
'cookie' => '$_COOKIE',
'request' => '$_REQUEST',
'files' => '$_FILES',
'files' => '$_FILES',
'globals' => '$GLOBALS',
'server' => '$_SERVER',
'env' => '$_ENV',
'server' => '$_SERVER',
'env' => '$_ENV',
'tpl' => '$tpl->info'
);
if ($this->_options & Fenom::DENY_ACCESSOR) {
throw new \LogicException("Accessor are disabled");
@@ -948,12 +949,6 @@ class Template extends Render
case 'version':
$var = '\Fenom::VERSION';
break;
case 'tpl':
$var = '$tpl->getName()';
break;
case 'schema':
$var = '$tpl->getScm()';
break;
default:
throw new UnexpectedTokenException($tokens);
}