Commit Graph

119 Commits

Author SHA1 Message Date
Ivan Shalganov
19e0898da6 Merge branch 'origin/master'
Conflicts:
	CHANGELOG.md
2014-01-08 01:10:18 +04:00
evseevnn
cd8e8a1bb4 Проверка на строку не нужна
В регулярном выражении нет необходимости указывать "^", так как .* заякоривается автоматом.
2013-12-21 15:19:20 +03:00
Ivan Shalganov
1ce0315282 1.4.8 2013-12-01 19:30:09 +04:00
Ivan Shalganov
6fec661ea7 Add tag filter. Move benchmark to another project 2013-10-08 17:48:23 +04:00
Ivan Shalganov
58c8f450b8 Fixes 2013-09-21 23:24:22 +04:00
Ivan Shalganov
5770c5aea9 Disable problem code. Add more tests 2013-09-19 23:10:19 +04:00
Ivan Shalganov
dcb91775ca Merge branch 'origin/master'
Conflicts:
	src/Fenom/Compiler.php
	src/Fenom/Template.php
	tests/cases/Fenom/TemplateTest.php
	tests/cases/Fenom/TokenizerTest.php
	tests/cases/FenomTest.php
2013-09-15 16:39:29 +04:00
Ivan Shalganov
f9d9f098b7 Remove {unser} and add tests 2013-09-15 16:05:18 +04:00
bzick
7c038e0ba9 Fix tests 2013-09-14 19:55:53 +04:00
Ivan Shalganov
2fc84c226e Add tests 2013-09-14 11:24:23 +04:00
Ivan Shalganov
1428c86cac Rollback phpunit to require-dev 2013-09-13 21:19:51 +04:00
Ivan Shalganov
82631f54c1 Fix: intersect the names of temporary variables during force include 2013-09-10 16:20:48 +04:00
bzick
56b7fe8bb0 Fix error message 2013-09-06 15:57:28 +04:00
bzick
d2d54a831a 1.4.2 2013-09-06 15:56:37 +04:00
bzick
d768637eb7 Update docs 2013-09-05 04:24:14 +04:00
bzick
d5ecc1bc20 Fix {switch} and ternary operator 2013-09-05 03:35:02 +04:00
bzick
0a9facc493 Done 1.4.0 2013-09-02 17:40:58 +04:00
bzick
eef42150b2 1.3.1 2013-08-29 11:29:34 +04:00
bzick
270f90792a Disable buggy trim 2013-08-23 01:06:47 +04:00
bzick
ecc842cc04 Fix AUTO_RELOAD option 2013-08-23 00:55:53 +04:00
bzick
0139593d45 Remove debugs 2013-08-22 10:35:43 +04:00
bzick
cb803f5d9c Add 'how it work' 2013-08-22 00:03:20 +04:00
bzick
25975a6782 Improve #41 2013-08-12 20:14:35 +04:00
bzick
982b284f60 Fix #41, optimize variable parser 2013-08-11 19:55:30 +04:00
litvinenkow
5e6ee659e6 Update Fenom.php
Блин, мужик, ну исправь это уже))
2013-08-06 23:21:03 -07:00
bzick
081e30e744 Fix #39 2013-08-06 12:04:23 +04:00
bzick
7fb82bd13a Remove trash 2013-08-05 19:38:31 +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
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
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
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
e37c8468eb Update docs and add tests 2013-07-23 11:32:31 +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
c4610a7778 Update to 1.1
Read CHANGELOG.md#1.1.0
2013-07-22 18:03:43 +04:00
bzick
0b4d026050 Add isIterable modifier 2013-07-20 21:28:03 +04:00
bzick
46f03c3bd2 Improve tokenizer 2013-07-20 21:26:02 +04:00