Commit Graph

456 Commits

Author SHA1 Message Date
Fabien Potencier fbadd66852 tweaked error message when wrapping an external exception 2011-04-12 15:40:26 +02:00
Fabien Potencier 4d2727f004 made Twig_Error::findTemplateInfo() more robust 2011-04-12 14:42:00 +02:00
Fabien Potencier 34ff3b4a76 tweaked error wrapping 2011-04-12 09:32:38 +02:00
Fabien Potencier 96f2261112 removed line parameter from Twig_Template::getAttribute() and getContext() as the information is now gathered by Twig_Error_Wrapped 2011-04-12 08:12:27 +02:00
Fabien Potencier ad427be36e added a Twig_Error_Wrapped exception to try to add template name and line when a problem occurs at runtime 2011-04-12 07:59:36 +02:00
Fabien Potencier 4f37cdd08d Revert "deleted abstract method doDisplay (maintain BC)"
This reverts commit 70d90bedce.
2011-04-12 07:54:05 +02:00
Fabien Potencier 9c17a51fe4 Merge remote branch 'hason/template'
* hason/template:
  deleted abstract method doDisplay (maintain BC)
  added possibility to customize "display" in the base template class
2011-04-12 07:53:48 +02:00
Fabien Potencier 340b22c5e0 Merge remote branch 'nikic/fixSandboxDuplicateMethodCalls'
* nikic/fixSandboxDuplicateMethodCalls:
  fix duplicate call of methods if using sandbox
2011-03-27 18:49:04 +02:00
Fabien Potencier d99edfc8f4 replaced the Twig_Environment::load() shortcut by a more useful render() one 2011-03-26 10:24:45 +01:00
Jordi Boggiano 214af8f9b5 Ensure all mbstring calls have the charset specified 2011-03-23 16:39:25 +01:00
Fabien Potencier 47fa8535b6 added Twig_Environment::load() as an alias for loadTemplate() 2011-03-22 11:58:42 +01:00
nikic 7cb09a5fbf fix duplicate call of methods if using sandbox 2011-03-17 18:27:08 +01:00
Fabien Potencier 64f8709de2 made the charset configurable for the escape filter 2011-03-17 08:02:42 +01:00
nikic 01b8c7cfae capturing {% set %} should give Twig_Markup 2011-02-18 16:12:30 +01:00
nikic 49e542b507 remove old code for setting all optimizers 2011-02-18 09:32:29 +01:00
nikic 587063efbf add some more DocComments / type hints 2011-02-18 09:32:28 +01:00
Fabien Potencier c0945a255d added support for macro name in the endmacro tag 2011-02-17 13:36:40 +01:00
nikic c08ed75c18 fix some typos 2011-02-09 06:50:09 +01:00
nikic 8b0d71fb33 swap GetAttr constructor arguments for from .. import macros 2011-02-09 06:48:48 +01:00
Fabien Potencier d479a704c6 fixed typos 2011-02-08 15:39:03 +01:00
Fabien Potencier f9c570e5c3 added a way for template name to be anything 2011-02-06 21:09:23 +01:00
Fabien Potencier bb7e422909 Revert "added the possibility to pass a readable name for templates"
This reverts commit 7a7c23f197.
2011-02-06 21:03:13 +01:00
Fabien Potencier 4501984e5d fixed filter tag 2011-02-05 23:57:22 +01:00
Fabien Potencier 7a7c23f197 added the possibility to pass a readable name for templates 2011-02-04 12:53:35 +01:00
Fabien Potencier 529721d773 fixed wrong usage of loadTemplate() 2011-02-04 12:53:34 +01:00
Martin Hason 46eb49e7e5 fixed functions 2011-02-04 00:55:51 +01:00
Fabien Potencier d43e346324 fixed __call() 2011-02-04 00:51:34 +01:00
Martin Hason 8adcbd971d make Twig_Error compatible with PHP 5.3.0 > 2011-02-04 00:48:00 +01:00
Martin Hason 70d90bedce deleted abstract method doDisplay (maintain BC) 2011-02-02 21:20:22 +01:00
Martin Hason f93a857126 added possibility to customize "display" in the base template class 2011-02-02 14:41:20 +01:00
Fabien Potencier 4e6011d1ac fixes an infinite loop on some Windows configurations 2011-01-31 08:48:35 +01:00
Fabien Potencier 051e6ab829 fixed possible warning 2011-01-27 23:12:35 +01:00
Fabien Potencier 5b6d255a55 fixed the "length" filter for numbers 2011-01-22 09:12:57 +01:00
Fabien Potencier d7ca8375fd made a small tweak 2011-01-17 07:45:12 +01:00
Fabien Potencier 4e62a4d1b4 fixed typo in phpdoc 2011-01-16 07:55:52 +01:00
Fabien Potencier 64f63bef19 removed coupling between Twig_Node and Twig_Template
This coupling was bad as Twig_Node should only be useful
during compilation.

So, the Twig_Node_Expression_GetAttr constants have been moved
to Twig_TemplateInterface.
2011-01-16 07:49:01 +01:00
Fabien Potencier 11a8f31c5a made Twig_Loader_Filesystem more flexible 2011-01-15 12:05:44 +01:00
Fabien Potencier 05f20f88d2 fixed Template::getAttribute() as properties in PHP are case sensitive 2011-01-13 10:35:31 +01:00
Martin Hason fb4d1c2214 add methods and fix naming of methods in Twig_Error 2011-01-13 09:27:46 +01:00
Fabien Potencier f44f0cd109 fixed text token with only '0' as content 2011-01-10 19:13:18 +01:00
Fabien Potencier ac9e4eec15 fixed the ternary operator 2011-01-10 19:07:04 +01:00
Fabien Potencier e96ed3f66c bumped version for dev 2011-01-09 09:56:15 +01:00
Fabien Potencier b5d97e2c18 updated CHANGELOG and bumped version to 1.0.0-RC1 2011-01-09 09:47:02 +01:00
Fabien Potencier 1f7d142351 added callbacks for undefined functions and filters 2011-01-08 15:16:33 +01:00
Fabien Potencier 57d8bf97af added a way to catch undefined filters (like functions) 2011-01-08 15:13:15 +01:00
Fabien Potencier 6e24ef18db fixed typo 2011-01-08 14:40:26 +01:00
nikic 7048606421 fix loader doccomments 2011-01-08 14:34:57 +01:00
Fabien Potencier 8da408339b fixed a notice in a unit test 2011-01-07 17:28:00 +01:00
Martin Hason 05a12f0820 fix line number in error exceptions 2011-01-07 17:27:17 +01:00
Martin Hason 7e53fbc99e added support for line number in Twig_Template::getAttribute() 2011-01-07 10:22:59 +01:00