Commit Graph

1554 Commits

Author SHA1 Message Date
Arnaud Le Blanc 228d2b0351 [ext] use only read_property handler 2012-08-23 11:54:31 +02:00
Fabien Potencier 5521430629 merged branch arnaud-lb/807 (PR #812)
Commits
-------

3ca6654 avoid crash when TWIG_GET_ARRAY_ELEMENT returns NULL
3694d4b allow --EXCEPTION-- tests to have a --DATA-- block

Discussion
----------

Fix for #807 (Segmentation fault when exception thrown inside any of ArrayAccess implementation methods)

This fixes #807
2012-08-20 21:10:44 +02:00
Arnaud Le Blanc 3ca6654617 avoid crash when TWIG_GET_ARRAY_ELEMENT returns NULL
fixes #807
2012-08-20 20:28:22 +02:00
Arnaud Le Blanc 3694d4b2bf allow --EXCEPTION-- tests to have a --DATA-- block 2012-08-20 20:27:57 +02:00
Fabien Potencier 3e4057b4b1 merged branch garak/patch-1 (PR #809)
Commits
-------

fce92f8 Update doc/templates.rst

Discussion
----------

Update doc/templates.rst

Komodo and Komodo Edit have builtin Twig support since last version (7.1)
2012-08-17 19:01:21 +02:00
Massimiliano Arione fce92f84d5 Update doc/templates.rst
Komodo and Komodo Edit have builtin Twig support since last version (7.1)
2012-08-17 18:14:24 +03:00
Fabien Potencier f2f698c820 merged branch sdepablos/master (PR #802)
Commits
-------

b98fff1 Added missing abs and date_modify functions to the filters toctree

Discussion
----------

Added missing abs and date_modify functions to the filters toctree

Both abs.rst and date_modify.rst were createad, but were not linked on the filters toctree
2012-08-07 10:38:05 +02:00
Sergi de Pablos b98fff166e Added missing abs and date_modify functions to the filters toctree 2012-08-07 10:31:19 +02:00
Fabien Potencier 51c866f415 added a test to verify that the merge filter actually behaves like said in the documentation (closes #789) 2012-07-28 10:32:13 +02:00
Fabien Potencier 657de7bdeb bumped version to 1.9.2-DEV 2012-07-22 12:32:58 +02:00
Fabien Potencier 9228acc809 prepared the 1.9.1 release v1.9.1 2012-07-22 12:25:41 +02:00
Fabien Potencier 14a472b489 reverted partially a previous commit
This code was not only useful for macros but also when you call a method on
a template instance -- this is not recommended/supported but used by the Symfony profiler)
2012-07-22 00:11:46 +02:00
Fabien Potencier 8832b660b8 optimized macro calls when auto-escaping is on (closes #779) 2012-07-21 23:28:53 +02:00
Fabien Potencier b5d62a192e moved some macro related logic to the generated code 2012-07-21 22:47:06 +02:00
Fabien Potencier 8a84838798 merged branch acasademont/patch-1 (PR #781)
Commits
-------

ee87848 Little typo
c31dd7b The empty test now also checks for empty arrays

Discussion
----------

The empty test now also checks for empty arrays

Little change in the docs to reflect that, as i had to check the source code to see if it worked
2012-07-20 14:41:38 +02:00
Albert Casademont ee87848751 Little typo 2012-07-19 14:03:26 +03:00
Albert Casademont c31dd7bccb The empty test now also checks for empty arrays 2012-07-19 14:00:01 +03:00
Fabien Potencier 7c3b987742 updated CHANGELOG 2012-07-19 07:29:29 +02:00
Fabien Potencier b9ce606382 merged branch pborreli/master (PR #771)
Commits
-------

1c98282 Removed duplicate array keys
30a168c Fixing typos

Discussion
----------

Fixed typos
2012-07-18 23:07:28 +02:00
Fabien Potencier 1d1b949150 fixed typo in previous merge 2012-07-18 23:05:29 +02:00
Fabien Potencier 54b88bb647 merged branch Nami-Doc/patch-1 (PR #773)
Commits
-------

a6f03bd Reverse argument for number_format

Discussion
----------

Reverse argument for number_format

Just a little fix, the doc isn't following twig/php's argument order
2012-07-18 23:03:43 +02:00
Fabien Potencier b896ad82ce merged branch havvg/patch-1 (PR #777)
Commits
-------

0869d15 fix example autoescape for javascript

Discussion
----------

fix example autoescape for javascript

{% autoescape js %} triggers an exception "An escaping strategy must be a string or a Boolean in .."
2012-07-18 23:00:28 +02:00
Fabien Potencier d70860f5f5 added a note about accessing variable attributes that contains operators (closes #775) 2012-07-18 09:53:29 +02:00
Fabien Potencier fbd6f85b92 made Twig_Loader_Chain more explicit about problems 2012-07-18 09:48:49 +02:00
Toni Uebernickel 0869d155db fix example autoescape for javascript
{% autoescape js %} triggers an exception "An escaping strategy must be a string or a Boolean in .."
2012-07-17 17:52:07 +03:00
Fabien Potencier d456640451 merged branch Tobion/patch-6 (PR #774)
Commits
-------

9d1f645 fix Twig_Function_Node extending wrong class

Discussion
----------

fix Twig_Function_Node extending wrong class
2012-07-16 09:42:44 +02:00
Tobias Schultze 9d1f645718 fix Twig_Function_Node extending wrong class 2012-07-16 00:06:53 +03:00
Nami-Doc a6f03bd5c1 Reverse argument for number_format 2012-07-15 14:50:43 +03:00
Fabien Potencier 17e2c36a58 refactored the loader documentation 2012-07-14 16:10:03 +02:00
Pascal Borreli 1c98282e0c Removed duplicate array keys 2012-07-13 19:01:16 +02:00
Pascal Borreli 30a168c7e3 Fixing typos 2012-07-13 19:00:31 +02:00
Fabien Potencier 3f9f587ba7 bumped version to 1.9.1-DEV 2012-07-13 18:31:16 +02:00
Fabien Potencier 31f0592525 prepared the 1.9.0 release v1.9.0 2012-07-13 18:26:34 +02:00
Fabien Potencier 0d5a639937 fixed the template escaper guesser example 2012-07-13 08:40:06 +02:00
Fabien Potencier e862905708 clarified usage of the string and array loaders 2012-07-13 08:31:08 +02:00
Fabien Potencier c1d6c2863b merged branch Adel-E/patch-1 (PR #767)
Commits
-------

0cb37ba Fix typehint "int" to "integer"

Discussion
----------

Fix typehint "int" to "integer"

---------------------------------------------------------------------------

by nikic at 2012-07-09T21:13:48Z

Why would you want to do that?

---------------------------------------------------------------------------

by Adel-E at 2012-07-09T21:21:34Z

Because in this file all @param use integer instead of int
2012-07-12 21:30:05 +02:00
Fabien Potencier a36aa04dec scaled back on named HTML entities since HTML 5's XML serialisation is actually XML (not XHTML)
see https://github.com/zendframework/zf2/commit/d5862587ae7c2ff2da873f1bf30003103134a365
2012-07-12 16:52:00 +02:00
Fabien Potencier 611f4451e3 made the parsing independent of the template loaders
This basically reverts 57ff88255e
2012-07-10 18:30:53 +02:00
Fabien Potencier 584a1a30b9 fixed PHP 5.2 issue in unit tests 2012-07-10 14:56:21 +02:00
Fabien Potencier 7051d2e598 fixed exception trace when an error occurs when rendering a child template 2012-07-10 14:41:24 +02:00
Adel 0cb37bac95 Fix typehint "int" to "integer" 2012-07-09 20:28:19 +00:00
Fabien Potencier 26eb0a2653 fixed composer version 2012-07-04 19:33:25 +02:00
Fabien Potencier 33b5ab4b84 merged branch shieldo/patch-2 (PR #763)
Commits
-------

4e4d41b improved English in example text

Discussion
----------

improved English in example text
2012-06-30 10:06:47 +02:00
Douglas Greenshields 4e4d41b0d0 improved English in example text 2012-06-29 20:16:04 +02:00
Fabien Potencier 73da773aaa merged branch stealth35/sanitize_ext (PR #761)
Commits
-------

9229ef3 Removed useless code

Discussion
----------

[Ext] Removed useless code

All init hooks could be bypassed (just return `SUCESS`)
There is no `ini` entries and no globals
Phpinfo automatically get the version when `MINFO` is null
Twig don't work with PHP 4 (ref to `20010901`)
2012-06-28 15:39:18 +02:00
stealth35 9229ef334d Removed useless code 2012-06-27 17:57:06 +02:00
Fabien Potencier 48a0453865 fixed PHP 5.2 incompatibilty 2012-06-27 11:49:34 +02:00
Fabien Potencier 73d117e672 fixed url escaping strategy for PHP 5.2 2012-06-27 11:18:21 +02:00
Fabien Potencier 7f97a86a43 merged branch Seldaek/date_modify (PR #760)
Commits
-------

2c9e26e Fix date_modify filter for PHP 5.2

Discussion
----------

Fix date_modify filter for PHP 5.2

The return of the object was added in 5.3, this hopefully fixes it.
2012-06-27 11:12:10 +02:00
Jordi Boggiano 2c9e26edbc Fix date_modify filter for PHP 5.2 2012-06-27 10:25:59 +02:00