Permalink
Browse files

Update Twig template libraries to v0.9.9-DEV / c0334a3e8d6abf45c40db3…

…e94370c322bbf532e1
  • Loading branch information...
1 parent ae6af7c commit 086997d95b60f9b63562c71becd98812d7182261 @lmorchard committed Jul 27, 2010
Showing with 5,840 additions and 5,791 deletions.
  1. +3 −4 application/controllers/util.php
  2. +20 −0 application/libraries/MY_ORM.php
  3. +197 −187 application/locale/en_US/LC_MESSAGES/messages.po
  4. +218 −208 application/locale/keys.pot
  5. +4 −4 application/views/auth_profiles/changeemail.html
  6. +3 −4 application/views/auth_profiles/changepassword.html
  7. +4 −4 application/views/auth_profiles/editprofile.html
  8. +2 −3 application/views/auth_profiles/forgotpassword.html
  9. +2 −3 application/views/auth_profiles/login.html
  10. +3 −3 application/views/auth_profiles/register.html
  11. +5 −5 application/views/auth_profiles/settings.html
  12. +5 −4 application/views/index/index_shell.html
  13. +1 −1 application/views/macros/forms.html
  14. +5 −5 application/views/plugins/activitylog.html
  15. +4 −4 application/views/plugins/addtrusted.html
  16. +1 −1 application/views/plugins/copy.html
  17. +7 −8 application/views/plugins/create.html
  18. +1 −1 application/views/plugins/delete.html
  19. +1 −1 application/views/plugins/deploy.html
  20. +11 −11 application/views/plugins/detail.html
  21. +8 −7 application/views/plugins/edit.html
  22. +4 −4 application/views/plugins/removetrusted.html
  23. +1 −1 application/views/plugins/requestpush.html
  24. +2 −2 application/views/plugins/sandbox.html
  25. +1 −1 application/views/plugins/sandbox_listing.html
  26. +4 −4 application/views/search/results.html
  27. +36 −24 modules/twig/libraries/Twig_Extension_L10N.php
  28. +22 −23 modules/twig/vendor/Twig/Autoloader.php
  29. +183 −210 modules/twig/vendor/Twig/Compiler.php
  30. +14 −14 modules/twig/vendor/Twig/CompilerInterface.php
  31. +337 −314 modules/twig/vendor/Twig/Environment.php
  32. +392 −430 modules/twig/vendor/Twig/ExpressionParser.php
  33. +35 −35 modules/twig/vendor/Twig/Extension.php
  34. +199 −213 modules/twig/vendor/Twig/Extension/Core.php
  35. +48 −48 modules/twig/vendor/Twig/Extension/Escaper.php
  36. +32 −0 modules/twig/vendor/Twig/Extension/I18n.php
  37. +72 −65 modules/twig/vendor/Twig/Extension/Sandbox.php
  38. +0 −16 modules/twig/vendor/Twig/Extension/Set.php
  39. +30 −30 modules/twig/vendor/Twig/ExtensionInterface.php
  40. +17 −19 modules/twig/vendor/Twig/Filter.php
  41. +10 −10 modules/twig/vendor/Twig/Filter/Function.php
  42. +11 −11 modules/twig/vendor/Twig/Filter/Method.php
  43. +4 −12 modules/twig/vendor/Twig/{NodeListInterface.php → FilterInterface.php}
  44. +30 −0 modules/twig/vendor/Twig/Grammar.php
  45. +22 −0 modules/twig/vendor/Twig/Grammar/Arguments.php
  46. +22 −0 modules/twig/vendor/Twig/Grammar/Array.php
  47. +39 −0 modules/twig/vendor/Twig/Grammar/Body.php
  48. +24 −0 modules/twig/vendor/Twig/Grammar/Boolean.php
  49. +24 −0 modules/twig/vendor/Twig/Grammar/Constant.php
  50. +22 −0 modules/twig/vendor/Twig/Grammar/Expression.php
  51. +24 −0 modules/twig/vendor/Twig/Grammar/Number.php
  52. +64 −0 modules/twig/vendor/Twig/Grammar/Optional.php
  53. +56 −0 modules/twig/vendor/Twig/Grammar/Tag.php
  54. +18 −0 modules/twig/vendor/Twig/GrammarInterface.php
  55. +243 −259 modules/twig/vendor/Twig/Lexer.php
  56. +9 −9 modules/twig/vendor/Twig/LexerInterface.php
  57. +0 −136 modules/twig/vendor/Twig/Loader.php
  58. +49 −52 modules/twig/vendor/Twig/Loader/Array.php
  59. +91 −98 modules/twig/vendor/Twig/Loader/Filesystem.php
  60. +32 −32 modules/twig/vendor/Twig/Loader/String.php
  61. +23 −23 modules/twig/vendor/Twig/LoaderInterface.php
  62. +0 −13 modules/twig/vendor/Twig/Macro.php
  63. +210 −26 modules/twig/vendor/Twig/Node.php
  64. +18 −39 modules/twig/vendor/Twig/Node/AutoEscape.php
  65. +22 −69 modules/twig/vendor/Twig/Node/Block.php
  66. +16 −24 modules/twig/vendor/Twig/Node/BlockReference.php
  67. +58 −29 modules/twig/vendor/Twig/Node/Debug.php
  68. +24 −55 modules/twig/vendor/Twig/Node/Expression/Array.php
  69. +9 −4 modules/twig/vendor/Twig/Node/Expression/AssignName.php
  70. +20 −41 modules/twig/vendor/Twig/Node/Expression/Binary.php
  71. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Add.php
  72. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/And.php
  73. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Concat.php
  74. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Div.php
  75. +15 −14 modules/twig/vendor/Twig/Node/Expression/Binary/FloorDiv.php
  76. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Mod.php
  77. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Mul.php
  78. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Or.php
  79. +4 −4 modules/twig/vendor/Twig/Node/Expression/Binary/Sub.php
  80. +38 −50 modules/twig/vendor/Twig/Node/Expression/Compare.php
  81. +16 −23 modules/twig/vendor/Twig/Node/Expression/Conditional.php
  82. +8 −21 modules/twig/vendor/Twig/Node/Expression/Constant.php
  83. +59 −100 modules/twig/vendor/Twig/Node/Expression/Filter.php
  84. +26 −55 modules/twig/vendor/Twig/Node/Expression/GetAttr.php
  85. +16 −21 modules/twig/vendor/Twig/Node/Expression/Name.php
  86. +12 −26 modules/twig/vendor/Twig/Node/Expression/Unary.php
  87. +4 −4 modules/twig/vendor/Twig/Node/Expression/Unary/Neg.php
  88. +4 −4 modules/twig/vendor/Twig/Node/Expression/Unary/Not.php
  89. +4 −4 modules/twig/vendor/Twig/Node/Expression/Unary/Pos.php
  90. +0 −55 modules/twig/vendor/Twig/Node/Filter.php
  91. +99 −123 modules/twig/vendor/Twig/Node/For.php
  92. +38 −96 modules/twig/vendor/Twig/Node/If.php
  93. +28 −42 modules/twig/vendor/Twig/Node/Import.php
  94. +39 −101 modules/twig/vendor/Twig/Node/Include.php
  95. +38 −72 modules/twig/vendor/Twig/Node/Macro.php
  96. +123 −196 modules/twig/vendor/Twig/Node/Module.php
  97. +16 −19 modules/twig/vendor/Twig/Node/Parent.php
  98. +17 −42 modules/twig/vendor/Twig/Node/Print.php
  99. +49 −0 modules/twig/vendor/Twig/Node/Sandbox.php
  100. +69 −0 modules/twig/vendor/Twig/Node/SandboxedModule.php
  101. +53 −0 modules/twig/vendor/Twig/Node/SandboxedPrint.php
  102. +62 −91 modules/twig/vendor/Twig/Node/Set.php
  103. +18 −26 modules/twig/vendor/Twig/Node/Text.php
  104. +114 −0 modules/twig/vendor/Twig/Node/Trans.php
  105. +31 −0 modules/twig/vendor/Twig/NodeInterface.php
  106. +0 −62 modules/twig/vendor/Twig/NodeList.php
  107. +0 −42 modules/twig/vendor/Twig/NodeTransformer.php
  108. +0 −39 modules/twig/vendor/Twig/NodeTransformer/Chain.php
  109. +0 −84 modules/twig/vendor/Twig/NodeTransformer/Escaper.php
  110. +0 −68 modules/twig/vendor/Twig/NodeTransformer/Filter.php
  111. +0 −58 modules/twig/vendor/Twig/NodeTransformer/Sandbox.php
  112. +61 −20 modules/twig/vendor/Twig/NodeTraverser.php
  113. +93 −90 modules/twig/vendor/Twig/NodeVisitor/Escaper.php
  114. +0 −75 modules/twig/vendor/Twig/NodeVisitor/Filter.php
  115. +60 −38 modules/twig/vendor/Twig/NodeVisitor/Sandbox.php
  116. +34 −2 modules/twig/vendor/Twig/NodeVisitorInterface.php
  117. +185 −181 modules/twig/vendor/Twig/Parser.php
  118. +8 −8 modules/twig/vendor/Twig/ParserInterface.php
  119. +0 −72 modules/twig/vendor/Twig/Resource.php
  120. +58 −68 modules/twig/vendor/Twig/Sandbox/SecurityPolicy.php
  121. +3 −3 modules/twig/vendor/Twig/Sandbox/SecurityPolicyInterface.php
  122. +128 −0 modules/twig/vendor/Twig/SimpleTokenParser.php
  123. +24 −24 modules/twig/vendor/Twig/SyntaxError.php
  124. +143 −19 modules/twig/vendor/Twig/Template.php
  125. +20 −20 modules/twig/vendor/Twig/TemplateInterface.php
  126. +93 −95 modules/twig/vendor/Twig/Token.php
  127. +6 −11 modules/twig/vendor/Twig/TokenParser.php
  128. +40 −20 modules/twig/vendor/Twig/TokenParser/AutoEscape.php
  129. +47 −41 modules/twig/vendor/Twig/TokenParser/Block.php
  130. +34 −15 modules/twig/vendor/Twig/TokenParser/Debug.php
  131. +25 −15 modules/twig/vendor/Twig/TokenParser/Display.php
  132. +25 −13 modules/twig/vendor/Twig/TokenParser/Extends.php
  133. +42 −21 modules/twig/vendor/Twig/TokenParser/Filter.php
  134. +53 −37 modules/twig/vendor/Twig/TokenParser/For.php
  135. +62 −43 modules/twig/vendor/Twig/TokenParser/If.php
  136. +24 −12 modules/twig/vendor/Twig/TokenParser/Import.php
  137. +27 −22 modules/twig/vendor/Twig/TokenParser/Include.php
  138. +31 −19 modules/twig/vendor/Twig/TokenParser/Macro.php
  139. +23 −12 modules/twig/vendor/Twig/TokenParser/Parent.php
  140. +43 −0 modules/twig/vendor/Twig/TokenParser/Sandbox.php
  141. +56 −16 modules/twig/vendor/Twig/TokenParser/Set.php
  142. +80 −0 modules/twig/vendor/Twig/TokenParser/Trans.php
  143. +30 −0 modules/twig/vendor/Twig/TokenParserInterface.php
  144. +126 −129 modules/twig/vendor/Twig/TokenStream.php
  145. +0 −201 modules/twig/vendor/Twig/runtime.php
  146. +0 −16 modules/twig/vendor/Twig/runtime_escaper.php
