geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-21 07:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,446 Commits 16 Branches 274 Tags
925254821d377c9f18c29f92b3e66192b687086c
Commit Graph

52 Commits

Author SHA1 Message Date
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
Arnaud Le Blanc c9203442c5 code style 2011-12-10 14:49:52 +01:00
Arnaud Le Blanc 50da1a2881 don't modify function name 2011-12-10 14:48:20 +01:00
Fabien Potencier b496a2324c added Twig C extension version in phpinfo 2011-12-07 12:18:20 +01:00
Fabien Potencier 460ba4d6c7 bumped version to 1.5.0-DEV 2011-12-07 08:11:23 +01:00
Fabien Potencier 0b7d6dfa0c prepared the 1.4.0 release 2011-12-07 08:09:57 +01:00
Arnaud Le Blanc 569f782ad0 fix ZTS build 2011-11-23 14:01:51 +01:00
Arnaud Le Blanc 1606910a9a Fix undefined behavior 
The callbacks are expected to return an integer, and returning void
instead was triggering weird bugs

I've also removed the casts to ensure that the signatures are compatible
 2011-11-23 13:47:55 +01:00
Arnaud Le Blanc 0ce8d3c986 Convert item argument to string 
This fixes a crash in some cases and repeated conversions
 2011-11-23 13:47:48 +01:00
Arnaud Le Blanc d807981bc6 don't try to access non public property or method 2011-11-23 13:38:48 +01:00
Fabien Potencier bae4246356 updated Twig ext version 2011-11-23 12:19:09 +01:00
Fabien Potencier 7cfb0ecbb8 merged branch arjenjb/master (PR #528) 
Commits
-------

c65be3e Pass around the TSRM
09d3095 Moved zval declaration
c941552 Removed globals
ffb2460 Added config.w32 for windows builds

Discussion
----------

Fixed compilation on windows
 2011-11-23 12:16:47 +01:00
Arjen Brouwer c65be3e17b Pass around the TSRM 2011-11-22 00:17:40 +01:00
Arjen Brouwer 09d3095b66 Moved zval declaration 2011-11-21 23:57:44 +01:00
Arjen Brouwer c9415522a9 Removed globals 2011-11-21 23:56:11 +01:00
Arjen Brouwer ffb246083a Added config.w32 for windows builds 2011-11-21 23:54:57 +01:00
Derick Rethans c4a7d1983d Merge branch 'master' of github.com:derickr/twig-ext 
Conflicts:
	ext/twig/twig.c
 2011-11-21 11:09:34 +00:00
Derick Rethans 7d37d66317 Make the extension ZTS-proof. 2011-11-21 11:08:17 +00:00
Derick Rethans 7a2c444054 Fixed name in license. 2011-11-21 09:44:40 +01:00
Derick Rethans 9879ca216d Merge branch 'master' of github.com:derickr/twig-ext 2011-11-21 08:37:45 +00:00
Derick Rethans 40ec6713ee Fixed name in license. 2011-11-21 08:34:59 +00:00
Derick Rethans 229c07c6a6 Added another workaround for PHP 5.4 support. 2011-11-20 21:41:07 +00:00