Dariusz Rumiński
5c5ea48578
sugar changes to travis config
2014-08-26 22:16:39 +02:00
Justin Hileman
9dcd8590d1
Merge branch 'release/2.7.0' into dev
2014-08-26 12:50:19 -07:00
Justin Hileman
fdf41dd673
Merge branch 'release/2.7.0'
2014-08-26 12:50:10 -07:00
Justin Hileman
c8e78df703
Bump to v2.7.0
2014-08-26 12:50:01 -07:00
Justin Hileman
f34f6699c2
Increase test coverage.
...
… fix a bug exposed by increased test coverage :-/
2014-08-25 11:18:09 -07:00
Justin Hileman
a257fb8acd
Require HHVM to pass now.
...
https://github.com/facebook/hhvm/pull/1860
2014-08-22 22:31:36 -07:00
Justin Hileman
3f492a1bf5
Add a simple FILTERS pragma example.
...
This includes examples of both section and interpolation filters.
2014-08-22 22:06:02 -07:00
Justin Hileman
a8d174a85f
DRY.
2014-08-18 20:59:16 -07:00
Justin Hileman
4f73c826ff
Ugh. Fix for php-cs-fixer
2014-08-18 20:00:34 -07:00
Justin Hileman
21570bfd4d
php-cs-fixer isn’t up to date on PSR-5 draft :)
2014-08-18 18:36:07 -07:00
Justin Hileman
4decec3c0e
Reformat code so php-cs-fixer doesn’t keep breaking it.
2014-08-18 18:33:30 -07:00
Justin Hileman
99caf588ab
Dry up T_ESCAPED/T_UNESCAPED compiling.
2014-08-18 18:32:27 -07:00
Justin Hileman
58a7726515
Move filter logic from the compiler to the parser.
2014-08-18 18:28:50 -07:00
Justin Hileman
d225afe032
Remove unused block arg code.
2014-08-18 18:28:11 -07:00
Justin Hileman
2ceea2e9d2
Merge pull request #223 from bobthecow/feature/faster-type-checking
...
Faster context lookups
2014-08-18 17:08:40 -07:00
Justin Hileman
89b322c3e8
Merge pull request #221 from keradus/cs
...
update CS by php-cs-fixer
2014-08-18 17:08:29 -07:00
Justin Hileman
8449681a37
One more unnecessary else/return combo.
2014-08-18 16:58:19 -07:00
Justin Hileman
c0bd7efe39
No need for elseif with returns :)
...
/cc @keradus
2014-08-18 16:56:32 -07:00
Justin Hileman
df67052626
Use reference to current stack frame
...
(saves quite a few array lookups)
See #218
2014-08-18 09:01:57 -07:00
Justin Hileman
3d37a88f0b
Replace is_object/is_array with switch on gettype
...
When checking multiple types, this is ~10% slower in the worst case, and ~30-33% faster for the average and best case.
See #218
2014-08-18 05:00:16 -07:00
Justin Hileman
6859d82e8e
Merge pull request #222 from keradus/travis-CS
...
add php-cs-fixer to travis tasks
2014-08-16 19:49:33 -07:00
Dariusz Rumiński
320bab9e7c
ignore php-cs-fixer on php5.2
2014-08-17 01:54:21 +02:00
Dariusz Rumiński
761538e065
add php-cs-fixer into travis tasks
2014-08-17 01:00:43 +02:00
Justin Hileman
c3e976a328
Merge branch 'fix/nested-partial-whitespace' into dev
2014-08-16 15:41:47 -07:00
Justin Hileman
7800aa8136
Add submodule instructions to CONTRIBUTING.
...
See #220
2014-08-16 15:38:26 -07:00
Dariusz Rumiński
d07cac322c
update CS by php-cs-fixer
2014-08-17 00:29:05 +02:00
Justin Hileman
bd3c7798c3
Merge branch 'feature/pragma-blocks' into dev
2014-08-15 23:18:10 -07:00
Justin Hileman
35456764a1
Only pass indent through to standalone nested partials.
...
Fixes #214
2014-08-07 10:45:33 -07:00
Justin Hileman
5d77f4de9a
Move failing nested partial example into a test case.
...
See #214
2014-08-07 10:40:06 -07:00
Mike Sherov
114477811c
Add failing test For extra whitespace in nested partials.
2014-08-07 10:28:19 -07:00
Justin Hileman
6e37c344eb
Merge pull request #211 from keradus/php-cs-fixer
...
Php cs fixer
2014-07-25 07:50:26 -04:00
Dariusz Rumiński
80d724f5f3
.php_cs - simplify
2014-07-24 19:03:27 +02:00
Dariusz Rumiński
3d25e12fe1
cs fixes
2014-07-24 18:37:55 +02:00
Dariusz Rumiński
6381604484
.php_cs add file for php-cs-fixer configuration
2014-07-24 18:37:42 +02:00
Justin Hileman
1fe5b0dfc2
Whoops. Missed some docs and cleanup :)
2014-06-27 00:18:41 -07:00
Justin Hileman
349b58b8ca
Throw inheritance behind a BLOCKS pragma.
...
Update tests, known pragmas, and parsing.
2014-06-26 23:31:41 -07:00
Justin Hileman
dd53137ae1
Add missing method docs, minor code cleanup.
2014-06-26 23:05:44 -07:00
Justin Hileman
7aee026403
Add default pragma option to Mustache_Engine.
...
Pragmas specified in the Mustache_Engine constructor will be enabled in all templates, regardless of the presence of pragma tags in individual templates.
2014-06-26 22:45:23 -07:00
Justin Hileman
4c4c6f156b
Merge remote-tracking branch 'jazzdan/dev' into feature/template-inheritance
...
Conflicts:
src/Mustache/Compiler.php
test/Mustache/Test/TokenizerTest.php
2014-06-26 21:51:03 -07:00
Justin Hileman
0eb3e71dc8
Merge branch 'release/2.6.1' into dev
2014-06-20 12:35:59 -07:00
Justin Hileman
1430ca8849
Merge branch 'release/2.6.1'
2014-06-20 12:34:49 -07:00
Justin Hileman
b1e0a6d607
Bump to v2.6.1
2014-06-20 12:34:43 -07:00
Justin Hileman
8c67a15cf8
Add tag name to mismatched delimiter error message.
2014-06-20 12:30:53 -07:00
Justin Hileman
e8897b1228
Merge pull request #209 from smarden1/pr/even_triple_braces
...
Uneven braces in triples are incorrectly swallowing a character [repost of 208]
2014-06-20 12:25:10 -07:00
steve
6ba77964b8
uneven braces with custom delimiters throws Mustache_Exception_SyntaxException
2014-06-19 23:25:46 -07:00
steve
c037b31d25
add test coverage to ensure that custom delimiters don't swallow trailing characters after they close
2014-06-19 20:51:02 -07:00
steve
842b31b477
clean up Tokenizer->scan -- add error annotation, spaces between +, strict type checking, and self instead of Mustache_Tokenizer
2014-06-19 11:29:21 -07:00
steve
be19ebf5b2
add DateTimeZone UTC to DateTime calls in FiltersTest
2014-06-19 08:04:40 -07:00
steve
40e86247ad
math is hard - check the bounds of a string properly when looking to see if a closing } exists
2014-06-18 16:53:40 -07:00
steve
868b5b49eb
starting triple braces without ending triple braces throws an error - previously this was swallowing an additional character
2014-06-18 16:53:34 -07:00