Commit Graph

654 Commits

Author SHA1 Message Date
bzick
997282f90a Merge master into develop 2013-08-05 19:24:58 +04:00
bzick
c7a90789de Done #28 2013-08-05 13:07:16 +04:00
bzick
09f952686b Add string concatenation (#3) 2013-08-03 18:56:17 +04:00
bzick
1e7cf29290 Tests++ 2013-08-02 23:30:44 +04:00
bzick
43925ae640 Fix ternary operator 2013-08-02 23:01:06 +04:00
bzick
e51eb9f3d8 Format code 2013-08-02 21:50:04 +04:00
bzick
c27df81545 Split parseExp (for #3) 2013-08-02 20:29:18 +04:00
bzick
f1d252a3cc Add filters for templates (#30) 2013-08-01 01:05:19 +04:00
Ivan Shalganov
6468862df3 Merge pull request #36 from klkvsk/fix-parseExp-array
Fix parseExp parsing arrays
2013-07-30 04:25:14 -07:00
klkvsk
95a41ac169 fix parseExp parsing arrays 2013-07-30 15:05:03 +04:00
bzick
e68f3dd99a Disable sandbox 2013-07-29 16:32:54 +04:00
bzick
e9b7951d7a One file - one class (#24) 2013-07-29 16:15:52 +04:00
bzick
3674de41cb To PSR-x format 2013-07-29 14:58:14 +04:00
bzick
4edd0e1708 Add recursive macros support (#28) 2013-07-29 14:53:21 +04:00
Ivan Shalganov
b0ecde05f7 Update README.md 2013-07-29 12:53:57 +04:00
bzick
97e891895a Add ::before() 2013-07-26 10:40:07 +04:00
bzick
2a64bdb1fc Add replacing of parsers 2013-07-25 02:05:44 +04:00
bzick
bd69bbd86a Fix getModifier arguments in parsers 2013-07-24 20:56:28 +04:00
bzick
d977c86116 Fix loader hint 2013-07-24 20:09:14 +04:00
bzick
d5dcfbe410 Add hook for loads modifiers and tags 2013-07-24 19:37:07 +04:00
bzick
33a2e685e3 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2013-07-24 16:16:25 +04:00
bzick
8030c12923 Add {unset …} (#29) 2013-07-24 16:16:20 +04:00
bzick
a1b6f5765b Uf, change pipe's arguments 2013-07-24 00:26:39 +04:00
bzick
fb9b0af3b2 Add adapters list 2013-07-23 12:32:06 +04:00
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