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 branch 'origin/master'

Browse Source 
Conflicts:
	CHANGELOG.md
This commit is contained in:
Ivan Shalganov
2014-01-08 01:10:18 +04:00
parent 6fec661ea7 8b3dd4c8a7
commit 19e0898da6
6 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fenom/Modifier.php
View File

@@ -25,7 +25,7 @@ class Modifier
*/
public static function dateFormat($date, $format = "%b %e, %Y")
{
if (is_string($date) && !is_numeric($date)) {
if (!is_numeric($date)) {
$date = strtotime($date);
if (!$date) $date = time();
}
@@ -39,7 +39,7 @@ class Modifier
*/
public static function date($date, $format = "Y m d")
{
if (is_string($date) && !is_numeric($date)) {
if (!is_numeric($date)) {
$date = strtotime($date);
if (!$date) $date = time();
}
@@ -100,7 +100,7 @@ class Modifier
if (preg_match('#^(.{' . $length . '}).*?(.{' . $length . '})?$#usS', $string, $match)) {
if (count($match) == 3) {
if ($by_words) {
return preg_replace('#\s.*$#usS', "", $match[1]) . $etc . preg_replace('#^.*\s#usS', "", $match[2]);
return preg_replace('#\s.*$#usS', "", $match[1]) . $etc . preg_replace('#.*\s#usS', "", $match[2]);
} else {
return $match[1] . $etc . $match[2];
}

9
src/Fenom/Template.php
View File

@@ -732,7 +732,14 @@ class Template extends Render
if ($this->_options & Fenom::DENY_METHODS) {
throw new \LogicException("Forbidden to call methods");
}
$code .= $this->parseArgs($tokens);
do { // parse call-chunks: $var->func()->func()->prop->func()->...
if($tokens->is('(')) {
$code .= $this->parseArgs($tokens);
}
if($tokens->is(T_OBJECT_OPERATOR) && $tokens->isNext(T_STRING)) {
$code .= '->'.$tokens->next()->getAndNext();
}
} while($tokens->is('(', T_OBJECT_OPERATOR));
} elseif ($tokens->is(Tokenizer::MACRO_INCDEC)) {
$code .= $tokens->getAndNext();
} else {