@@ -185,11 +185,10 @@ function compiletemplates()
// Load and compile the template
$tmpl = twigutil::loadTemplate($fn);
// Find the filename for the compiled template PHP
- $tmpl_name = $tmpl->getName();
- $cache_fn = twigutil::getEnv()->getCacheFilename($tmpl_name);
+ $cache_fn = twigutil::getEnv()->getCacheFilename($fn);
// Copy the compiled PHP to the temporary directory structure
- copy($cache_fn, "$tmp_dir/$tmpl_name");
- echo "\t$tmpl_name\n";
+ copy($cache_fn, "$tmp_dir/$fn");
+ echo "\t$fn\n";
}
}
@@ -90,4 +90,24 @@ public function save()
return parent::save();
}
+ /**
+ * HACK: Wrap Kohana's ORM method call hack in our own hack that eats up
+ * "Invalid method" exceptions when methods named for table columns are
+ * called. This is a dirty, dirty workaround for Twig's admittedly
+ * reasonable reliance on an object actually reporting a method as
+ * non-callable when it's non-callable.
+ */
+ public function __call($method, array $args)
+ {
+ try {
+ return parent::__call($method, $args);
+ } catch (Kohana_Exception $e) {
+ if (isset($this->table_columns[$method])) {
+ return null;
+ } else {
+ throw $e;
+ }
+ }
+ }
+
}
Oops, something went wrong.

0 comments on commit 086997d

Please sign in to comment.