geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
642 Commits 9 Branches 273 Tags
fbadd6685206ccd094b5f313fe290294c2dde36e
Commit Graph

642 Commits

This Branch
This Branch
All Branches
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 d45c980a41 refactored some tests 2011-04-12 10:21:00 +02:00
Fabien Potencier d84b978e1a fixed some tests 2011-04-12 09:58:10 +02:00
Fabien Potencier 34ff3b4a76 tweaked error wrapping 2011-04-12 09:32:38 +02:00
Fabien Potencier 945b0bce9e refactored some tests 2011-04-12 09:31:35 +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 27f44bfe54 Merge remote branch 'nikic/fixWrongMethodCallInTest' 
* nikic/fixWrongMethodCallInTest:
  $e->setFilename to $e->setTemplateFile in integrationTest
 2011-04-11 18:51:49 +02:00
Hugo Hamon 599a508d89 [doc] added the link to the Twig Netbeans plugin. 2011-04-07 00:31:51 +02:00
nikic 9a79078dd2 $e->setFilename to $e->setTemplateFile in integrationTest 2011-03-30 17:37:23 +02:00
Fabien Potencier 2f106a80cc fixed CHANGELOG v1.0.0 2011-03-27 21:17:16 +02:00
Fabien Potencier 8fb005220e updated CHANGELOG 2011-03-27 19:28:16 +02:00
Fabien Potencier 81d03de46b added some tests 2011-03-27 18:53:52 +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 7d78d5f7a8 added a test 2011-03-27 18:13:59 +02:00
Fabien Potencier 8ab31e0626 added some cleanup in unit tests 2011-03-27 17:50:50 +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
Fabien Potencier 79ab9babed Merge remote branch 'markstory/ticket-277' 
* markstory/ticket-277:
  Updating documentation for blocks, mentioning that block names cannot contain -.  Fixes #277
 2011-03-21 19:24:59 +01:00
Marc Abramowitz 081b26c366 Correct spelling error (in 3 places): "unkown" -> "unknown" 2011-03-21 19:07:25 +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
Anomareh bec8839394 Added a link to the Twig TextMate bundle and fixed a typo. 2011-03-13 09:28:05 +01:00
Fabien Potencier 720cc7e2e1 fixed typo 2011-03-11 19:09:05 +01:00
Fabien Potencier e8fa22a43b added a recipe 2011-03-11 13:29:40 +01:00
Mark Story 92b0ec434f Updating documentation for blocks, mentioning that block names cannot contain -. Fixes #277 2011-03-10 22:35:36 -05:00
Pascal Borreli bfb8f84a44 [Twig] renamed: phpunit.xml -> phpunit.xml.dist 2011-03-10 16:58:38 -08:00
Fabien Potencier a1c33ec0d3 updated CHANGELOG v1.0.0-RC2 2011-02-21 16:04:18 +01:00
Fabien Potencier 1ac5075879 updated documentation and added a unit test 2011-02-18 16:25:30 +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
Martin Hason a9127329fb fixed test covers 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