Commit Graph

282 Commits

Author SHA1 Message Date
hamidr
86ebab9dba Merge remote-tracking branch 'origin/develop' 2016-07-31 14:30:53 +04:30
Behrooz Shabani
37b377b9df Merge pull request #136 from cblanquera/feature-register-helper-2
Feature: registerHelper()
2016-07-30 11:04:30 +02:00
Behrooz Shabani
1a0d4dc772 Merge pull request #146 from hfhchan/master
Fix: Don't re-escape variables that are already safe
2016-07-29 19:37:54 +02:00
hfhchan
dfb62e42cc Fix scoping error 2016-07-30 01:31:55 +08:00
hfhchan
07d8542e3b Fix syntax error 2016-07-30 01:18:50 +08:00
hfhchan
5222c6dff1 Add tests for passing SafeString as 2016-07-30 01:14:21 +08:00
hfhchan
402f970b77 Don't re-escape variables that are already safe 2016-07-28 18:06:50 +08:00
Behrooz Shabani
a00af06cac Merge pull request #143 from Skyscanner/ttl-feature
Implementation of TTL for caching
2016-07-26 10:51:07 +02:00
Maria Sormanova
3a25d9bf17 added versioning to prevent breaking existing projects 2016-07-26 10:43:18 +02:00
Maria Sormanova
51f8a3056b Implementation of TTL for caching 2016-07-25 16:14:39 +02:00
Christian Blanquera
08ad533e81 case for the right String Class
Not sure where i got StringWrapper from. We now don’t need to case for
this in the `registerHelper()` method
2015-09-26 20:03:52 +08:00
Christian Blanquera
1ba7cdf108 added case descriptions and used an int example 2015-09-23 23:34:42 +08:00
Christian Blanquera
407732cef3 better registerHelper Tests 2015-09-23 23:23:53 +08:00
Christian Blanquera
08f4328f9d phpcs
files i made no changes to, but got cs errors on.. not sure why. Just
let me know what the protocol is for this one.
2015-09-21 20:23:20 +08:00
Christian Blanquera
0070ad79c0 phpcs approval
“oh the spacing!”
2015-09-21 18:49:08 +08:00
Christian Blanquera
33c76738b4 Added registerHelper
I did it in such a way where I’m not messing with the other methods or
classes to get what I wanted.

I realize that there maybe no need for the child context, however when
trying a permutation of

