Commit Graph

575 Commits

Author SHA1 Message Date
Fabien Potencier 35a8a0d155 added support for an array of templates to the include tag 2011-08-27 13:58:36 +02:00
Fabien Potencier b5b25334fe merged branch jturmel/master (PR #403)
Commits
-------

c2c01de Add bitwise operators to core

Discussion
----------

Added bitwise operators (and, xor, or) to core

* Added bitwise operators (and, xor, or) to core

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

by nikic at 2011/08/02 21:02:14 -0700

I'm not sure bitwise ops really belong into a templateing language...

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

by jturmel at 2011/08/02 21:06:02 -0700

That's a general statement to make without knowing why it was implemented at all... no one is forced to use them, however when you do need them, them not being available makes you have relegate something that should be in the view in the particular case I needed them, to be done in a controller instead, which would be quite a bit nastier in my case.

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

by nikic at 2011/08/02 23:23:30 -0700

@jturmel: I do not doubt that there are some cases where bitwise operations are useful. I can't think of one of the top of my head, though I imagine that it could be useful when using bitwise right management or something like that. What I was trying to say is, that I don't really believe that there are enough significant use cases for bitwise ops to justify adding them to the core (I know, "You Don't Have To Use It!", but it isn't good to clutter the core with features nearly no one uses). Maybe you could give an example of what you needed them for?

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

by jturmel at 2011/08/02 23:41:36 -0700

It would be one thing if I was implementing some operator that didn't normally exist in PHP itself, but it seems a bit odd to even say that it's cluttering it up, it's 3 lines of code that add 3 missing standard operators from PHP.

Simply put, I have an object that gets passed to the template that has many properties, these properties are bit values, I need to do checks on them to select/deselect various checkboxes in a grid... this is the cleanest way to do it without mudding up controller code with view logic.

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

by jalliot at 2011/08/03 01:42:56 -0700

Why not adding ``<<`` and ``>>`` then @jturmel?
I don't have a particular use case but I think that if Twig includes those 3 operators, it should also support these 2 to be "complete". What do you think?

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

by jturmel at 2011/08/03 06:07:46 -0700

Of course, if you guys think we need the shifting operators as well, we can... but modifying data in the view seems much less practical than the one's I added, although I did miss NOT.

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

by jalliot at 2011/08/03 06:16:38 -0700

I forgot about ``~`` but sure it should be included as well.
As for ``<<`` and ``>>``, they could also be used for verifying grant access for example in some implementations.
``{% if some_var << some_other_var & 1 %}``
2011-08-27 11:10:29 +02:00
Fabien Potencier 4c1b45204b replace file_exists() by is_file() as this is semantically more correct (we don't want dirs to match) 2011-08-27 09:56:45 +02:00
Fabien Potencier 46c258d29d replaced usage of array_replace by array_merge (for 5.2 compatibility) 2011-08-27 09:46:10 +02:00
Fabien Potencier c609060f94 added the "attribute" function to allow getting dynamic attributes on variables 2011-08-27 09:46:06 +02:00
Fabien Potencier 517c233679 added Twig_Loader_Chain 2011-08-24 12:56:57 +02:00
Fabien Potencier d6ebae56b7 added Twig_LoaderArray::setTemplate() 2011-08-24 12:17:36 +02:00
Fabien Potencier dbeede7900 moved some logic to the constructor (that's allows visitors to have the real node that will be compiled) 2011-08-07 21:32:22 +02:00
Fabien Potencier 7b5e5969a2 added an optimization for the set tag when used to capture a large chunk of static text 2011-08-07 19:08:15 +02:00
Fabien Potencier fd0573103e removed unneeded implementation of Template::getTemplateName() 2011-08-07 17:26:48 +02:00
Fabien Potencier 112a16bfde changed name regex to allow more characters (the same as PHP - works for blocks, tags, functions, filters, and macros - closes #376) 2011-08-07 10:07:35 +02:00
nikic da4d964047 Do not use Node_Expression_Name for function names, just use strings for those 2011-08-06 11:21:23 +02:00
Fabien Potencier 652ac774d6 removed obsolete code 2011-08-06 10:56:03 +02:00
Fabien Potencier 26d8aff746 refactored code 2011-08-06 10:44:55 +02:00
Fabien Potencier 801f3e638c removed the possibility to use the extends tag from a block (as it is semantically incorrect and it probably does not work as you expect it to in this case) 2011-08-06 09:16:10 +02:00
Fabien Potencier c201137f21 moved Template::getParent() logic to the base class 2011-08-06 09:09:18 +02:00
Fabien Potencier 1202b5fbe7 merged branch kotas/master (PR #362)
Commits
-------

f5b9df9 added `if` modifier support to for loop like {% for k in v if k is odd %}

Discussion
----------

[1.2] added `if` modifier support to for loop

Hi.

I'm one of Twig users who love it so much. :)

I've made a patch for adding `if` modifier support to `for` loop in Twig.

Example:
<pre>
{% for n in range(0, 5) if n is odd %}
  {{ n }}
{% endfor %}
</pre>

Output:
<pre>
1
3
5
</pre>

This idea comes from Python's list comprehensions. (like `[n for n in range(0,6) if n % 2 == 1]`)

Here is another example.

Before:
<pre>
{% set no_items = true %}
{% for item in items %}
  {% if item.available %}
    {% set no_items = false %}
    {{ item.name }}
  {% endif %}
{% endfor %}
{% if no_items %}
  No items available.
{% endif %}
</pre>

After:
<pre>
{% for item in items if item.available %}
  {{ item.name }}
{% else %}
  No items available.
{% endfor %}
</pre>

I hope you like it. But If not, just ignore this request. :)

Thanks.

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

by fabpot at 2011/06/24 01:33:33 -0700

I like it! I will schedule it for inclusion in Twig 1.2. Thanks.

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

by hhamon at 2011/06/26 16:43:26 -0700

+1

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

by nikic at 2011/06/27 00:42:14 -0700

I think the idea per se is interesting. But I just checked all Twig templates in my whole codebase and couldn't find any use for it. What was your practical use for this feature @kotas?

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

by kotas at 2011/06/27 01:52:48 -0700

@nikic My practical use is shown as the second example in the body of this pull request.

Sometimes you need to "filter" an array by seeing its element's property like "item.available" or by some condition like "item.price >= 500".

To do this, in the current version of Twig, you have to write "for" and "if" as nested scopes. And if you want to write {% else %} of the "for" loop, you have to make a temporary variable to see if all elements are skipped.

I think this feature is not essential, but makes templates clean.

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

by nikic at 2011/06/27 06:23:24 -0700

The thing about `else` seems plausible. +1

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

by chucktrukk at 2011/08/02 17:39:16 -0700

Also +1. that makes some very clean template code.
2011-08-06 08:34:15 +02:00
Fabien Potencier f918219cf9 bumped version to 1.2.0-DEV 2011-07-30 10:10:16 +02:00
Fabien Potencier 396435ecd0 prepared 1.1.2 released 2011-07-30 09:53:59 +02:00
Fabien Potencier 9b73026e91 fixed Parser bug when a child node is null 2011-07-28 14:32:45 +02:00
Fabien Potencier ef485402e0 fixed Parser bug 2011-07-28 14:32:07 +02:00
Josh Turmel c2c01dedf8 Add bitwise operators to core
* Added bitwise operators (and, xor, or) to core
2011-07-27 23:06:42 -05:00
Fabien Potencier c7be5242c4 fixed unit test, updated CHANGELOG 2011-07-27 14:25:09 +02:00
Fabien Potencier 945579a8f6 merged branch JEDIBC/master (PR #401)
Commits
-------

755ea99 Correction of a BC break with json_encode and PHP 5.2.x

Discussion
----------

BC break with json_encode and php 5.2.x

Hi,

json_encode on php 5.2.x doesn't take the $options parameter wich result in a warning and the function return nothing.

Cheers.
2011-07-27 14:23:49 +02:00
JEDIBC 755ea99bd4 Correction of a BC break with json_encode and PHP 5.2.x 2011-07-27 12:25:24 +02:00
Fabien Potencier 26757ab327 simplified code for previous merge/commits 2011-07-27 11:23:08 +02:00
Fabien Potencier 21c96d1ef4 changed previous commit to preserve better BC 2011-07-27 10:12:28 +02:00
Fabien Potencier 56e2ca75fa fixed CS on template output 2011-07-27 09:44:25 +02:00
Fabien Potencier 1f233ce06b fixed previous merge 2011-07-27 09:34:28 +02:00
Martin Hason 3c5c51260e fixed optimization for rendering blocks with variable name 2011-07-27 08:19:59 +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 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 4fc7a8d21b Merge remote-tracking branch 'upstream/master' 2011-07-25 22:32:17 +02:00
Jannis Grimm 9822ac491e Changed Module.php to pass existing tests 2011-07-25 22:12:48 +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 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 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