Commit Graph
100 Commits
Author SHA1 Message Date
Justin Hileman ccb2b09317 Update generated class name for delimiters option.
Add some docs there, make it slightly easier to update the generated class name.
2017-07-02 14:39:07 -07:00
Justin Hileman 44489124a1 CS fixes. 2017-07-02 14:39:07 -07:00
Justin Hileman b6a480df22 o right, test all the versions we support. 2017-06-29 06:35:34 -07:00
Justin Hileman 9e34408bda Add a failing test case for #322 2017-06-29 06:21:49 -07:00
Justin Hileman 40646e4aea Fix Travis PHP 7 and HHVM builds. 2017-06-29 06:02:16 -07:00
Justin Hileman 09241edd52 Use a local $blocksContext for each parent render.
... rather than a shared one per template / section / block that accidentally keeps old block context around.

Fixes #322
2017-06-29 00:13:59 -07:00
Justin Hileman 44baf86426 Suppress else when rendering empty block defaults. 2017-06-28 23:20:21 -07:00
Justin Hileman 2bdb23db94 Merge branch 'release/2.11.1' into dev 2016-07-30 23:18:43 -07:00
Justin Hileman 87e87e29fe Bump to v2.11.1 2016-07-30 23:18:19 -07:00
Justin Hileman 0803fa688b Fix test bootstrap in PHP < 5.5 2016-07-30 23:17:51 -07:00
Justin Hileman 94a72ec3d2 Merge branch 'release/2.11.0' into dev 2016-07-30 23:07:58 -07:00
Justin Hileman cf4e4c7857 Bump to v2.11.0 2016-07-30 23:07:36 -07:00
Justin Hileman d4bdf110f9 Always check is_dir() and file_exists() with filesystem streams. 2016-07-30 22:59:23 -07:00
Justin Hileman 58f2401d4d Minor code style fixes. 2016-07-30 22:58:58 -07:00
Justin Hileman 18a2adce3d Remove all the extra spaces StyleCI wanted me to add :) 2016-07-30 22:39:43 -07:00
Justin Hileman 6f6e3b9ddb Add StyleCI badge to README. 2016-07-30 18:00:31 -07:00
Justin Hileman 01777faf6e Various style cleanups.
* a bunch of small changes, courtesy of styleci
 * update dates in file headers
 * add file headers to files that are missing them
2016-07-30 17:57:19 -07:00
Justin Hileman 41edfcb9e2 Drop the php-cs-fixer business on Travis.
That's what StyleCI is for.
2016-07-30 17:51:14 -07:00
Justin Hileman 174f0da5ce Switch to friendsofphp's cs fixer package 2016-07-30 17:44:10 -07:00
Justin Hileman b2b282dfef Code style fixes. 2016-05-19 00:06:45 -07:00
Justin Hileman 051f857197 Support parent tags and block args as direct children of blocks and sections.
Fixes #294

Drive-by: rename blocks context variable to something more descriptive.
2016-05-18 22:45:46 -07:00
Justin Hileman 21d553fc02 Add a failing test case for #294 2016-05-18 22:43:41 -07:00
Justin Hileman 1de7898200 Fix incorrect method name case. 2016-05-18 21:48:17 -07:00
Justin Hileman f7b969acc8 Merge branch 'release/2.10.0' into dev 2016-02-27 11:22:51 -08:00
Justin Hileman a9dd4c62ae Bump to v2.10.0 2016-02-27 11:21:57 -08:00
Justin Hileman 865de4114a Make LambdaHelper invokable.
Fixes #285
2016-02-14 08:43:38 -08:00
Justin Hileman 3c53736f09 Fix php-cs-fixer issue. 2016-02-14 08:37:59 -08:00
Justin Hileman 4dd6383a3d Use latest PHPUnit dev dependency. 2016-02-14 08:37:53 -08:00
Justin Hileman f3ae65eb33 Fix incorrect indent on interpolated lambdas.
Fixes #286
2016-02-14 08:37:41 -08:00
Justin Hileman 131cad6024 Add a failing test for #286 2016-02-13 15:36:35 -08:00
Justin Hileman 9cc21d63f7 Respect delimiter changes in lambda helper.
See janl/mustache.js#489
2015-10-12 12:48:21 -07:00
Justin Hileman 5353b36ec6 Merge branch 'release/2.9.0' into dev 2015-08-15 12:23:20 -07:00
Justin Hileman eff33aff4e Bump to v2.9.0 2015-08-15 12:18:51 -07:00
Justin Hileman 1b1757987a Put anchored dots behind {{%ANCHORED-DOT}} pragma. 2015-08-15 12:18:04 -07:00
Justin Hileman 664895f4b9 Add a simple BLOCKS pragma example. 2015-08-15 09:38:32 -07:00
Justin Hileman 8be838e144 Bump copyright dates. 2015-08-15 09:23:54 -07:00
Justin Hileman 7b81206923 Remove create_example script.
I'm not sure it has ever been used, and it's not all that difficult to create one manually.
2015-08-15 09:22:13 -07:00
Justin Hileman a5ad0a86db Anchor dot notation context: {{ .foo }}
1. Given that {{ . }} resolves as the top of the context stack;
2. And when any falsey segment in a dotted name is encountered, the whole name yields '';
3. A name like {{ .name }} should imply {{ [top of stack].name }};
4. Thus, it must resolve as truthy only if a member of the top of the context stack matches name.

