Commit Graph

3817 Commits

Author SHA1 Message Date
Fabien Potencier 8c7a0e9a50 added Blackfire as a sponsor 2019-06-28 17:37:46 +02:00
Fabien Potencier 6b8aacd7c3 tweaked an example in the docs 2019-06-27 07:31:21 +02:00
Fabien Potencier 533225072c minor #3077 Replace dirname(__FILE__) with usage of __DIR__ in test fixtures (SenseException)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3077).

Discussion
----------

Replace dirname(__FILE__) with usage of __DIR__ in test fixtures

Commits
-------

ea7c6644 Use dir constant for fixtures
2019-06-27 07:29:58 +02:00
Claudio Zizza ea7c66447d Use dir constant for fixtures 2019-06-27 07:29:52 +02:00
Fabien Potencier 8b6100d63c minor #3070 [doc] "map" filter: fix args order (value, key) (guilliamxavier)
This PR was merged into the 1.x branch.

Discussion
----------

[doc] "map" filter: fix args order (value, key)

Commits
-------

d01e7e0f [doc] "map" filter: fix args order (value, key)
2019-06-25 12:53:18 +02:00
Fabien Potencier 5e74239e8c fixed CS 2019-06-25 07:36:40 +02:00
Fabien Potencier 7ef3203f16 bug #3075 [1.x] Patch split filter (adriansuter)
This PR was squashed before being merged into the 1.x branch (closes #3075).

Discussion
----------

[1.x] Patch split filter

This PR addresses #3072 vor Twig 1.x.

Commits
-------

4c4df962 [1.x] Patch split filter
2019-06-25 07:35:04 +02:00
Adrian Suter 4c4df962ee [1.x] Patch split filter 2019-06-25 07:34:58 +02:00
Guilliam Xavier d01e7e0fed [doc] "map" filter: fix args order (value, key) 2019-06-24 12:54:09 +02:00
Fabien Potencier 40f703ab40 minor #3069 [Doc] Minor fixes and removed belittling words (javiereguiluz)
This PR was merged into the 1.x branch.

Discussion
----------

[Doc] Minor fixes and removed belittling words

Commits
-------

270d4a57 [Doc] Minor fixes and removed belittling words
2019-06-20 13:51:09 +02:00
Javier Eguiluz 270d4a57a2 [Doc] Minor fixes and removed belittling words 2019-06-20 13:32:09 +02:00
Fabien Potencier 5c9ec4d4a3 bumped version to 1.42.3-DEV 2019-06-18 17:36:05 +02:00
Fabien Potencier 21707d6ebd prepared the 1.42.2 release v1.42.2 2019-06-18 17:35:16 +02:00
Fabien Potencier 8c4b748f23 minor #3062 Escape __DIR__ in the test suite (lyrixx)
This PR was merged into the 1.x branch.

Discussion
----------

Escape __DIR__ in the test suite

Commits
-------

fa0213a9 Escape __DIR__ in the test suite
2019-06-11 11:40:08 +02:00
Grégoire Pineau fa0213a9c4 Escape __DIR__ in the test suite 2019-06-11 11:12:51 +02:00
Fabien Potencier 0390a9d846 bug #3059 Don't clear PHP buffer when an error occurs with debug=true (lyrixx)
This PR was squashed before being merged into the 1.x branch (closes #3059).

Discussion
----------

Don't clear PHP buffer when an error occurs with debug=true

fixes #3058

Commits
-------

c910e71f Don't clear PHP buffer when an error occurs with debug=true
2019-06-10 19:37:02 +02:00
Grégoire Pineau c910e71f5a Don't clear PHP buffer when an error occurs with debug=true 2019-06-10 19:36:53 +02:00
Fabien Potencier aa564b24ba minor #3061 Remove duplicate phpdoc (tvdijen)
This PR was merged into the 1.x branch.

Discussion
----------

Remove duplicate phpdoc

Commits
-------

2c1c00ba Remove duplicate phpdoc
2019-06-10 19:26:46 +02:00
Tim van Dijen 2c1c00ba0e Remove duplicate phpdoc 2019-06-10 12:15:10 +02:00
Fabien Potencier 2a293b6827 bug #3056 Fix end of constructor node logic (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix end of constructor node logic

Commits
-------

8a29b42d fixed end of constructor node logic
2019-06-06 10:08:39 +02:00
Fabien Potencier 8a29b42df9 fixed end of constructor node logic 2019-06-06 10:03:25 +02:00
Fabien Potencier f4c2b1a885 fix CS 2019-06-05 05:38:38 +02:00
Fabien Potencier d4424dd4b4 minor #3052 Remove docs about overloading (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Remove docs about overloading

Commits
-------

18e37286 removed docs about overloading
2019-06-04 18:38:02 +02:00
Fabien Potencier 18e3728682 removed docs about overloading 2019-06-04 17:49:11 +02:00
Fabien Potencier e0ee3b5e44 bumped version to 1.42.2-DEV 2019-06-04 13:31:48 +02:00
Fabien Potencier 6713476037 prepared the 1.42.1 release v1.42.1 2019-06-04 13:31:08 +02:00
Fabien Potencier ec55f5716e bug #3049 Add support for "Twig\Markup" instances in the "in" test (again) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add support for "Twig\Markup" instances in the "in" test (again)

Commits
-------

2218cfe2 added support for "Twig\Markup" instances in the "in" test (again)
2019-06-03 18:37:40 +02:00
Fabien Potencier 2218cfe26b added support for "Twig\Markup" instances in the "in" test (again) 2019-06-03 18:20:29 +02:00
Fabien Potencier b7b5f1bac9 bug #3047 Update the documentation for newly added features (nexsja)
This PR was submitted for the 2.x branch but it was squashed and merged into the 1.x branch instead (closes #3047).

Discussion
----------

Update the documentation for newly added features

The `map`, `filter` and `reduce` functions were added in Twig 1.41 and 2.10, but the documentation for `map` and `reduce` did not contain the information in which 2.x version these functions were added.
This minor PR fixes this.

Commits
-------

bf518d2c Update the documentation for newly added features
2019-06-03 15:28:34 +02:00
Alex bf518d2cca Update the documentation for newly added features 2019-06-03 15:28:27 +02:00
Fabien Potencier 51f33f75f9 feature #3044 Allow string operators as variables names in assignments (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Allow string operators as variables names in assignments

closes #3041

Commits
-------

5835c234 allowed string operators as variables names in assignments
2019-06-03 12:13:56 +02:00
Fabien Potencier 5835c2344f allowed string operators as variables names in assignments 2019-06-03 11:58:56 +02:00
Fabien Potencier a42e02dd90 moved a test 2019-06-03 10:47:32 +02:00
Fabien Potencier 1f0f92b30e added some tests 2019-06-03 10:37:26 +02:00
Fabien Potencier 0a63973675 bumped version to 1.42.1-DEV 2019-05-31 08:20:41 +02:00
Fabien Potencier 2983fcf2e2 prepared the 1.42.0 release v1.42.0 2019-05-31 08:20:05 +02:00
Fabien Potencier bb20937d8c minor #3035 Use v5.0 of the phpunit bridge (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Use v5.0 of the phpunit bridge

Not critical but still better IMHO :)

Commits
-------

2e6f74af Use v5.0 of the phpunit bridge
2019-05-28 17:27:45 +02:00
Nicolas Grekas 2e6f74af57 Use v5.0 of the phpunit bridge 2019-05-28 16:57:04 +02:00
Fabien Potencier a79457eb9a minor #3032 Fix typo in filter doc (yceruto)
This PR was merged into the 1.x branch.

Discussion
----------

Fix typo in filter doc

Commits
-------

94064136 Fix typo in filter doc
2019-05-28 12:27:49 +02:00
Yonel Ceruto 940641364b Fix typo in filter doc 2019-05-27 09:59:11 -04:00
Fabien Potencier cca7007abd tweaked docs 2019-05-22 15:59:27 +02:00
Fabien Potencier 6b91b3b123 minor #3027 Add information for when filter filter was added in 2.x branch (YetiCGN)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3027).

Discussion
----------

Add information for when `filter` filter was added in 2.x branch

The current "versionadded" info can be confusing to developers, if they assume 2.9 > 1.41 and don't know that 1.x and 2.x branches are still developed simultaneously.

Commits
-------

a05da6db Add information for when `filter` filter was added in 2.x branch
2019-05-22 15:58:49 +02:00
Jörn Wagner a05da6dbbe Add information for when filter filter was added in 2.x branch
The current "versionadded" info can be confusing to developers, if they assume 2.9 > 1.41 and don't know that 1.x and 2.x branches are still developed simultaneously.
2019-05-22 15:58:42 +02:00
Fabien Potencier 571929f263 tweaked docs 2019-05-20 09:21:53 +02:00
Fabien Potencier 4425af25d2 minor #3024 doc(filter): add example of filter without for use (Kocal)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3024).

Discussion
----------

doc(filter): add example of `filter` without `for` use

First, thanks for #2996! :)

This PR add an example of `filter` usage without using a `for` loop, to prevend some misinterpretation to people.

At first read, I thought `filter` was only usable with `for` loop, but nope. In fact it iterates on the result produced by `filter`.

Commits
-------

847276a6 doc(filter): add example of `filter` without `for` use
2019-05-20 09:18:53 +02:00
Hugo Alliaume 847276a6b9 doc(filter): add example of filter without for use 2019-05-20 09:18:47 +02:00
Fabien Potencier 2a8fa63690 minor #3021 Simplify code (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Simplify code

Commits
-------

3ed9fae6 simplified code
2019-05-18 10:56:15 +02:00
Fabien Potencier 3ed9fae6fa simplified code 2019-05-18 10:50:41 +02:00
Fabien Potencier a0fea74c7a minor #3020 Tweak docs for macros (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak docs for macros

Commits
-------

53496d53 tweaked docs for macros
2019-05-18 10:42:02 +02:00
Fabien Potencier 53496d53d8 tweaked docs for macros 2019-05-18 10:33:25 +02:00