Commit Graph

1570 Commits

Author SHA1 Message Date
Fabien Potencier 92d8b25fee made a better test 2012-08-28 17:05:50 +02:00
Fabien Potencier 721bebc361 fixed an error when a token parser pass a closure as a test to the subparse() method (closes #818) 2012-08-28 14:04:14 +02:00
Fabien Potencier 32c4867f68 bumped version to 1.9.3-DEV 2012-08-25 19:36:54 +02:00
Fabien Potencier f04ef7d6c1 prepared the 1.9.2 release v1.9.2 2012-08-25 19:32:57 +02:00
Fabien Potencier ddc154fe4c updated CHANGELOG 2012-08-24 15:50:46 +02:00
Fabien Potencier 738ae3b6f3 fixed the in operator for objects that contains circular references (closes #813) 2012-08-24 15:49:46 +02:00
Fabien Potencier 37e7ba7575 fixed CS 2012-08-24 14:10:43 +02:00
Fabien Potencier 6fbe65588a merged branch Banane9/patch-1 (PR #817)
Commits
-------

ca3b156 Added Highlighter for Notepad++ to the list

Discussion
----------

Added Highlighter for Notepad++ to the list

Ok I edited it :)
2012-08-24 14:10:21 +02:00
Fabien Potencier c0dc55dae1 updated CHANGELOG 2012-08-24 14:10:15 +02:00
Arne Kiesewetter ca3b1566e3 Added Highlighter for Notepad++ to the list 2012-08-24 12:41:34 +03:00
Fabien Potencier 11e91f63e9 merged branch arnaud-lb/792 (PR #814)
Commits
-------

8fa97bb php5.2 fix
d6fc86a [Tests] Test accessing a public property when \ArrayAccess is implemented
6704227 [ext] made ext consistent with 8ec73cf475
228d2b0 [ext] use only read_property handler

Discussion
----------

Alternative fix for 792

This fixes #792 as described in https://github.com/fabpot/Twig/issues/792#issuecomment-7482480

- 228d2b0 removes the *object-to-array convertion* trick, since the bug comes from there, and it doesn't appear to be needed
- 6704227 is the equivalent of aa6b835816 + 8ec73cf475 (this were not needed before because the bug was hidden by the object to array trick: numeric strings and integers are treated equally in arrays keys)

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

by stof at 2012-08-23T10:19:17Z

@arnaud-lb you need to fix the PHP 5.2 support
2012-08-23 14:18:58 +02:00
Fabien Potencier 0dc2895cd9 merged branch arnaud-lb/fix-zts-5.2 (PR #815)
Commits
-------

46ce339 [ext] fixed php 5.2 ZTS builds

Discussion
----------

[ext] Fixed php 5.2 ZTS builds

In 5.2 zend_hash_apply_with_arguments() and its callback argument do not have a TSRMLS.
2012-08-23 14:18:46 +02:00
Arnaud Le Blanc 46ce33972f [ext] fixed php 5.2 ZTS builds
zend_hash_apply_with_arguments and its callback argument do not have a
TSRMLS in php 5.2.
2012-08-23 13:58:44 +02:00
Arnaud Le Blanc 8fa97bb526 php5.2 fix 2012-08-23 13:32:55 +02:00
Victor Berchet d6fc86a845 [Tests] Test accessing a public property when \ArrayAccess is implemented
Test case for GH-792
2012-08-23 11:54:31 +02:00
Arnaud Le Blanc 6704227644 [ext] made ext consistent with 8ec73cf475 2012-08-23 11:54:31 +02:00
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