See mustache/spec#52
2015-08-15 09:09:42 -07:00
Justin Hileman ba028d1dcf We won't be needing this anymore. 2015-07-18 07:30:38 -07:00
Justin Hileman 6b16313ced Update travis-ci environments.
hhvm-nightly is no more, but there is a php 7.0. Will it pass? The suspense is killing me!
2015-07-18 07:28:44 -07:00
Justin Hileman 27a8bf0b69 Update to latest php-cs-fixer config.
Update to corresponding style-ci config options. Fix a few code style issues in the process.
2015-07-18 07:23:23 -07:00
Justin Hileman d8da5f1d99 Clean up compiled PHP coding style. 2015-07-18 01:12:21 -07:00
Justin Hileman 91c71191c8 Merge remote-tracking branch 'damyon/PULL_264' into dev 2015-07-18 01:11:59 -07:00
Justin Hileman a066f27e66 Merge branch 'release/2.8.0' into dev 2015-03-31 23:39:06 -07:00
Justin Hileman 64c28cc73e Merge branch 'release/2.8.0' 2015-03-31 23:37:33 -07:00
Justin Hileman 46facc76b5 Bump to v2.8.0 2015-03-31 23:37:28 -07:00
Justin Hileman c4b1712d98 Merge branch 'fix/template-inheritance-whitespace' into dev 2015-03-31 23:24:25 -07:00
Justin Hileman 7cb9fdff6a Never indent block arg sections.
Fixes #253
2015-03-03 10:05:27 -08:00
Justin Hileman 22611a957c CS fixes.
Plus add config for StyleCI.
2015-03-02 21:53:03 -08:00
Justin Hileman f4f77a7882 Better dev dependencies.
* Add dependency on php-cs-fixer, since we use it.
 * Add a useful PHPUnit dependency version.
2014-12-27 07:34:16 -08:00
Justin Hileman cdb8f8d340 Fix bin/create_example CS 2014-12-27 07:33:27 -08:00
Justin Hileman 953a1e6bc5 Update php-cs-fixer config. 2014-12-27 07:33:18 -08:00
Justin Hileman 633d1f2913 Add hhvm-nightly to Travis config. 2014-12-27 07:29:04 -08:00
Justin Hileman 7cbc0d0796 Plural, too :) 2014-12-27 07:26:15 -08:00
Justin Hileman 792b3b4599 Shinier, newer badges. 2014-12-15 18:34:29 -08: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 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 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
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
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 834e16aacc Add a comment about __call / is_callable
Fixes #199
2014-04-14 21:36:56 -07:00
Justin Hileman 4c83fb0147 Merge branch 'release/2.6.0' into dev 2014-04-13 18:24:55 -07:00
Justin Hileman 43dc9457a2 Merge branch 'release/2.6.0' 2014-04-13 18:24:40 -07:00
Justin Hileman 003a2ae5e7 Bump to v2.6.0 2014-04-13 18:23:23 -07:00
Justin Hileman c96e985dbf Shiny new shields! 2014-04-13 16:47:55 -07:00
Justin Hileman 0315da508b Again, but with more following the instructions. 2014-03-29 12:26:14 -07:00
Justin Hileman 8f831201bd allow hhvm to fail for now 2014-03-29 10:58:16 -07:00
Justin Hileman d5b1add824 let's try it with *all* the versions! 2014-03-29 10:41:09 -07:00
Justin Hileman b8b156d3cc Refactor to remove strict callables test duplication. 2014-03-25 19:35:56 -07:00
Justin Hileman 125873a8e0 Remove unused $partialData. 2014-03-25 19:28:36 -07:00
Justin Hileman c10c966e60 Refactor to remove duplicate StreamLogger test code 2014-03-25 19:22:34 -07:00
Justin Hileman 402f5013dc Refactor duplication out of Mustache injection test. 2014-03-25 19:16:29 -07:00
Justin Hileman ad0204c372 Combine FiltersTest and SectionFiltersTest
They’re basically duplicates, so this clears up a bunch of code :)
2014-03-25 19:04:48 -07:00
Justin Hileman 2abbc4b35c Refactor away engine logger test duplication. 2014-03-25 18:44:58 -07:00