Commit Graph

280 Commits

Author SHA1 Message Date
bzick
3be704590f Update docs 2013-07-23 11:33:21 +04:00
bzick
2537ae1716 Merge remote-tracking branch 'origin/master' 2013-07-23 11:32:38 +04:00
bzick
e37c8468eb Update docs and add tests 2013-07-23 11:32:31 +04:00
Ivan Shalganov
0afb87a783 Update benchmark.md 2013-07-22 18:54:41 +04:00
bzick
a5f83a59b8 Merge remote-tracking branch 'refs/remotes/origin/develop' 2013-07-22 18:44:51 +04:00
bzick
050523f249 Fix test operator for php 5.3 2013-07-22 18:36:48 +04:00
bzick
67e7ea0b9e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Conflicts:
	src/Fenom/Template.php
	tests/cases/Fenom/TemplateTest.php
2013-07-22 18:33:55 +04:00
bzick
e41cca72a2 Merge branch 'develop' 2013-07-22 18:08:01 +04:00
bzick
c4610a7778 Update to 1.1
Read CHANGELOG.md#1.1.0
2013-07-22 18:03:43 +04:00
bzick
a68a30bec5 Update docs 2013-07-20 21:28:29 +04:00
bzick
0b4d026050 Add isIterable modifier 2013-07-20 21:28:03 +04:00
bzick
ed8098604b Add support options for TestCas::exec 2013-07-20 21:27:31 +04:00
bzick
46f03c3bd2 Improve tokenizer 2013-07-20 21:26:02 +04:00
bzick
f6cc2d5993 Remove addTemplate method 2013-07-20 21:25:32 +04:00
bzick
53add7c30a Cleanup render object after display 2013-07-20 12:51:06 +04:00
Ivan Shalganov
ce8f0201cc Merge pull request #15 from klkvsk/fix-functions-args
Fix for default arguments in custom template functions + tests
2013-07-18 14:34:12 -07:00
Ivan Shalganov
175902bf6e Merge pull request #20 from litvinenkow/patch-1
Update Fenom.php. Fix: options as array doesn't work
2013-07-18 02:00:47 -07:00
litvinenkow
7e557df6ea Update Fenom.php
по-моему со строчки 733 нужно исправить вот так, то когда параметры задаешь массивом, ошибка вываливается
да и с маской тоже не особо работает
2013-07-18 01:46:57 -07:00
bzick
617fc7324c Improve providers. Renders now use bulk checks via ::verify 2013-07-13 12:00:19 +04:00
Ivan Shalganov
a0d84812af Merge pull request #18 from klkvsk/fix-unary-before-brackets
Fix for unary operator ("!", "-", "~") before brackets in expression.
2013-07-12 02:44:02 -07:00
klkvsk
ceedbd3372 fix for expressions like "{if (!($a || $b))}" (were failing to compile), tests added 2013-07-12 12:05:37 +04:00
klkvsk
a2b5b43cb1 proper fix for array params (now works with both positional and named params), tests 2013-07-11 16:13:11 +04:00
klkvsk
eb1fa83174 add tests for custom functions in template 2013-07-11 14:14:34 +04:00
klkvsk
803fd670cd fix use var_export for default params in function (nulls and empty arrays broke templates) 2013-07-11 14:13:40 +04:00
klkvsk
d307c808a0 fix parsing of array param in function (was falling in endless loop) 2013-07-11 14:09:16 +04:00
Ivan Shalganov
3583a2cdfd Merge pull request #12 from sectus/refactoring
Refactoring Fenom\Template::compile: Removed goto, Fix bug with ignoring
2013-07-08 04:15:18 -07:00
Sergey Beresnev
748ef29a1d Refactoring Fenom\Template::compile: Removed goto, $from
Fixed issues with templates
    '{if 0}none{/if} literal: {  $a}{$a}{  $a} end'
    '{* '
2013-07-08 12:43:20 +09:00
bzick
41652ea48b Merge remote-tracking branch 'origin/master' 2013-07-07 11:29:55 +04:00
bzick
0bb82d9898 Fix escaping 2013-07-07 11:29:26 +04:00
Ivan Shalganov
22e388ec60 Update settings.md 2013-07-07 02:00:02 +04:00
Ivan Shalganov
b6bd77fd6d Update articles.md 2013-07-07 01:46:09 +04:00
bzick
733bae6ac0 Update docs 2013-07-07 01:41:53 +04:00
bzick
87662f83a1 Merge remote-tracking branch 'origin/master'
Conflicts:
	docs/tags/capture.md
	src/Fenom.php
2013-07-07 01:36:24 +04:00
bzick
6e011b1a44 Update docs 2013-07-07 01:34:37 +04:00
bzick
968671d8a7 Add tests for auto escaping 2013-07-07 01:34:19 +04:00
bzick
42b71ed644 Add {autoescape} block tag and {raw} inline pseudo tag. Improve auto escaping 2013-07-07 01:29:33 +04:00
bzick
b99b874d38 Remove |raw modifier. It is not good idea. Need tag {raw <expr>} 2013-07-06 14:09:49 +04:00
bzick
3d0475e95c Add |raw modifier support 2013-07-06 14:03:05 +04:00
Ivan Shalganov
0c961ce248 Merge pull request #9 from pborreli/typos
Fixed typos
2013-07-05 03:11:27 -07:00
Pascal Borreli
4130a4c7dd Fixed typos 2013-07-04 21:02:24 +01:00
Ivan Shalganov
68b892703d Merge pull request #8 from hell0w0rd/tokenizer-misprint
[Tokenizer] remove T_UNSET repeating
2013-07-04 06:38:32 -07:00
Nikita
704b930126 remove T_UNSET repeating 2013-07-04 15:35:51 +04:00
bzick
404ee7a819 Fix: static modifier doesn't insert as is 2013-07-04 10:56:21 +04:00
bzick
728e78c46d Merge remote-tracking branch 'origin/master' 2013-07-04 10:38:23 +04:00
bzick
eea3391c7d Fix: static modifier doesn't insert as is 2013-07-04 10:37:14 +04:00
Ivan Shalganov
a10808d1f3 Update usage.md 2013-07-04 09:57:07 +04:00
Ivan Shalganov
ec1dba923c Update authors.md 2013-07-04 01:48:54 +04:00
Ivan Shalganov
965bb08272 Update CHANGELOG.md 2013-07-04 01:48:25 +04:00
Ivan Shalganov
125908d0cf Update benchmark result 2013-07-04 01:45:12 +04:00
Ivan Shalganov
c439ef9345 Update extends.md 2013-07-04 01:31:47 +04:00