Justin Hileman
0ac8be629b
Merge branch 'feature/indentation-fix' of https://github.com/DrPheltRight/mustache.php into DrPheltRight-feature/indentation-fix
2011-03-01 10:42:06 -05:00
Justin Hileman
9640915fb7
Update spec to v1.0.0. Tests break.
2011-03-01 08:20:40 -05:00
Justin Hileman
2cfc9ba827
Update to current spec HEAD.
...
This makes a lot of tests fail :)
2011-02-17 09:47:29 -05:00
Justin Hileman
8fbca952c6
Update spec submodule to v1.0.0rc2
2010-12-27 00:59:24 -05:00
Justin Hileman
c7a2064344
Merge branch 'hotfix/0.5.1' into dev
2010-12-14 16:53:38 -05:00
Justin Hileman
6eb3ea0c8b
Merge branch 'hotfix/0.5.1'
2010-12-14 16:53:10 -05:00
Justin Hileman
a448453da3
Merge branch 'release/0.5.0'
2010-12-08 16:05:51 -05:00
Justin Hileman
f2d677e5d6
Update README.
2010-12-08 16:04:11 -05:00
Justin Hileman
7466cd2551
Comment out lambda tests.
...
Lambdas aren't currently implemented in Mustache.php, and the parser we're using doesn't like the lambdas yaml file so it's throwing exceptions :(
2010-12-08 08:55:37 -05:00
Justin Hileman
2e335f8687
Merge branch 'feature/whitespace-overhaul' into dev
2010-12-08 08:49:29 -05:00
Justin Hileman
6e070ca476
Merge branch 'dev' into feature/whitespace-overhaul
2010-12-08 08:42:04 -05:00
Justin Hileman
5eeddd5cb5
Merge branch 'feature/mustache-spec' into dev
2010-12-08 08:41:41 -05:00
Justin Hileman
55e3a036f2
Merge branch 'dev' into feature/mustache-spec
2010-12-08 08:40:14 -05:00
Justin Hileman
64b5cd0964
Cleanup.
...
Make RegEx variable capitalization consistent. Add docblocks for prepareFooRegEx functions.
2010-12-08 08:34:27 -05:00
Justin Hileman
c5bf83f9a9
Move class constants to their logical places.
2010-12-08 08:28:51 -05:00
Justin Hileman
834d612f1e
Merge branch 'dev' into feature/whitespace-overhaul
2010-12-08 08:23:13 -05:00
Justin Hileman
7cb2029ec2
Add test for double-rendered sections, prevent mustache injection (see fix for mustache.js: http://hile.mn/fOVoW1 ...)
2010-12-08 08:16:06 -05:00
Justin Hileman
7ffd232c2e
Merge branch 'dev' into feature/mustache-spec
2010-11-26 15:53:56 -05:00
Justin Hileman
289cd023d4
Optimize dot notation check
...
Don't try to traverse dot notation unless there's a dot in the variable name.
2010-11-26 15:45:57 -05:00
Justin Hileman
b33b1a7bf2
Remove an extra trim();
2010-11-26 15:38:45 -05:00
Justin Hileman
c1bac31884
Merge branch 'dev' into feature/whitespace-overhaul
2010-11-26 14:33:23 -05:00
Justin Hileman
fe91be1fb1
Pre-escape tag type constants (saves us from doing it each time the regex strings are prepared)
2010-11-26 14:07:10 -05:00
Justin Hileman
225a32d5bf
Updating _renderTag logic around leftover section tags.
...
Exceptions are now thrown by _renderSections, so anything left over by the time _renderTag executes should just be discarded.
2010-11-26 14:05:20 -05:00
Justin Hileman
730c3a36e5
Update phpunit config to exclude tests from coverage report.
2010-11-26 14:03:45 -05:00
Justin Hileman
2b8e2f6e84
Capture whitespace before tags, prefix it to partials.
2010-11-24 08:11:09 -05:00
Justin Hileman
3e6b8102b7
Massive overhaul of Mustache.php's whitespace handling.
...
Move regex preparation into methods, use named subpatterns so the regex makes more sense. Fix the logic around eating newlines adjacent to tags. Update tests to reflect the changes.
2010-11-24 07:45:24 -05:00
Justin Hileman
e0ec0d0e18
Swap out spyc for sfYaml.
...
spyc has a parsing bug which causes partials to fail. I mean, they fail for other reasons too. And we're getting to those. But we don't need to debug YAML parsers while we're at it.
2010-11-24 05:07:35 -05:00
Justin Hileman
ab29f6eef4
Merge branch 'dev' into feature/mustache-spec
2010-11-24 04:15:42 -05:00
Justin Hileman
d026315a2c
Even more ludicrous recursive section / implicit iterator tests.
2010-11-24 04:10:37 -05:00
Justin Hileman
fef6234954
Test case for recursive sections with implicit iterators.
2010-11-24 04:02:19 -05:00
Justin Hileman
16115f915b
Merge branch 'feature/section-stack' into dev
2010-11-24 03:54:14 -05:00
Justin Hileman
fa0e7fac80
Merge branch 'dev' into feature/section-stack
2010-11-24 03:52:22 -05:00
Justin Hileman
1282b8104a
A broken example for issue #12 - recursive/nested sections.
2010-11-24 03:52:04 -05:00
Justin Hileman
bb04ccd05e
Add an inverted section test to base test case.
2010-11-24 03:36:41 -05:00
Justin Hileman
943aa8849a
Add test groups for easier test breakdown.
2010-11-24 03:36:23 -05:00
Justin Hileman
f143f17b40
Add test groups for easier test breakdown.
2010-11-24 03:26:44 -05:00
Justin Hileman
38accdaf89
More correct sections implementation.
...
Allows nested sections of the same name, throws exceptions on incorrectly nested sections, e.g.:
{{#foo}}{{#bar}}{{/foo}}{{/bar}}
Add a set of tests for incorrectly nested sections.
2010-11-24 03:16:18 -05:00
Justin Hileman
a39c6f689e
Merge branch 'release/0.4.0'
2010-10-30 18:12:58 -04:00
Justin Hileman
35c725089b
Revert "Merge branch 'luciferous-master' into dev"
...
This reverts commit 9202a37cf5 , reversing
changes made to 54b5800d42 .
Using `is_callable` is problematic as the `__call` magic method interferes with
context all over the place. See http://hile.mn/buBS11 and http://hile.mn/9vy1S6
2010-10-30 18:06:39 -04:00
Justin Hileman
9202a37cf5
Merge branch 'luciferous-master' into dev
2010-10-30 17:16:33 -04:00
Justin Hileman
54b5800d42
Merge branch 'ThePixelDeveloper-master' into dev
2010-10-30 17:13:37 -04:00
Justin Hileman
f2d77ad695
Whitespace
2010-10-30 17:13:27 -04:00
Justin Hileman
963faf5de9
Merge branch 'dev' into feature/mustache-spec
2010-10-30 16:53:35 -04:00
Justin Hileman
f3cb0877ff
Add support for 'less-than' partial notation.
2010-10-30 16:53:14 -04:00
Justin Hileman
596fb3c1d4
Adding test support for the mustache spec.
...
To run the spec tests, you must initialize the spec submodule:
git submodule update --init
You can then run just spec tests, if that's the sort of thing you're into:
cd test
phpunit --filter Spec
This test currently skips Lambdas -- the Mustache.php implementation is still in a feature branch. It also skips recursive partials to keep [issue #11 ](http://hile.mn/bYIIYt ) from breaking PHPUnit with infinite recursion.
2010-10-30 16:50:38 -04:00
Justin Hileman
e3c7afde46
Moved test for #11 into 'escaped' example.
2010-08-17 15:27:46 -04:00
Justin Hileman
2bd68f59b1
Merge branch 'release/0.3.0' into dev
2010-08-15 07:21:28 -04:00
Justin Hileman
8b1c9c113c
Merge branch 'release/0.3.0'
2010-08-15 07:12:45 -04:00
Justin Hileman
568b6c8512
don't include phpunit in test cases.
2010-08-15 07:12:26 -04:00
Justin Hileman
eb01f3052c
Merge branch 'feature/test-coverage' into dev
2010-08-15 06:56:02 -04:00
Justin Hileman
31b38b71a2
Test coverage is no longer incomplete.
2010-08-15 06:55:47 -04:00
Justin Hileman
f91f74ef1b
Clean up comments and whitespace.
2010-08-15 06:55:12 -04:00
Justin Hileman
e2546d40c1
Minor test coverage improvements.
...
Add regression test for newlines in comments. Add rudimentary partials test.
2010-08-15 06:54:54 -04:00
Justin Hileman
39b24c1933
Update mustache object section test to cover class method access for embedded objects.
2010-08-15 06:53:12 -04:00
Justin Hileman
54d91b667b
Adjust _renderTag so xdebug relizes that it actually has full test coverage. This commit marks 100% test coverage of Mustache.php.
2010-08-15 06:33:55 -04:00
Justin Hileman
5de845cb2e
Add test coverage for edge cases and exceptions.
2010-08-15 06:32:36 -04:00
Justin Hileman
de968a42b4
Initialize local pragmas with empty array.
2010-08-15 06:30:15 -04:00
Justin Hileman
582c3278fa
Add known issue for whitespace, mark whitespace test as skipped.
2010-08-15 06:28:56 -04:00
Justin Hileman
e40a57cba1
Refactor section_iterator_objects example.
...
Defining an IteratorObject class is unnecessary: the ArrayIterator will do just fine.
2010-08-15 06:27:54 -04:00
Justin Hileman
4c85d9f3e4
Merge branch 'feature/test-coverage' of github.com:bobthecow/mustache.php into feature/test-coverage
2010-08-09 09:31:20 -04:00
Justin Hileman
fe1493c6e7
Merge branch 'release/0.2.7'
2010-08-03 05:01:58 -04:00
Justin Hileman
ec562fea09
Support for newlines inside mustache tags.
2010-08-03 04:58:15 -04:00
Justin Hileman
ad6e15e5b5
Update SectionSpaces class name to work with template autoloading, changing .txt to desired (not actual) output so the test will fail.
2010-07-22 20:36:29 -04:00
Justin Hileman
0b542e4e08
Merge branch 'release/0.2.6'
2010-07-11 23:20:19 -04:00
Justin Hileman
c1cdea7bc5
Added documentation for IMPLICIT-ITERATOR and DOT-NOTATION pragmas.
2010-07-11 23:17:14 -04:00
Justin Hileman
f43012f457
Merge branch 'feature/implicit-iterator' into dev
2010-07-11 22:56:01 -04:00
Justin Hileman
06ee1f224a
Fixed implicit iterator + dot notation tests, this feature is now ready to merge :)
2010-07-11 22:54:57 -04:00
Justin Hileman
6cfd2b4be8
Merge branch 'dev' into feature/implicit-iterator
2010-07-11 22:35:38 -04:00
Justin Hileman
870aedf6b9
Merge branch 'feature/test-coverage' into dev
2010-07-06 13:32:47 -04:00
Justin Hileman
93018640d9
Fixing test names to match prior art.
2010-07-06 13:32:37 -04:00
Justin Hileman
6dfb883789
Merge branch 'release/0.2.5' into dev
2010-07-06 10:23:43 -04:00
Justin Hileman
88a93f1188
Merge branch 'release/0.2.5'
2010-07-06 10:23:02 -04:00
Justin Hileman
16218800a9
whitespace cleanup.
2010-07-06 10:19:49 -04:00
Justin Hileman
2cfb8aefc1
Rename section object tests to work with upcoming autoload-template feature. Clean up code to match style.
2010-07-06 10:17:04 -04:00
Justin Hileman
c2c01cf964
only test examples which find a php class.
2010-07-06 10:09:00 -04:00
Justin Hileman
3ab2529b3e
Merge branch 'rebase' into feature/test-coverage
2010-07-06 00:04:24 -04:00
Justin Hileman
5186d0bc18
Test case for #3 (_varIsIterable issues).
2010-07-06 00:04:18 -04:00
Justin Hileman
e026d8e7f5
Fix for examples directory iterator in PHP 5.2. Future-proof things a bit by actually checking for file extension before accessing that index.
2010-07-05 23:29:28 -04:00
Justin Hileman
0256d03b5f
Merge branch 'dev' into feature/implicit-iterator
...
Conflicts:
Mustache.php
2010-07-05 15:55:00 -04:00
Justin Hileman
b096cb108d
fix for PHPUnit 3.5.0 - no longer including PHPUnit/Framework.php in tests.
2010-06-22 07:13:17 -04:00
Justin Hileman
98ec8ea11a
Fixed protected property in PragmaEscaped example (should be public)
2010-06-22 07:11:33 -04:00
Justin Hileman
f6c447385f
Merge branch 'release/0.2.4'
2010-06-13 01:49:55 -04:00
Justin Hileman
b300b31752
prepared regex should escape regex delimiter as well.
2010-06-11 16:36:40 -04:00
Justin Hileman
e709be6d90
Merge branch 'feature/test-coverage' of github.com:bobthecow/mustache.php into feature/test-coverage
2010-06-11 16:30:17 -04:00
Justin Hileman
a978b6ba45
Fix for resetting otag/ctag to initial values between successive renders of same template.
2010-06-11 16:29:59 -04:00
Justin Hileman
12096e0b8c
Cleaned up regex string preparation.
2010-06-11 16:24:46 -04:00
Justin Hileman
a50acc2b25
Cheezy phpunit config, allows colored test results and implied default tests.
2010-06-10 00:16:08 -04:00
Justin Hileman
a46d0009ee
Added test case for deep parent/child contexts, mixed objects and arrays.
2010-06-08 22:36:49 -04:00
Justin Hileman
2018449184
added test and known issue for dot notation/implicit iterator woes.
2010-06-02 02:08:54 -04:00
Justin Hileman
38a5e57514
Added context and section unit tests for dot notation pragma.
2010-06-01 17:02:36 -04:00
Justin Hileman
96c42105ec
Test consecutive renders with pragma unescaped
2010-06-01 16:39:34 -04:00
Justin Hileman
38d778b825
fixed typo in test message.
2010-05-27 17:05:36 -04:00
Justin Hileman
5e195625d0
Merge branch 'dev' into feature/test-coverage
2010-05-27 16:12:02 -04:00
Justin Hileman
54f57de1ea
Merge branch 'hotfix/0.2.3' into dev
2010-05-27 16:08:41 -04:00
Justin Hileman
c3541fa224
Merge branch 'hotfix/0.2.3'
2010-05-27 16:07:33 -04:00
Justin Hileman
e3d10e9350
Skipping delimiters test until bug is fixed.
2010-05-27 16:07:12 -04:00
Justin Hileman
5cb4c7e2f1
Skipping delimiters test until bug is fixed.
2010-05-27 16:05:45 -04:00
Justin Hileman
97e6911935
Stopped passing context by reference to _findVariableInContext. Updated documentation.
2010-05-25 13:51:49 -04:00
Justin Hileman
4f5d3fffaa
Merge branch 'release/0.2.2'
2010-05-24 10:46:28 -04:00
Justin Hileman
fd3dc292a3
Merge branch 'feature/fix-partials' into dev
2010-05-24 10:35:00 -04:00