Commit Graph

745 Commits

Author SHA1 Message Date
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
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
Henrik Bjørnskov a8d29b1f84 Add testcase for issue #347 2011-06-01 15:27:40 +02:00
Fabien Potencier 9328df1940 updated VERSION 2011-05-28 17:35:04 +02:00
Fabien Potencier 3807548114 releasing 1.1.0 RC1 v1.1.0-RC1 2011-05-28 17:34:18 +02:00
Fabien Potencier 2901acd5cb updated CHANGELOG 2011-05-28 17:01:35 +02:00
Fabien Potencier dbab43d81c Merge remote branch 'tna/default-filter'
* tna/default-filter:
  Moved default filter fix to its proper place
  Fixes default filter
2011-05-28 16:38:25 +02:00
Fabien Potencier 9c07baf8e5 fixed timezone when using the date filter with a UNIX timestamp (it now uses the default timezone instead of UTC to mimics the date() function behavior) 2011-05-28 16:36:42 +02:00
Jeremy Mikola d8eafa02f2 Date filter should treat strict integers as Unix timestamps (same as all-digit strings)
Without a string cast, ctype_digit() will return false for an integer.
2011-05-27 11:54:06 -07:00
Tobias Naumann 703a822da9 Moved default filter fix to its proper place 2011-05-26 17:03:41 +02:00
Tobias Naumann fc1af4b9b2 Fixes default filter 2011-05-26 11:14:22 +02:00
nikic f742efd602 Refactor GetAttr defined implementation to consider null defined 2011-05-24 12:48:47 +02:00
Brikou CARRE d90b2f7112 fixed constructor + cosmetic 2011-05-20 05:25:21 -07:00
Fabien Potencier 7bf7f54e82 tweaked docs 2011-05-18 08:14:47 +02:00
nikic 071210f97d Add some further is defined unit tests and give clearer names 2011-05-18 08:08:37 +02:00
nikic b0a94baebd Fix regression in defined test for GetAttr. Fixes #319 2011-05-18 08:08:32 +02:00
Fabien Potencier 5fd8f1f2f9 Merge remote branch 'jpb0104/master'
* jpb0104/master:
  Added an example of escaped "at" in a date filter.
2011-05-18 08:05:56 +02:00
Jason Bouffard c0447ec6fe Added an example of escaped "at" in a date filter.
Relates to https://github.com/fabpot/Twig/issues/330
2011-05-17 14:28:44 -07:00
Fabien Potencier 654468ff5d simplified code 2011-05-10 07:21:09 +02:00
Fabien Potencier 48f427ebd3 added a test for the raw tag 2011-05-09 17:47:21 +02:00