Commit Graph

861 Commits

Author SHA1 Message Date
Igor Wiedler bd04de2819 [composer] add composer.json 2011-09-27 20:15:15 +02:00
Fabien Potencier f96d8d8219 added an optimization for the parent() function 2011-09-27 14:17:34 +02:00
Fabien Potencier d9d38d6c1e added a note about the usage of Twig_Template methods 2011-09-27 14:06:47 +02:00
Fabien Potencier b096e21daa refactored documentation 2011-09-27 08:43:35 +02:00
Fabien Potencier d65366e772 simplified intro and added a not about the render() method in docs 2011-09-26 11:19:36 +02:00
Fabien Potencier d02d07d5ec fixed makup in doc 2011-09-26 10:32:52 +02:00
Fabien Potencier 5446d45f6e made a small optimization when a macro does not take any argument 2011-09-24 14:20:57 +02:00
Fabien Potencier d472d21515 added cache reloading when auto_reload is true and an extension has been modified 2011-09-24 08:05:14 +02:00
Fabien Potencier 620da47e7f tweaked docs 2011-09-23 07:36:42 +02:00
Fabien Potencier 256f57e55f tweaked previous merge 2011-09-22 22:08:10 +02:00
Fabien Potencier 0408f0afaf merged branch runfalk/master (PR #368)
Commits
-------

eb5c9fb Recipe code formatting fix. New recipe for improved APC bytecode support

Discussion
----------

APC recipe

A new recipe to support cache invalidation when using *APC* with *apc.stat* = 0 and compiled code caching turned on. One sometimes want to test things without restarting apache. This recipe overrides *writeCacheFile* in *Twig_Environment* and calls *apc_compile_file to refresh cache.
2011-09-22 22:04:27 +02:00
Fabien Potencier 46080c90ea added the possibility to force the escaping of a string already marked as safe 2011-09-22 21:57:09 +02:00
Fabien Potencier d101a05976 added traits support for the parent function 2011-09-22 14:06:20 +02:00
Fabien Potencier 56f82db1a1 allowed empty templates to be used as traits 2011-09-22 11:51:48 +02:00
Fabien Potencier a7fdec2383 bumped version to 1.3.0-DEV 2011-09-22 11:30:08 +02:00
Fabien Potencier 4a5057997d prepared 1.2.0 release v1.2.0 2011-09-13 17:01:30 +02:00
Fabien Potencier 8c086d7560 prepared 1.2.0-RC1 release v1.2.0-RC1 2011-09-10 08:57:30 +02:00
Fabien Potencier 4ea393adb0 added an exception for unclosed tags 2011-09-06 13:45:10 +02:00
Fabien Potencier e9b041f911 updated CHANGELOG 2011-09-06 09:15:46 +02:00
Fabien Potencier fb07ab8623 merged branch maxromanovsky/master (PR #431)
Commits
-------

4b95621 Added: Countable interface support for empty test

Discussion
----------

Countable interface support for empty test

See [issue](https://github.com/fabpot/Twig/issues/430)
2011-09-06 09:14:27 +02:00
Max Romanovsky 4b95621c0f Added: Countable interface support for empty test 2011-09-04 15:13:42 +03:00
Fabien Potencier cbbeb71e85 added more unit tests 2011-09-01 10:54:15 +02:00
Fabien Potencier 9c2065facc removed some loop variable when using an if statement in a for loop 2011-09-01 10:41:03 +02:00
Fabien Potencier 39774a1118 made a markup refactoring 2011-09-01 10:33:25 +02:00
Fabien Potencier f20450d13d fixed algorithm that determines if a template using inheritance is valid (no output between block definitions) 2011-09-01 08:13:26 +02:00
Fabien Potencier 2be5bc986a tweaked an error message 2011-09-01 08:06:05 +02:00
Fabien Potencier 598c70ba39 renamed a class in unit test to avoid confusion with PHPStorm 2011-08-31 11:10:12 +02:00
Fabien Potencier 6473f22fa6 fixed resolveTemplate() method (we only catch loader exceptions) 2011-08-30 22:58:17 +02:00
Fabien Potencier 453c3e8b00 added better support for encoding problems when escaping a string (available as of PHP 5.4)
From the PHP CHANGELOG:

The flag ENT_SUBSTITUTE makes invalid multibyte sequences be replaced by
U+FFFD (UTF-8) or &#FFFD; by htmlspecialchars and htmlentities. It is an
alternative to the default behavior, which just returns an empty string and to
ENT_IGNORE, which is a security risk. The behavior follows the recommendations
of Unicode Technical Report #36.
2011-08-30 07:38:41 +02:00
Fabien Potencier ca3d5a821d simplified previous merge 2011-08-29 18:47:24 +02:00
Fabien Potencier b1bfb14d46 fixed CS 2011-08-29 18:27:12 +02:00
Fabien Potencier 2e90373a59 merged branch Brouznouf/patch-1 (PR #425)
Commits
-------

4dc490f Removing array_shift for optimisation.

Discussion
----------

Removing array_shift for optimisation.

For example we check if a template and use exception to redirect to a default template

Before : We checked ~1000 times => 100sec due to array_shift
After  : ~1sec
2011-08-29 18:26:20 +02:00
Joel Wurtz 4dc490fbd5 Removing array_shift for optimisation.
For example we check if a template and use exception to redirect to a default template

Before : We checked ~1000 times => 100sec due to array_shift
After  : ~1sec
2011-08-30 06:02:31 +03:00
Fabien Potencier 543d18b27d fixed markup in the doc 2011-08-28 09:12:46 +02:00
Fabien Potencier 4402ee2c1d added support for an array of templates to the "extends" tag 2011-08-27 20:34:02 +02:00
Fabien Potencier c56dd32f57 added a way to ignore a missing template when using the "include" tag 2011-08-27 14:02:05 +02:00
Fabien Potencier 35a8a0d155 added support for an array of templates to the include tag 2011-08-27 13:58:36 +02:00
Fabien Potencier acd3663062 updated CHANGELOG 2011-08-27 11:11:38 +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 ae08b28787 renamed a test file 2011-08-24 12:54:04 +02:00
Fabien Potencier d6ebae56b7 added Twig_LoaderArray::setTemplate() 2011-08-24 12:17:36 +02:00
Fabien Potencier bdf8e69ab0 switcher PHPUnit colors to true 2011-08-24 12:15:02 +02:00
Fabien Potencier 7cd097391d merged branch videlalvaro/patch-1 (PR #419)
Commits
-------

0ef1cb0 Edited doc/templates.rst via GitHub

Discussion
----------

Edited doc/templates.rst via GitHub

I fixed a typo: Variables can by for Variables can be
2011-08-18 19:16:29 +02:00
Alvaro Videla 0ef1cb0c85 Edited doc/templates.rst via GitHub 2011-08-16 16:27:40 +03:00
Fabien Potencier bac4974e25 changed unit tests so that they work for PHP 5.2 2011-08-08 23:00:24 +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