Commit Graph

2444 Commits

Author SHA1 Message Date
Fabien Potencier 6ec928e2aa added Twig_Environment::createTemplate() 2015-01-20 14:35:14 +01:00
Fabien Potencier 675ae52a2a added more paths to .gitignore 2015-01-20 03:31:04 +01:00
Fabien Potencier a60a522105 feature #1597 added a profiler (fabpot)
This PR was merged into the 1.17-dev branch.

Discussion
----------

added a profiler

This profiler allows to better understand what's going on when rendering templates. It should be used when debug is true only as it adds some overhead.

Here is a sample output in the text format:

```
main 567.04ms/100%
└ index 463.28ms/82%
  └ base 463.24ms/82%
    └ base::block(header)
    └ index::block(content) 306.29ms/54%
    │ └ included 50.18ms/9%
    │ └ included 45.42ms/8%
    │ └ included 35.42ms/6%
    │ └ base::block(content) 104.97ms/19%
    │ │ └ included 34.90ms/6%
    │ └ included 35.84ms/6%
    └ base::block(footer) 156.84ms/28%
      └ included 38.96ms/7%
      └ base::macro(foo)
```

You can also dump a profile in a Blackfire compatible format to [visualise the data as a graph](http://goo.gl/RwNGFH).

A profile is also a great way to be able to list all templates/blocks/macros that were used when rendering a template.

A PR on Symfony (symfony/symfony#13428) integrates this profiler in the Symfony web profiler to replace the current TimedTwigEngine and to add a new Twig panel.

![symfony-web-profiler](https://cloud.githubusercontent.com/assets/47313/5755461/019cd6a4-9ca5-11e4-8762-68e2a709c336.png)

Commits
-------

4408caa added a profiler
2015-01-20 03:09:25 +01:00
Fabien Potencier b40c555f0f fixed CS 2015-01-20 03:07:54 +01:00
Fabien Potencier fc292dda7d minor #1565 Update batch.rst (NAYZO)
This PR was squashed before being merged into the 1.17-dev branch (closes #1565).

Discussion
----------

Update batch.rst

Commits
-------

403736f Update batch.rst
2015-01-20 03:07:23 +01:00
Ala Eddine Khefifi 403736f031 Update batch.rst 2015-01-20 03:07:22 +01:00
Fabien Potencier 4408caae0c added a profiler 2015-01-20 03:04:00 +01:00
Fabien Potencier f86510b794 fixed CHANGELOG 2015-01-20 02:53:08 +01:00
Fabien Potencier f5972259d2 bug #1598 FIX #1596 FileSystem::findTemplate now applies realpath on the absolute ... (xavierleune)
This PR was squashed before being merged into the 1.17-dev branch (closes #1598).

Discussion
----------

FIX #1596 FileSystem::findTemplate now applies realpath on the absolute ...

...path before returning it.

This is a purposal to fix the issue #1596.
Please make any feedback needed.

Commits
-------

5074114 FIX #1596 FileSystem::findTemplate now applies realpath on the absolute ...
2015-01-20 02:51:40 +01:00
Xavier Leune 5074114bbb FIX #1596 FileSystem::findTemplate now applies realpath on the absolute ... 2015-01-20 02:51:38 +01:00
Fabien Potencier e120a3655d minor #1600 Small things (fabpot)
This PR was merged into the 1.17-dev branch.

Discussion
----------

Small things

Commits
-------

175a7c3 removed unneeded method
b7204f1 ensure that debug info are always sorted
2015-01-20 02:50:15 +01:00
Fabien Potencier 175a7c31be removed unneeded method 2015-01-19 02:18:13 +01:00
Fabien Potencier b7204f1922 ensure that debug info are always sorted 2015-01-19 02:17:01 +01:00
Fabien Potencier 427621db5c minor #1599 Fixed php syntax (SofHad)
This PR was squashed before being merged into the 1.17-dev branch (closes #1599).

Discussion
----------

Fixed php syntax

on this page: http://twig.sensiolabs.org/doc/advanced.html#tests

Commits
-------

65b3799 Fixed php syntax
2015-01-18 14:12:21 +01:00
SofHad 65b3799dbd Fixed php syntax 2015-01-18 14:12:20 +01:00
Fabien Potencier e999532003 bumped version to 1.17.1-DEV 2015-01-14 11:18:41 +01:00
Fabien Potencier 2493970fa4 prepared the 1.17.0 release v1.17.0 2015-01-14 11:15:49 +01:00
Fabien Potencier 4aa3cd664f minor #1592 added some more tests for the filename autoescape strategy (fabpot)
This PR was merged into the 1.17-dev branch.

Discussion
----------

added some more tests for the filename autoescape strategy

Commits
-------

01ab6f3 added some more tests for the filename autoescape strategy
2015-01-14 08:52:22 +01:00
Fabien Potencier 01ab6f317b added some more tests for the filename autoescape strategy 2015-01-14 07:56:45 +01:00
Fabien Potencier d7d3de26d6 feature #1591 added an escaping strategy based on the template filename extension (fabpot)
This PR was merged into the 1.16-dev branch.

Discussion
----------

added an escaping strategy based on the template filename extension

This PR introduces a new autoescaping strategy based on the template filename extension. This strategy has been extracted from Symfony, where we are using it for quite a long time now.

Commits
-------

4481bf5 added an escaping strategy based on the template filename extension
d6b2c89 fixed CS
2015-01-13 17:37:01 +01:00
Fabien Potencier 4481bf5f38 added an escaping strategy based on the template filename extension 2015-01-13 16:33:59 +01:00
Fabien Potencier d6b2c89f6f fixed CS 2015-01-13 16:32:15 +01:00
Fabien Potencier d375c805fb bumped version to 1.16.4-DEV 2014-12-25 21:52:25 +01:00
Fabien Potencier 6dc11a1e8e prepared the 1.16.3 release v1.16.3 2014-12-25 20:58:19 +01:00
Fabien Potencier ac8412f5f9 updated CHANGELOG 2014-12-25 20:56:06 +01:00
Fabien Potencier 4d97a91432 bug #1579 Fixed regression for dynamic parent (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed regression for dynamic parent

Fixes #1578

Commits
-------

d2fc98d Fixed regression for dynamic parent
2014-12-25 20:55:36 +01:00
Fabien Potencier 2615ae34dd minor #1581 Adding example with `not for if` (InFog)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Adding example with ``not`` for ``if``

I could not find an example with ``not``, so I added it here.

Commits
-------

4a75e40 Adding example with ``not`` for ``if``
2014-12-25 20:53:02 +01:00
Fabien Potencier c6e3c02d3f minor #1582 Add display information to slice example (paulmallet)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Add display information to slice example

Displays the result of the example operation {{ '12345'[1:2] }} in the "slice" filter documentation

Commits
-------

d5fe413 Add display information to slice example
2014-12-25 20:52:40 +01:00
Fabien Potencier 06a147f871 updated CHANGELOG 2014-12-25 20:48:24 +01:00
Fabien Potencier 4f7bf75ff5 bug #1583 The results of is_dir() are cached (THofman)
This PR was merged into the 1.16-dev branch.

Discussion
----------

The results of is_dir() are cached

If a production server uses statcache, the results of the first and second call of is_dir() is always the same.
So before calling is_dir() for the second time, use clearstatcache() to clear the results of the first call of is_dir().

Commits
-------

df0d813 The results of is_dir() are cached
2014-12-25 20:47:21 +01:00
THofman df0d813a06 The results of is_dir() are cached
So before calling is_dir() for the second time, clearstatcache of the dir
2014-12-23 11:44:06 +01:00
Paul Mallet d5fe41344b Add display information to slice example 2014-12-22 16:39:55 +01:00
Evaldo Junior 4a75e4024e Adding example with `not for if`
I could not find an example with ``not``, so I added it here.
2014-12-16 11:00:43 +01:00
Martin Hasoň d2fc98d026 Fixed regression for dynamic parent 2014-12-09 23:17:55 +01:00
Fabien Potencier a1b847b3a3 bug #1574 Fix the For optimizer, "include" function was always optimized (acasademont)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fix the For optimizer, "include" function was always optimized

A `for`with an in `include` function was always optimized, making it impossible to use the `loop` variable inside the include unless it was explicitly passed in the `include` function parameters.

Commits
-------

4319bb9 Fix the For optimizer, "include" function was always optimized
2014-12-05 14:47:49 +01:00
Fabien Potencier c2e00aaf07 minor #1575 Use int instead of invalid timestamp type in PhpDoc (westonruter)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Use int instead of invalid timestamp type in PhpDoc

Commits
-------

d64d2b0 Use int instead of invalid timestamp type in PhpDoc
2014-12-05 14:47:04 +01:00
Weston Ruter d64d2b0acf Use int instead of invalid timestamp type in PhpDoc 2014-12-05 22:34:33 +11:00
Albert Casademont 4319bb9b84 Fix the For optimizer, "include" function was always optimized 2014-12-04 16:17:48 +01:00
Fabien Potencier efed4fa3b1 minor #1571 removed @covers annotations (fabpot)
This PR was merged into the 1.16-dev branch.

Discussion
----------

removed @covers annotations

I propose to remove the `@covers` annotations for the following main reasons:

 * they were only used in a limited number of test cases;
 * they limited the code coverage of nodes for no reasons (some other tests are as valid to test the nodes).

Commits
-------

4ba0789 removed @covers annotations
2014-11-20 11:35:14 +01:00
Fabien Potencier 4ba0789614 removed @covers annotations 2014-11-20 08:47:31 +01:00
Fabien Potencier b87cf88f88 minor #1566 fixed alphabetic order in lists of filters and tags (craue)
This PR was merged into the 1.16-dev branch.

Discussion
----------

fixed alphabetic order in lists of filters and tags

My eyes needed more time than expected to find the `upper` filter, so this should help. 😏

Commits
-------

ba04803 fixed alphabetic order in lists of filters and tags
2014-11-10 15:48:15 +01:00
Christian Raue ba04803ed3 fixed alphabetic order in lists of filters and tags 2014-11-10 14:17:24 +01:00
Fabien Potencier f8b6e918a7 minor #1558 first argument of Twig_Loader_Array must be an array (maxstekel)
This PR was merged into the 1.16-dev branch.

Discussion
----------

first argument of Twig_Loader_Array must be an array

Commits
-------

435534e first argument of Twig_Loader_Array must be an array
2014-10-23 17:29:03 +02:00
maxstekel 435534ef05 first argument of Twig_Loader_Array must be an array 2014-10-23 11:29:06 +02:00
Fabien Potencier 73baf337b2 cleaned up tests 2014-10-23 08:17:02 +02:00
Fabien Potencier a88500e762 bug #1551 Fixed using of unary operators with default parameters (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed using of unary operators with default parameters

Fixes #1322

Commits
-------

5ba4e9c Fixed using of unary operators with default parameters
2014-10-23 08:11:36 +02:00
Fabien Potencier 79333cc8e3 feature #1548 Improved an exception message for unknown arguments (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Improved an exception message for unknown arguments

Commits
-------

6427189 Improved an exception message for unknown arguments
2014-10-23 08:07:50 +02:00
Fabien Potencier 72cb567474 bug #1550 Fixed php error for "in" operator (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed php error for "in" operator

I have added the tests and also fixed the php error ``An exception has been thrown during the rendering of a template ("strlen() expects parameter 1 to be string, array given")``.

Commits
-------

8dfeda0 Fixed "in" operator for resources and strings
2014-10-22 16:42:06 +02:00
Fabien Potencier 8d9a00df2c fixed CS 2014-10-22 16:39:46 +02:00
Fabien Potencier c2a1385389 feature #1529 Fixed guessing a template info for the Twig_Error_Loader exception (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed guessing a template info for the Twig_Error_Loader exception

Commits
-------

8f617dc Fixed guessing a template info for the Twig_Error_Loader exception
2014-10-22 16:34:32 +02:00