```
'fn' => function($data = null) use($context, $template) {
    $context->push($context->last());

    if(is_array($data)) {
   		$context->push($data);
   	}

    $template->setStopToken('else');
    $buffer = $template->render($context);
    $template->setStopToken(false);
    $template->discard($context);

    if(is_array($data)) {
   		$context->pop();
   	}

    $context->pop();

    return $buffer;
}
```
It didn’t parse the `../../../test` correctly in the test. I figured
that the ChildContext is a nice pattern overall and doesn’t interfere
with the rest of the package anyways…
2015-09-21 17:50:00 +08:00
Christian Blanquera
57d00e6e82 What to expect...
We should also probably check for looping capabilities as well.
2015-09-21 17:49:17 +08:00
fzerorubigd
5e1db1d1c7 Merge pull request #135 from JustBlackBird/php7_string
PHP7 String keyword
2015-08-07 02:46:36 +04:30
Dmitriy Simushev
97b5338a50 Add PHP7 to build matrix 2015-08-06 10:46:13 +00:00
Dmitriy Simushev
33ec96a1b4 Replace String class with StringWrapper one 2015-08-06 10:45:25 +00:00
fzerorubigd
a47d7e0fb2 Merge pull request #130 from JustBlackBird/fix_var_export
Fix exception message in Context::_findVariableInContext
2015-07-14 22:38:50 +04:30
Dmitriy Simushev
912cc286fa Fix exception message in Context::_findVariableInContext
Fixes #129
2015-07-14 18:03:01 +00:00
Dmitriy Simushev
10dbe6442e Merge pull request #127 from thormeier/partial-support-and-error-reporting
Fix handling of named arguments in partials
2015-06-30 21:02:40 +03:00
Pascal Thormeier
83199fbd65 Remove unnecessary if statement 2015-06-30 10:35:58 +02:00
Pascal Thormeier
2e1b67208d Fix handling of named arguments in partials
Also fix tests that weren't even executed
2015-06-29 17:16:59 +02:00
Dmitriy Simushev
2c78af65e0 Add tests for missed Mustache helpers
This is the missed test case for #121
2015-06-23 20:57:29 +00:00
Dmitriy Simushev
f3067cb41a Merge pull request #121 from mmontagna/master
Fixes a incompatibility with handlebars.js
2015-06-23 23:46:56 +03:00
fzerorubigd
071793118a Merge pull request #124 from thormeier/partial-support-and-error-reporting
Partial support and error reporting
2015-06-20 10:28:40 +04:30
Pascal Thormeier
6ef6b7bc08 Remove last var_export statements
Got overlooked while refactoring
2015-06-19 11:43:58 +02:00
Pascal Thormeier
15af0f8e52 Remove var_export where unnecessary 2015-06-18 22:56:00 +02:00
Pascal Thormeier
9ebacc28ae Use Arguments class instead of regex 2015-06-17 23:57:12 +02:00
Pascal Thormeier
e1956be453 CS fixes 2015-06-17 16:11:50 +02:00
Pascal Thormeier
0111689f47 Fix and add tests
Also use var_export in exceptions in case array/object/etc get passed
2015-06-17 15:50:10 +02:00
Pascal Thormeier
a4b6f9627a Enable argument support in partials
Create own context if there are arguments and take values from context
where partial was rendered in. Also allow strings with `=` inside
arguments.
2015-06-17 14:19:57 +02:00
Pascal Thormeier
0a908fb6a1 Improve error reporting in case of exception
Make Exception messages more verbose
2015-06-17 14:18:32 +02:00
fzerorubigd
959834be09 Merge pull request #123 from Zemistr/master
Added support for class with __toString method as a context variable.
2015-06-08 09:26:41 +04:30
Martin Zeman
23076d68e5 Added support for class with __toString method as a context variable. 2015-06-07 23:09:14 +02:00
Marco Montagna
91ba4f3191 Removed test that enforce strict search for variables in block exprs, which I believe is incorrect behavior as it breaks from the mustache spec (github.com/mustache/spec/blob/master/specs/sections.yml) see 'Failed context lookups should be considered falsey' 2015-06-03 14:50:46 -07:00
Marco Montagna
083458d839 Don't enforce strict search for variables in block exprs 2015-06-03 14:33:22 -07:00
fzerorubigd
8f9d0e5fef Merge pull request #118 from JustBlackBird/fix_slashes
Fix slashes mess in Tokenizer
2015-06-02 12:10:53 +04:30
Dmitriy Simushev
824ae885c6 Fix escaping of tags with multiple slashes 2015-06-01 15:15:52 +00:00
Dmitriy Simushev
04f963a21f Fix slashes mess in Tokenizer
See #113 for details
2015-05-19 13:22:15 +00:00
fzerorubigd
8392138584 Merge pull request #117 from DaveStein/loader-extendable
FilesystemLoader: Updates to be more extendable
2015-05-18 14:20:42 +04:30
Dave Stein
6c9aa9573c FilesystemLoader: Updates to be more extendable
Directory setting can be overridden
The way a directory is sanitized can be overridden
The way options are handled can be overridden
2015-05-17 16:41:12 -04:00
fzerorubigd
8652b01b84 Merge pull request #114 from szicsu/apc_improvement
APC cache improvement
2015-05-13 10:04:51 +04:30
Szijarto Tamas
802d5cf7d3 Test of APC cache 2015-05-12 23:23:04 +02:00
Szijarto Tamas
bf327cdb24 APC cache improvement
- add cache key prefix
 - use success param at fetch
2015-05-11 21:35:14 +02:00
fzerorubigd
c0c58a2a85 Merge pull request #112 from majortom731/master
@root special variable like in handlebars-v2.0.0.js
2015-03-10 21:10:52 +03:30
Thomas Seven
b65be0e1c5 Implementation + tests for the @root special variable like in handlebars-v2.0.0.js
fixed travis complaints
2015-03-10 13:42:10 +01:00
fzerorubigd
382938b82e
fix phpcs and also add mustache.php copyright notice 2015-01-29 22:28:38 +03:30