Commit Graph

781 Commits

Author SHA1 Message Date
Fabien Potencier 1f233ce06b fixed previous merge 2011-07-27 09:34:28 +02:00
Fabien Potencier a6726c7ddd merged branch hason/optimizer (PR #399)
Commits
-------

3c5c512 fixed optimization for rendering blocks with variable name

Discussion
----------

Fixed bug in optimization
2011-07-27 09:33:41 +02:00
Martin Hason 3c5c51260e fixed optimization for rendering blocks with variable name 2011-07-27 08:19:59 +02:00
Fabien Potencier d67832ea5d updated CHANGELOG 2011-07-26 17:36:37 +02:00
Fabien Potencier 74d2f76c23 fixed inherited templates when an empty body 2011-07-26 17:32:54 +02:00
Fabien Potencier 6e97162de4 merged branch netzhuffle/master (PR #396)
Commits
-------

7b154d6 Switched a tab to four spaces
29d3cb2 Added testcase for #395
4fc7a8d Merge remote-tracking branch 'upstream/master'
c890cf2 Fixed existing tests
9822ac4 Changed Module.php to pass existing tests
fab8c72 fixed issue #395

Discussion
----------

Fix for issue #395

Fix for #395
I hope you can use it.

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

by fabpot at 2011/07/25 00:07:50 -0700

Can you add some unit tests?

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

by netzhuffle at 2011/07/25 13:57:55 -0700

Here you are.
2011-07-26 17:30:32 +02:00
Fabien Potencier 3ae35949ac removed comment 2011-07-26 08:07:02 +02:00
Fabien Potencier 7f5390a6a7 fixed compilation of templates when the body of a child template is not empty 2011-07-26 08:02:51 +02:00
Jannis Grimm 7b154d66fd Switched a tab to four spaces 2011-07-25 23:10:29 +02:00
Jannis Grimm 29d3cb2b91 Added testcase for #395 2011-07-25 22:55:53 +02:00
Jannis Grimm 4fc7a8d21b Merge remote-tracking branch 'upstream/master' 2011-07-25 22:32:17 +02:00
Jannis Grimm c890cf2b64 Fixed existing tests 2011-07-25 22:29:47 +02:00
Jannis Grimm 9822ac491e Changed Module.php to pass existing tests 2011-07-25 22:12:48 +02:00
Fabien Potencier 53eca627a6 simplified CHANGELOG 2011-07-25 18:46:01 +02:00
Fabien Potencier b42d8f3e29 updated CHANGELOG 2011-07-25 18:14:12 +02:00
Fabien Potencier ea83972869 fixed output when a macro throws an exception 2011-07-25 18:12:59 +02:00
Fabien Potencier 42e4105595 fixed PHPDocs for the Token parsers 2011-07-25 18:05:31 +02:00
Fabien Potencier e3bd4bdcdd fixed PHPDocs for the Core extension 2011-07-25 17:56:29 +02:00
Fabien Potencier e08de0d7cf merged branch pulse00/master (PR #389)
Commits
-------

351910b added twig comments
2b7e8d9 added phpDocs for TokenParsers, filters and tests

Discussion
----------

PHPDocs updated

fixed copy/paste errors and added docs to Sandbox and Use tags
2011-07-25 15:52:46 +02:00
Fabien Potencier 6783d5812b fixed a parsing problem when a large chunk of text is enclosed in a comment tag 2011-07-25 15:51:24 +02:00
Jannis Grimm fab8c72d08 fixed issue #395 2011-07-24 22:55:34 +02:00
Fabien Potencier e44ea9b0d4 added filename when throwing an exception when we know it 2011-07-19 15:27:34 +02:00
Robert Gruendler 351910bf21 added twig comments 2011-07-18 14:35:57 +02:00
Robert Gruendler 2b7e8d9da9 added phpDocs for TokenParsers, filters and tests 2011-07-18 13:32:46 +02:00
Fabien Potencier 94ac20f155 prepared 1.1.1 release v1.1.1 2011-07-17 15:53:10 +02:00
Fabien Potencier d95aeed935 made a small optimization on Core functions 2011-07-16 21:08:20 +02:00
Fabien Potencier a27175b76a added an optimization to the Optimizer 2011-07-16 20:38:00 +02:00
Fabien Potencier 2527c6564b updated CHANGELOG 2011-07-12 10:04:49 +02:00
Fabien Potencier 2f3dd84890 fixed CS 2011-07-12 09:50:37 +02:00
Fabien Potencier 90d99a7737 merged branch nikic/improveIsDefinedPerformanceInNonStrictMode (PR #381)
Commits
-------

e4b8371 Improve performance of is defined in non strict mode

Discussion
----------

Improve performance of is defined in non strict mode

Addresses issue #380: This gives a good performance improvement on defined tests in non-strict code. About 2x.

Reasoning: It doesn't make sense to propagate the `is_defined_test` flag into deeper levels in non-strict mode, because all getAttr functions and name accesses will just return `null` if it doesn't exist and `null` is just as good as `false`.

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

by nikic at 2011/07/02 03:22:53 -0700

Though, do not merge yet please. Changes behavior concerning methods.

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

by nikic at 2011/07/02 13:34:32 -0700

Hm, I really don't know what I was thinking when I wrote my last comment. There shouldn't be any behavior changes introduced by that change (and tests pass).
2011-07-12 09:49:44 +02:00
Fabien Potencier 0ef96f6b1d merged branch nikic/optimizeVariableAccess2 (PR #382)
Commits
-------

5b91f12 Update tests
a5ef326 Use Template->getContext in non-strict mode too

Discussion
----------

Use Template->getContext() when in non-strict mode, too

As described in #380 using the current `isset($context['test']) ? $context['test'] : null` approach can cause problems in some cases: The ternary operator always returns by value and thus PHP's copy-on-write concept does not apply. So `$context['test']` needs to be copied in any case, even though a write never happens to it. Basically Twig is copying the values of all variables ever used inside Twig if it operates in non-strict mode. This is problematic when `$context['test']` contains big arrays as the whole array is copied.

In this patch I change Twig to use `Template->getContext` when in non-strict mode too and add an `isStrictVariables` check in there.
2011-07-12 09:49:06 +02:00
Fabien Potencier 24d83b3c59 merged branch real-chocopanda/ob_fix (PR #379)
Commits
-------

75748a5 revert accidental mode change
681d2b8 fix nested buffers issue #374

Discussion
----------

fix nested buffers issue #374

see #374 for details

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

by fabpot at 2011/07/09 01:02:50 -0700

You have inadvertently changed the mode to 0755. Should stay at 0644.

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

by macolu at 2011/07/09 03:07:42 -0700

Mode change reverted.

About this Windows bug... Are you talking about the zlib issue? When zlib compression is activated, it adds a buffer level that ob_end_clean() can't close. So  ob_get_level() never go below 1.

http://cksource.com/forums/viewtopic.php?t=21653
http://www.php.net/manual/fr/function.ob-get-level.php#52945

In that case, the first ob_get_level() call will always return something greater than 0. So $level var will be > 0. This should avoid infinite loops.
2011-07-11 18:54:11 +02:00
Fabien Potencier 352923e605 updated VERSION 2011-07-11 18:53:57 +02:00
Matthieu Robin 75748a5178 revert accidental mode change 2011-07-09 11:34:52 +02:00
nikic 5b91f12ab7 Update tests 2011-07-02 23:53:43 +02:00
nikic a5ef32663b Use Template->getContext in non-strict mode too 2011-07-02 23:44:47 +02:00
nikic e4b8371ab4 Improve performance of is defined in non strict mode 2011-07-02 11:21:49 +02:00
Matthieu Robin 681d2b8b7f fix nested buffers issue #374 2011-07-01 10:35:24 +02:00
Fabien Potencier 661e9c7ad2 updated CHANGELOG v1.1.0 2011-06-28 08:09:35 +02:00
Fabien Potencier 5e61517a94 merged branch markstory/fix-308 (PR #373)
Commits
-------

eaa8995 Grammatical fix.

Discussion
----------

Grammatical fix.

A small grammatical fix for #308 + PR #372
2011-06-28 08:06:52 +02:00
Mark Story eaa899576c Grammatical fix. 2011-06-27 07:28:17 -04:00
Fabien Potencier cdd8351cf5 merged branch markstory/fix-308 (PR #372)
Commits
-------

c178c28 Making docs more explict as to what kind of object can be used with Twig_Function_Method. Fixes #308

Discussion
----------

Fix for #308

Making docs more explict as to what kind of object can be used with Twig_Function_Method.
Fixes #308
2011-06-27 09:29:21 +02:00
Mark Story c178c2818e Making docs more explict as to what kind of object can be
used with Twig_Function_Method.
Fixes #308
2011-06-26 17:31:56 -04:00
Fabien Potencier 612fa7bc51 fixed json_encode filter (thanks to Koc for the fix) v1.1.0-RC3 2011-06-24 11:26:28 +02:00
Fabien Potencier 066d561e43 prepare 1.1 RC3 2011-06-24 11:07:17 +02:00
Fabien Potencier 83a0cbab91 fixed method case-sensitivity when using the sandbox mode 2011-06-24 11:04:41 +02:00
Fabien Potencier 0496956970 updated CHANGELOG 2011-06-24 10:42:46 +02:00
Fabien Potencier 8a5f6bf63b added doc and fixed CS for previous merge 2011-06-24 10:41:55 +02:00
Fabien Potencier bbf55fe391 merged branch jturmel/patch-1 (PR #367)
Commits
-------

6593761 Allow setting of timezone on twig_date_format_filter method

Discussion
----------

Allow setting of timezone on twig_date_format_filter method
2011-06-24 10:39:24 +02:00
Fabien Potencier d03edac8ae added Sublime Text support in the doc 2011-06-24 10:37:02 +02:00