Commit Graph

763 Commits

Author SHA1 Message Date
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
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
Fabien Potencier 46a8d8d124 reworded the section on IDEs and added an Eclipse plugin 2011-06-24 10:24:14 +02:00
Josh Turmel 6593761950 Allow setting of timezone on twig_date_format_filter method 2011-06-21 20:14:00 -07:00
Fabien Potencier 027f4890a7 fixed possible security problems with NUL bytes 2011-06-17 09:17:45 +02:00
Fabien Potencier 2c26e6776b releasing 1.1.0 RC2 v1.1.0-RC2 2011-06-17 07:03:39 +02:00
Fabien Potencier a12aec38c3 added Twig_Error::getRawMessage() 2011-06-16 10:04:13 +02:00
Fabien Potencier 47818dd2a1 added an exception when the template passed to "use" is not a string 2011-06-16 09:57:17 +02:00
Fabien Potencier 730f9314a7 merged branch henrikbjorn/issue-347 (PR #348)
Commits
-------

a8d29b1 Add testcase for issue #347

Discussion
----------

Add testcase for issue #347

Dismisses false issue.
2011-06-16 09:45:47 +02:00
Fabien Potencier 4d043d4706 updated CHANGELOG 2011-06-16 09:45:16 +02:00
Fabien Potencier cf50380b8c merged branch nikic/nestedDefinedTestWithStrictVars (PR #359)
Commits
-------

f2a1c2b Refactor and add additional default filter tests
e760483 Make `a.b is defined` not throw an exception if a is not defined (in strict mode)

Discussion
----------

Make `a.b is defined` not throw an exception if a is not defined (in strict mode)

This commit does two things: Firstly (that's the main part) it makes `a.b is defined` not throw an error in strict mode if `a` is undefined (applies for `a.b.c` aso too) [fixes #337]. Additionally it allows `a.b|default` just like it is allowed to do `a|default`.

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

by fabpot at 2011/06/09 22:21:11 -0700

This is quite a big change. Can you add some tests?

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

by nikic at 2011/06/10 08:19:49 -0700

I added some more tests for the default filter in the fixtures. But I wasn't sure how I should test the default test's behavior in strict mode. If you could point me in the right direction here I would add those tests, too ;)
2011-06-16 09:41:50 +02:00
Fabien Potencier 6c442bd9ba updated CHANGELOG 2011-06-16 09:41:31 +02:00
Fabien Potencier 403151ba48 merged branch arnaud-lb/line-numbers (PR #353)
Commits
-------

5ec1955 added {% line \d+ %} directive

Discussion
----------

added {% line \d+ %} directive

This directive allows to change the current line number in the tokenizer.

This allows to generate Twig code from some other Twig or partially-Twig script, and still get relevant line numbers in error messages, when the line numbers of the generated Twig script do not match those of the original script.

For example in the following script:

    foo
    {% line 10 %}
    bar
    {{ baz }}

`"foo"` is on line 1, `"bar"` is considered to be on line 10 and `{{ baz }}` is considered to be on line 11.

This is similar to `# line ...` directives in C.

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

by nikic at 2011/06/05 08:51:20 -0700

I don't quite yet understand it's use cases.

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

by arnaud-lb at 2011/06/05 09:17:57 -0700

The `{% line ... %}` directive is not meant to be used by humans, but rather by generators.

The use case is the same as [#line directives in C](http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html): when you generate a C file from a template, you would prefer that the compiler refers to the line number of the template, instead of the line number of the generated file.

In my case, I built a [HAML compiler for php](https://github.com/arnaud-lb/MtHaml) which can target Twig as an output language. I use it as a Twig pre-processor so that it translates HAML scripts to Twig scripts on the fly in a custom Twig_Loader.

So I have scripts like that:

    %p
      test
    %div = foo.bar

which is compiled like that:

    <p>
      test
    </p>
    <div>
       {{ foo.bar }}
    </div>

If an error occurs in the execution of {{ foo.bar }}, Twig will throw an error refering to line 5 in the original script, which is wrong. A simple solution to this is the {% line %} directive:

    <p>
      test
    </p>
    <div>
    {% line 3 %}
       {{ foo.bar }}
    </div>

Now if an error occures in {{ foo.bar }}, the error will refer to line 3.

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

by nikic at 2011/06/05 09:33:26 -0700

Ah, okay, seems reasonable. Though I'm not sure whether it is appropriate to use the comment syntax to accomplish that.

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

by arnaud-lb at 2011/06/05 10:41:03 -0700

You are right, I changed the request to use the block syntax instead.
2011-06-16 09:31:53 +02:00
Fabien Potencier b340d98d98 added null as an alias for the none test 2011-06-14 08:19:32 +02:00
nikic f2a1c2b539 Refactor and add additional default filter tests 2011-06-10 16:50:20 +02:00
nikic e760483287 Make a.b is defined not throw an exception if a is not defined (in strict mode) 2011-06-09 20:50:48 +02:00
Fabien Potencier cd0e749308 added Twig_Loader_Filesystem::addPath() 2011-06-07 16:33:55 +02:00
Arnaud Le Blanc 5ec19550b2 added {% line \d+ %} directive 2011-06-05 19:38:12 +02:00
Fabien Potencier 7e457209f8 added missing debug info when using traits 2011-06-05 12:12:05 +02:00
Fabien Potencier 3cf357391a fixed Twig_Error when the exception is thrown from within the generated template 2011-06-05 12:07:30 +02:00