Commit Graph
516 Commits
Author SHA1 Message Date
mlebrun 339c94b2e1 FilesystemLoader: removed all temp folder logic from testConstructorWithProtocol test.
Conflicts:
	test/Mustache/Test/Loader/FilesystemLoaderTest.php
2013-07-18 21:08:56 -07:00
Justin Hileman 65de52c7db Merge branch 'release/2.4.0' into dev 2013-07-17 22:27:30 -07:00
Justin Hileman 48cf4c178c Bump version for 2.4.0 2013-07-17 22:23:40 -07:00
Justin Hileman 1d21de63d6 Trailing slash test fix.
I suppose it would help if I didn't realpath the thing I was testing for realpathness
2013-07-15 18:11:36 -04:00
Justin Hileman 911151ad78 Looks like we don’t need that rtrim() after all.
(+ a test, confirming)
2013-07-15 18:08:24 -04:00
Justin Hileman 4b4d2deb99 Merge pull request #158 from mlebrun/master
Allow paths to include protocols prepended to the path.
2013-07-15 15:06:45 -07:00
mlebrun 08972b31d3 Fixed parenthesis whitespace. 2013-07-15 17:12:13 -04:00
mlebrun 2d0293c612 Fix sending protocol with path to FilesystemLoader constructor. 2013-07-15 16:45:59 -04:00
Justin Hileman 287d2f74a8 Merge branch 'feature/whitespace-tokenizing' into dev 2013-06-25 08:43:00 -07:00
Justin Hileman 87a734e60c Update Compiler for new Parser output. 2013-05-15 13:37:05 -07:00
Justin Hileman 8f5be9e470 Add standalone line whitespace handling to Parser. 2013-05-15 13:37:05 -07:00
Justin Hileman de9941d271 Ensure that delimiter changes appear in token list. 2013-05-15 13:37:05 -07:00
Justin Hileman 4588e04365 No need to loop through pragma tokens twice.
Add them directly to the token list as soon as they are tokenized.
2013-05-15 13:37:05 -07:00
Justin Hileman 32461bfb48 Track line number in Tokenizer
(needed for standalone line filtering via Parser)
2013-05-15 13:37:05 -07:00
Justin Hileman b77d2f308e Remove "standalone tag" filtering from Tokenizer. 2013-05-15 13:37:05 -07:00
Justin Hileman 4112bcc3f7 Fix doc comment on inline loader. 2013-05-15 13:36:46 -07:00
Justin Hileman 0564df9651 Add missing comments for pragma tokenizing. 2013-05-12 21:49:36 -07:00
Justin Hileman 697f4ac26b Use a raw array for Parser::buildTree
Improve memory usage by ~15% for very large templates.
2013-05-11 22:32:42 -07:00
Justin Hileman ade0b98761 Remove unnecessary leading slashes. 2013-05-10 17:24:53 -07:00
Justin Hileman c5c36ddd2b Change entity_flags variable names to match PSR-2. 2013-04-27 16:04:05 -07:00
Justin Hileman 7065cef689 Merge pull request #148 from pinterface/dev
Allow passing in the $type parameter of htmlspecialchars()
2013-04-27 15:58:07 -07:00
Pixie 311f337856 Allow passing in the $type parameter of htmlspecialchars() 2013-04-27 17:36:51 -05:00
Justin Hileman c6c480013a Merge branch 'release/2.3.1' into dev 2013-04-25 08:25:08 -07:00
Justin Hileman 3ef28e14e3 Merge branch 'release/2.3.1' 2013-04-25 08:23:30 -07:00
Justin Hileman afc20ae1e2 Bump to v2.3.1 2013-04-25 08:23:21 -07:00
Justin Hileman 2327f3839f Fix tokenizing when mbstring.func_overload enabled.
Fixes #144
2013-04-24 09:24:27 -07:00
Justin Hileman 5d186b134b Fix this mention too :) 2013-04-23 21:14:37 -07:00
Justin Hileman 3fb7fdc2ac Update docs, variable name for render passthrough. 2013-04-23 21:13:39 -07:00
Josh Butts cdcfeed67d set default value for render context to empty array 2013-04-23 21:13:39 -07:00
Justin Hileman 9e5ef08fbf Reformat LICENSE file. 2013-04-15 19:51:41 -07:00
Justin Hileman e5da080ef4 Merge branch 'release/2.3.0' into dev 2013-04-01 20:56:37 -07:00
Justin Hileman fb5e4ecb30 Merge branch 'release/2.3.0' 2013-04-01 20:56:30 -07:00
Justin Hileman 0f1fc69e5c Bump to v2.3.0 2013-04-01 20:50:30 -07:00
Justin Hileman 723ac37053 s/an/a/ 2013-03-28 16:48:00 -04:00
Justin Hileman 01d413de0d Merge branch 'hotfix/2.2.0' into dev
Conflicts:
	src/Mustache/Compiler.php
	src/Mustache/Engine.php
2013-03-25 09:12:36 -07:00
Justin Hileman f0eb5091e2 Merge branch 'hotfix/2.2.0' 2013-03-25 09:03:00 -07:00
Justin Hileman 934a5495bb Bump Genghis version. 2013-03-25 09:02:46 -07:00
Justin Hileman c160134b6d Add a 'strict_callables' option to Mustache_Engine
Prevents treating array('ClassName', 'methodName') or array($instance, 'methodName') as section or interpolation callables. This helps protect against arbitrary code evaluation when user input is passed directly into the template.

This setting is recommended for PHP 5.3+, and all PHP 5.2 projects not using section or interpolation lambdas.

The default value is false to preserve backwards compatibility.

See #138
2013-03-23 10:54:13 -07:00
Justin Hileman 7fb7758178 Include header in generated bootstrap files. 2013-03-12 16:40:36 -07:00
Justin Hileman 32a397f93d Remove unused submodule. 2013-03-12 16:20:02 -07:00
Justin Hileman ca44ef68f8 Move loader cascading into the loadPartial method.
This means the `partialsLoader` property is never set to the default loader, fixing things like `setPartials`, but template loading cascades as per the spec.

Add test coverage for partial cascading.
2013-03-12 16:03:58 -07:00
Justin Hileman 72007e65b4 Simplify setPartials nested ifs. 2013-03-12 15:29:18 -07:00
Matt DeClaire 32b747be5c fix test: a partialLoader should match the loader when neither are specified 2013-03-12 15:19:12 -07:00
Matt DeClaire 5a3802e2a6 fix for when loader is not defined 2013-03-12 15:14:07 -07:00
Matt DeClaire 62435a5705 lazily default partialsLoader to loader
Conflicts:
	src/Mustache/Engine.php
2013-03-12 15:14:04 -07:00
Matt DeClaire 8053ce7093 implement default behavior for the partials_loader 2013-03-12 15:06:47 -07:00
Justin Hileman 12d6884b4b Improve test coverage for custom escapers and charsets. 2013-01-26 16:48:35 -08:00
Justin Hileman c75b4c2e0b Fix compiled templates' PSR-2 compliance. 2013-01-26 16:34:16 -08:00
Justin Hileman d5e199b3b9 Update build_bootstrap with all the new classes! 2013-01-26 16:25:57 -08:00
Justin Hileman a777c587f2 Add resolveValue method to base Template.
DRYs up compiled class output a bit and makes things FASTER!

Speeds up value resolution by 33% for primitives, 25% for methods and properties, and 10% for lambdas.
2013-01-26 16:19:06 -08:00