Commit Graph

186 Commits

Author SHA1 Message Date
Ivan Shalganov
1437a13bd1 Add tag entry 2014-04-12 01:00:58 +04:00
Ivan Shalganov
11ae49f187 Macro accept arguments as variables (starts from $) 2014-04-11 23:29:36 +04:00
Ivan Shalganov
8adc2ac55d Temporary disable broken tests 2014-04-10 10:58:14 +04:00
Ivan Shalganov
27bd06f534 Cleanaup 2014-04-10 10:33:51 +04:00
Ivan Shalganov
218efdffe6 Fix #75 for new inheritance system 2014-04-10 01:49:15 +04:00
Ivan Shalganov
654b259b42 Merge branch 'origin/master'
Conflicts:
	CHANGELOG.md
	docs/tags/raw.md
	src/Fenom/Compiler.php
	src/Fenom/Render.php
	src/Fenom/Template.php
2014-04-10 00:11:04 +04:00
Ivan Shalganov
0fcc5463e8 Merge remote-tracking branch 'origin/master' 2014-04-09 20:01:59 +04:00
Ivan Shalganov
e9a60041c4 Fix #75: macros don's share between child and parent templates 2014-04-09 20:01:20 +04:00
Ivan Shalganov
1f9a56500e Fix #75: throw invalid exception 2014-04-09 20:00:08 +04:00
Ivan Shalganov
777e315dce Dev flags 2014-04-09 18:03:49 +04:00
Ivan Shalganov
c210303b72 More test, reformat code to PSR-0 2014-02-27 16:30:44 +04:00
Ivan Shalganov
e00d6c7e50 Cleanup code 2014-02-27 00:24:57 +04:00
Ivan Shalganov
127ed0fef8 Fix test for PHP 5.3 2014-02-26 23:59:28 +04:00
Ivan Shalganov
000009a5d3 Done dynamic extends 2014-02-26 23:57:29 +04:00
Ivan Shalganov
9c0cea5934 Fix tests for PHP 5.3 2014-02-22 20:56:21 +04:00
Ivan Shalganov
a523d4a4aa Done #66, dev dynamic extends 2014-02-22 20:34:53 +04:00
igorhim
65477a5a06 Fix warning object to string 2014-02-18 23:53:02 +02:00
igorhim
df5fb0516d Fix custom modifier closure functions call 2014-02-18 23:48:56 +02:00
Ivan Shalganov
52c0858d06 Done #5, dev #66, improve blocks, refectory block's tests 2014-02-14 15:55:36 +04:00
Ivan Shalganov
dc287f08b2 Translate modifier's docs 2014-01-29 10:01:31 +02:00
Ivan Shalganov
75bcc4e0ff Add #48: allow call static method in templates and allow disable this option 2014-01-28 19:24:47 +02:00
Ivan Shalganov
7759df8453 Performance improvement: use plain array instead of ArrayObject for variable storage into templates 2014-01-27 23:58:14 +04:00
Ivan Shalganov
5049056046 Fix #58, small improvements 2014-01-20 11:54:28 +04:00
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
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
bzick
081e30e744 Fix #39 2013-08-06 12:04:23 +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
d5dcfbe410 Add hook for loads modifiers and tags 2013-07-24 19:37:07 +04:00
bzick
8030c12923 Add {unset …} (#29) 2013-07-24 16:16:20 +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
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
bzick
617fc7324c Improve providers. Renders now use bulk checks via ::verify 2013-07-13 12:00:19 +04: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
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
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
0bb82d9898 Fix escaping 2013-07-07 11:29:26 +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
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
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
eea3391c7d Fix: static modifier doesn't insert as is 2013-07-04 10:37:14 +04:00
bzick
9600fc78d7 Fix docs, done #2 2013-07-04 01:28:10 +04:00
bzick
4b8b56482c Fix comments, remove old code 2013-07-03 12:22:35 +04:00
bzick
0457d5c379 Fix indents 2013-07-03 12:10:50 +04:00
bzick
c76f5c8be0 Add checking nested level for {use} and {extends}
Add more docs
2013-07-02 11:07:33 +04:00
bzick
27d7110690 Renaming - done 2013-06-28 12:04:42 +04:00