Permalink
Browse files

Merge branch 'release/2.0.0'

Conflicts:
	.gitmodules
	Mustache.php
	test/fixtures/examples/i18n/I18n.php
	vendor/spec
  • Loading branch information...
2 parents cd6bfae + 0673292 commit cf22d1492f8bed3264bca20dcaa8d6b0f4aa305d @bobthecow committed Jul 9, 2012
Showing with 4,815 additions and 4,847 deletions.
  1. +2 −0 .gitignore
  2. +5 −2 .gitmodules
  3. +5 −0 .travis.yml
  4. +0 −931 Mustache.php
  5. +0 −85 MustacheLoader.php
  6. +11 −46 README.markdown
  7. +35 −36 bin/create_example.php
  8. +21 −0 composer.json
  9. +0 −13 examples/child_context/ChildContext.php
  10. +0 −7 examples/comments/Comments.php
  11. +0 −19 examples/complex/complex.php
  12. +0 −14 examples/delimiters/Delimiters.php
  13. +0 −20 examples/dot_notation/DotNotation.php
  14. +0 −9 examples/double_section/DoubleSection.php
  15. +0 −5 examples/escaped/Escaped.php
  16. +0 −24 examples/grand_parent_context/GrandParentContext.php
  17. +0 −5 examples/implicit_iterator/ImplicitIterator.php
  18. +0 −6 examples/inverted_double_section/InvertedDoubleSection.php
  19. +0 −5 examples/inverted_section/InvertedSection.php
  20. +0 −2 examples/inverted_section/inverted_section.mustache
  21. +0 −1 examples/inverted_section/inverted_section.txt
  22. +0 −13 examples/partials/Partials.php
  23. +0 −2 examples/partials/partials.mustache
  24. +0 −3 examples/partials/partials.txt
  25. +0 −19 examples/partials_with_view_class/PartialsWithViewClass.php
  26. +0 −2 examples/partials_with_view_class/partials_with_view_class.mustache
  27. +0 −3 examples/partials_with_view_class/partials_with_view_class.txt
  28. +0 −5 examples/pragma_unescaped/PragmaUnescaped.php
  29. +0 −3 examples/pragma_unescaped/pragma_unescaped.mustache
  30. +0 −2 examples/pragma_unescaped/pragma_unescaped.txt
  31. +0 −8 examples/pragmas_in_partials/PragmasInPartials.php
  32. +0 −3 examples/pragmas_in_partials/pragmas_in_partials.mustache
  33. +0 −2 examples/pragmas_in_partials/pragmas_in_partials.txt
  34. +0 −16 examples/recursive_partials/RecursivePartials.php
  35. +0 −16 examples/section_iterator_objects/SectionIteratorObjects.php
  36. +0 −26 examples/section_magic_objects/SectionMagicObjects.php
  37. +0 −16 examples/section_objects/SectionObjects.php
  38. +0 −14 examples/sections/Sections.php
  39. +0 −33 examples/sections_nested/SectionsNested.php
  40. +0 −12 examples/simple/Simple.php
  41. +0 −5 examples/unescaped/Unescaped.php
  42. +0 −5 examples/utf8/UTF8.php
  43. +0 −5 examples/utf8_unescaped/UTF8Unescaped.php
  44. +0 −37 examples/whitespace/Whitespace.php
  45. +17 −0 phpunit.xml.dist
  46. +69 −0 src/Mustache/Autoloader.php
  47. +386 −0 src/Mustache/Compiler.php
  48. +149 −0 src/Mustache/Context.php
  49. +589 −0 src/Mustache/Engine.php
  50. +168 −0 src/Mustache/HelperCollection.php
  51. +26 −0 src/Mustache/Loader.php
  52. +79 −0 src/Mustache/Loader/ArrayLoader.php
  53. +118 −0 src/Mustache/Loader/FilesystemLoader.php
  54. +32 −0 src/Mustache/Loader/MutableLoader.php
  55. +42 −0 src/Mustache/Loader/StringLoader.php
  56. +88 −0 src/Mustache/Parser.php
  57. +149 −0 src/Mustache/Template.php
  58. +286 −0 src/Mustache/Tokenizer.php
  59. +36 −0 test/Mustache/Test/AutoloaderTest.php
  60. +103 −0 test/Mustache/Test/CompilerTest.php
  61. +119 −0 test/Mustache/Test/ContextTest.php
  62. +256 −0 test/Mustache/Test/EngineTest.php
  63. +71 −0 test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
  64. +114 −0 test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
  65. +40 −0 test/Mustache/Test/Functional/CallTest.php
  66. +142 −0 test/Mustache/Test/Functional/ExamplesTest.php
  67. +106 −0 test/Mustache/Test/Functional/HigherOrderSectionsTest.php
  68. +152 −0 test/Mustache/Test/Functional/MustacheInjectionTest.php
  69. +175 −0 test/Mustache/Test/Functional/MustacheSpecTest.php
  70. +110 −0 test/Mustache/Test/Functional/ObjectSectionTest.php
  71. +163 −0 test/Mustache/Test/HelperCollectionTest.php
  72. +52 −0 test/Mustache/Test/Loader/ArrayLoaderTest.php
  73. +51 −0 test/Mustache/Test/Loader/FilesystemLoaderTest.php
  74. +25 −0 test/Mustache/Test/Loader/StringLoaderTest.php
  75. +182 −0 test/Mustache/Test/ParserTest.php
  76. +55 −0 test/Mustache/Test/TemplateTest.php
  77. +144 −0 test/Mustache/Test/TokenizerTest.php
  78. +0 −24 test/MustacheCallTest.php
  79. +0 −152 test/MustacheExceptionTest.php
  80. +0 −114 test/MustacheHigherOrderSectionsTest.php
  81. +0 −127 test/MustacheInjectionTest.php
  82. +0 −60 test/MustacheLoaderTest.php
  83. +0 −73 test/MustacheObjectSectionTest.php
  84. +0 −74 test/MustachePragmaTest.php
  85. +0 −19 test/MustachePragmaUnescapedTest.php
  86. +0 −174 test/MustacheSpecTest.php
  87. +0 −464 test/MustacheTest.php
  88. +15 −0 test/bootstrap.php
  89. +15 −0 test/fixtures/autoloader/Mustache/Bar.php
  90. +15 −0 test/fixtures/autoloader/Mustache/Foo.php
  91. +15 −0 test/fixtures/autoloader/NonMustacheClass.php
  92. +0 −1 test/fixtures/bar.mustache
  93. +14 −0 test/fixtures/examples/child_context/ChildContext.php
  94. 0 { → test/fixtures}/examples/child_context/child_context.mustache
  95. 0 { → test/fixtures}/examples/child_context/child_context.txt
  96. +9 −0 test/fixtures/examples/comments/Comments.php
  97. 0 { → test/fixtures}/examples/comments/comments.mustache
  98. 0 { → test/fixtures}/examples/comments/comments.txt
  99. 0 { → test/fixtures}/examples/complex/complex.mustache
  100. +22 −0 test/fixtures/examples/complex/complex.php
  101. 0 { → test/fixtures}/examples/complex/complex.txt
  102. +16 −0 test/fixtures/examples/delimiters/Delimiters.php
  103. 0 { → test/fixtures}/examples/delimiters/delimiters.mustache
  104. 0 { → test/fixtures}/examples/delimiters/delimiters.txt
  105. +15 −0 test/fixtures/examples/dot_notation/DotNotation.php
  106. +1 −2 { → test/fixtures}/examples/dot_notation/dot_notation.mustache
  107. +1 −2 { → test/fixtures}/examples/dot_notation/dot_notation.txt
  108. +11 −0 test/fixtures/examples/double_section/DoubleSection.php
  109. 0 { → test/fixtures}/examples/double_section/double_section.mustache
  110. 0 { → test/fixtures}/examples/double_section/double_section.txt
  111. +6 −0 test/fixtures/examples/escaped/Escaped.php
  112. 0 { → test/fixtures}/examples/escaped/escaped.mustache
  113. 0 { → test/fixtures}/examples/escaped/escaped.txt
  114. +24 −0 test/fixtures/examples/grand_parent_context/GrandParentContext.php
  115. 0 { → test/fixtures}/examples/grand_parent_context/grand_parent_context.mustache
  116. 0 { → test/fixtures}/examples/grand_parent_context/grand_parent_context.txt
  117. +4 −2 { → test/fixtures}/examples/i18n/I18n.php
  118. 0 { → test/fixtures}/examples/i18n/i18n.mustache
  119. 0 { → test/fixtures}/examples/i18n/i18n.txt
  120. +6 −0 test/fixtures/examples/implicit_iterator/ImplicitIterator.php
  121. 0 { → test/fixtures}/examples/implicit_iterator/implicit_iterator.mustache
  122. 0 { → test/fixtures}/examples/implicit_iterator/implicit_iterator.txt
  123. +7 −0 test/fixtures/examples/inverted_double_section/InvertedDoubleSection.php
  124. 0 { → test/fixtures}/examples/inverted_double_section/inverted_double_section.mustache
  125. 0 { → test/fixtures}/examples/inverted_double_section/inverted_double_section.txt
  126. +6 −0 test/fixtures/examples/inverted_section/InvertedSection.php
  127. +6 −0 test/fixtures/examples/inverted_section/inverted_section.mustache
  128. +1 −0 test/fixtures/examples/inverted_section/inverted_section.txt
  129. +9 −0 test/fixtures/examples/partials/Partials.php
  130. +7 −0 test/fixtures/examples/partials/partials.mustache
  131. +8 −0 test/fixtures/examples/partials/partials.txt
  132. +4 −0 test/fixtures/examples/partials/partials/header.mustache
  133. +13 −0 test/fixtures/examples/recursive_partials/RecursivePartials.php
  134. +1 −0 test/fixtures/examples/recursive_partials/partials/child.mustache
  135. 0 { → test/fixtures}/examples/recursive_partials/recursive_partials.mustache
  136. 0 { → test/fixtures}/examples/recursive_partials/recursive_partials.txt
  137. +18 −0 test/fixtures/examples/section_iterator_objects/SectionIteratorObjects.php
  138. 0 { → test/fixtures}/examples/section_iterator_objects/section_iterator_objects.mustache
  139. 0 { → test/fixtures}/examples/section_iterator_objects/section_iterator_objects.txt
  140. +31 −0 test/fixtures/examples/section_magic_objects/SectionMagicObjects.php
  141. 0 { → test/fixtures}/examples/section_magic_objects/section_magic_objects.mustache
  142. 0 { → test/fixtures}/examples/section_magic_objects/section_magic_objects.txt
  143. +19 −0 test/fixtures/examples/section_objects/SectionObjects.php
  144. 0 { → test/fixtures}/examples/section_objects/section_objects.mustache
  145. 0 { → test/fixtures}/examples/section_objects/section_objects.txt
  146. +16 −0 test/fixtures/examples/sections/Sections.php
  147. 0 { → test/fixtures}/examples/sections/sections.mustache
  148. 0 { → test/fixtures}/examples/sections/sections.txt
  149. +35 −0 test/fixtures/examples/sections_nested/SectionsNested.php
  150. 0 { → test/fixtures}/examples/sections_nested/sections_nested.mustache
  151. 0 { → test/fixtures}/examples/sections_nested/sections_nested.txt
  152. +14 −0 test/fixtures/examples/simple/Simple.php
  153. 0 { → test/fixtures}/examples/simple/simple.mustache
  154. 0 { → test/fixtures}/examples/simple/simple.txt
  155. +6 −0 test/fixtures/examples/unescaped/Unescaped.php
  156. 0 { → test/fixtures}/examples/unescaped/unescaped.mustache
  157. 0 { → test/fixtures}/examples/unescaped/unescaped.txt
  158. +6 −0 test/fixtures/examples/utf8/UTF8.php
  159. 0 { → test/fixtures}/examples/utf8/utf8.mustache
  160. 0 { → test/fixtures}/examples/utf8/utf8.txt
  161. +6 −0 test/fixtures/examples/utf8_unescaped/UTF8Unescaped.php
  162. 0 { → test/fixtures}/examples/utf8_unescaped/utf8_unescaped.mustache
  163. 0 { → test/fixtures}/examples/utf8_unescaped/utf8_unescaped.txt
  164. +34 −0 test/fixtures/examples/whitespace/Whitespace.php
  165. +1 −0 test/fixtures/examples/whitespace/partials/alphabet.mustache
  166. 0 { → test/fixtures}/examples/whitespace/whitespace.mustache
  167. 0 { → test/fixtures}/examples/whitespace/whitespace.txt
  168. +0 −1 test/fixtures/foo.mustache
  169. +1 −0 test/fixtures/templates/alpha.ms
  170. +1 −0 test/fixtures/templates/beta.ms
  171. +1 −0 test/fixtures/templates/one.mustache
  172. +1 −0 test/fixtures/templates/two.mustache
  173. +0 −19 test/lib/yaml/LICENSE
  174. +0 −15 test/lib/yaml/README.markdown
  175. +0 −143 test/lib/yaml/doc/00-Introduction.markdown
  176. +0 −110 test/lib/yaml/doc/01-Usage.markdown
  177. +0 −312 test/lib/yaml/doc/02-YAML.markdown
  178. +0 −108 test/lib/yaml/doc/A-License.markdown
  179. +0 −135 test/lib/yaml/lib/sfYaml.php
  180. +0 −60 test/lib/yaml/lib/sfYamlDumper.php
  181. +0 −442 test/lib/yaml/lib/sfYamlInline.php
  182. +0 −622 test/lib/yaml/lib/sfYamlParser.php
  183. +0 −102 test/lib/yaml/package.xml
  184. +0 −10 test/phpunit.xml
  185. 0 {test → vendor}/spec
  186. +1 −0 vendor/yaml
View
@@ -0,0 +1,2 @@
+composer.lock
+vendor
View
@@ -1,3 +1,6 @@
-[submodule "test/spec"]
- path = test/spec
+[submodule "vendor/spec"]
+ path = vendor/spec
url = git://github.com/mustache/spec.git
+[submodule "vendor/yaml"]
+ path = vendor/yaml
+ url = git://github.com/fabpot/yaml.git
View
@@ -0,0 +1,5 @@
+language: php
+php:
+ - 5.2
+ - 5.3
+ - 5.4
Oops, something went wrong.

0 comments on commit cf22d14

Please sign in to comment.