Commit Graph

73 Commits

Author SHA1 Message Date
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 2012-08-25 19:32:57 +02: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
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
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
Arnaud Le Blanc 3ca6654617 avoid crash when TWIG_GET_ARRAY_ELEMENT returns NULL
fixes #807
2012-08-20 20:28:22 +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 2012-07-22 12:25:41 +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 2012-07-13 18:26:34 +02:00
stealth35 9229ef334d Removed useless code 2012-06-27 17:57:06 +02:00
Fabien Potencier 7657c01e65 added support for more escaping strategies (url, css, and html_attr) 2012-06-27 09:26:36 +02:00
Fabien Potencier 4679ad51c5 bumped version to 1.8.4-DEV 2012-06-17 20:52:23 +02:00
Fabien Potencier 147e5d6d60 prepared the 1.8.3 release 2012-06-17 20:48:16 +02:00
Fabien Potencier 82e73f6bf2 bumped version to 1.8.3 2012-05-30 08:18:29 +02:00
Fabien Potencier 2afc513620 prepared the 1.8.2 release 2012-05-30 08:15:36 +02:00
Fabien Potencier 875fa010ce bumped version to 1.8.2-DEV 2012-05-17 18:06:57 +02:00
Fabien Potencier 0bee037579 prepared the 1.8.1 release 2012-05-17 18:02:47 +02:00
Fabien Potencier 8ec73cf475 fixed a regression introduced by aa6b835816 2012-05-16 16:19:00 +02:00
Fabien Potencier 925254821d bumped version to 1.9.0-DEV 2012-05-08 09:06:03 +02:00
Fabien Potencier 87766410dd prepared the 1.8.0 release 2012-05-08 09:03:46 +02:00
Fabien Potencier 40c9668854 bumped version to 1.8.0-DEV 2012-04-24 07:50:52 +02:00
Fabien Potencier 6ac8791d15 prepared the 1.7.0 release 2012-04-24 07:40:10 +02:00
Fabien Potencier e2220bb282 bumped version to 1.7.0-DEV 2012-04-03 09:56:57 +02:00
Fabien Potencier 50421c8620 bumped version to 1.6.4-DEV 2012-04-02 19:45:40 +02:00
Fabien Potencier ff61094aa3 prepared the 1.6.4 release 2012-04-02 19:42:18 +02:00
Fabien Potencier ab016bd605 bumped version to 1.6.4-DEV 2012-03-22 18:31:45 +01:00
Fabien Potencier c2a53a2614 prepared the 1.6.3 release 2012-03-22 18:28:15 +01:00
Fabien Potencier 4a0773a8ad fixed usage of Z_ADDREF_P for PHP 5.2 in the C extension 2012-03-22 14:25:00 +01:00
Fabien Potencier 2ecd314dc1 bumped version to 1.7.0-DEV 2012-03-18 03:33:04 +01:00
Fabien Potencier f43cc520d6 prepared the 1.6.2 release 2012-03-18 03:23:00 +01:00
Fabien Potencier c18a0e60fe bumped Twig version 2012-02-29 22:10:49 +01:00
Fabien Potencier 30929fde86 prepared the 1.6.1 release 2012-02-29 21:46:35 +01:00
Fabien Potencier 741b11c618 fixed Twig C extension 2012-02-28 23:19:54 +01:00
Fabien Potencier 203945602b bumped version to 1.7.0-DEV 2012-02-04 08:38:29 +01:00
Fabien Potencier 9154d27622 prepared the 1.6.0 release 2012-02-04 08:34:52 +01:00
Sergey Linnik 75bfb4e1a0 Syncing Twig extension with latest changes in Twig master 2012-01-15 01:15:28 +04:00
Fabien Potencier e74205e21e bumped version to 1.6.0-DEV 2012-01-05 15:35:20 +01:00
Fabien Potencier 5bba149706 prepared the 1.5.1 release 2012-01-05 15:34:14 +01:00
Fabien Potencier d76d670b54 bumped version to 1.6.0-DEV 2012-01-04 14:31:46 +01:00
Fabien Potencier f6e49636d1 prepared the 1.5.0 release 2012-01-04 14:20:58 +01:00
Fabien Potencier 956830c7ee prepared the 1.5.0-RC2 release 2011-12-30 16:23:51 +01:00
Fabien Potencier fb6d5660ab prepared the 1.5.0-RC1 release 2011-12-26 11:40:36 +01:00
Fabien Potencier c95fe91fc8 replaced zend_error_noreturn calls to zend_error as zend_error_noreturn is not exported (closes #554) 2011-12-22 14:17:59 +01:00
Arnaud Le Blanc b26d69af38 removed bogus TSRMLS_CCs 2011-12-21 19:52:05 +01:00
Fabien Potencier b990868012 merged branch arnaud-lb/ext-crash2 (PR #560)
Commits
-------

9e6f285 fixed crash in twig_template_get_attributes when input is not an array or object

Discussion
----------

Fix crash in twig_template_get_attributes when input is not an array or object

This fixes a crash when the input of twig_template_get_attributes() is not an array or object, and strict mode is enabled.

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

by nikic at 2011/12/16 12:03:21 -0800

Could you maybe place the exception tests in a different method?

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

by arnaud-lb at 2011/12/16 12:13:35 -0800

This method already expects many of its inputs to cause an exception to be thrown (it tests getAttribute() in strict mode, and in many cases the attribute isn't defined). I don't see a real benefit from moving these tests in a separate method in this case.
2011-12-17 08:58:24 +01:00
Arnaud Le Blanc 9e6f285362 fixed crash in twig_template_get_attributes when input is not an array or object 2011-12-16 20:46:37 +01:00
Fabien Potencier 972a93f85d merged branch arnaud-lb/ext-crash (PR #558)
Commits
-------

c920344 code style
50da1a2 don't modify function name

Discussion
----------

Fix crash in extension

This fixes a crash caused by `php_strtolower()` modifying its input. (Crashes on amd64, but not on x86 for me.)
2011-12-11 16:53:52 +01:00