Commit Graph

7732 Commits

Author SHA1 Message Date
Laurent VOULLEMIER 59243e8ce3 Minor fixes in docs 2020-01-03 20:00:22 +01:00
Fabien Potencier 9a8b0c60ae Merge branch '2.x' into 3.x
* 2.x:
  lower php requirement
2020-01-02 19:49:34 +01:00
Fabien Potencier 9d03c1edd5 minor #3233 lower php requirement (Guite)
This PR was merged into the 2.x branch.

Discussion
----------

lower php requirement

This PR adjusts the minimum PHP version to `7.2.5+` which is the version that is also required by Symfony 5.

Commits
-------

c3b4b8ee lower php requirement
2020-01-02 19:40:02 +01:00
Guite c3b4b8ee53 lower php requirement 2020-01-02 13:43:40 +01:00
Fabien Potencier 2a740e6268 Merge branch '2.x' into 3.x
* 2.x:
  Bump license year
  Bump license year
2020-01-01 18:11:09 +01:00
Fabien Potencier 6aae22ecde Bump license year 2020-01-01 18:10:47 +01:00
Fabien Potencier b370b79a14 Merge branch '1.x' into 2.x
* 1.x:
  Bump license year
2020-01-01 18:09:27 +01:00
Fabien Potencier 54be566c04 Bump license year 2020-01-01 18:09:02 +01:00
Fabien Potencier 004b65b0c5 Fix CHANGELOG 2019-12-28 08:19:03 +01:00
Fabien Potencier 22c3906c75 Bump version to 3.0.2-DEV 2019-12-28 08:18:40 +01:00
Fabien Potencier 28f856a4c5 Prepare the 3.0.1 release v3.0.1 2019-12-28 08:17:28 +01:00
Fabien Potencier 0261c8238e Merge branch '2.x' into 3.x
* 2.x:
  Bump version to 2.12.4-DEV
  Prepare the 2.12.3 release
  Update CHANGELOG
2019-12-28 08:14:46 +01:00
Fabien Potencier 41a87b9729 Bump version to 2.12.4-DEV 2019-12-28 08:14:03 +01:00
Fabien Potencier 97b6311585 Prepare the 2.12.3 release v2.12.3 2019-12-28 08:12:03 +01:00
Fabien Potencier 8279c11538 Update CHANGELOG 2019-12-28 08:10:31 +01:00
Fabien Potencier e5ae15e7de Merge branch '2.x' into 3.x
* 2.x:
  support Sf5
  Fix constraints
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
  Add missing suggestions in Twig Extra Bundle
2019-12-28 08:09:27 +01:00
Fabien Potencier e74a51ecb1 Merge branch '1.x' into 2.x
* 1.x:
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
2019-12-28 08:09:20 +01:00
Fabien Potencier 7f75a23f85 minor #3230 Fix constraints (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix constraints

Commits
-------

966fa451 Fix constraints
2019-12-27 08:37:45 +01:00
Fabien Potencier 6acf02e3bf bug #3226 Allow Symfony 5 (Guite)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead (closes #3226).

Discussion
----------

Allow Symfony 5

This fixes #3225

Commits
-------

d735a43e support Sf5
2019-12-27 08:36:12 +01:00
Axel Guckelsberger d735a43e4e support Sf5 2019-12-27 08:36:07 +01:00
Fabien Potencier 966fa45126 Fix constraints 2019-12-27 08:33:44 +01:00
Fabien Potencier 82362775bb minor #3224 Update doc with new escaping behavior on ternary statements (l-vo)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead (closes #3224).

Discussion
----------

Update doc with new escaping behavior on ternary statements

According to https://symfony.com/blog/better-white-space-control-in-twig-templates#fine-grained-escaping-on-ternary-expressions

Commits
-------

92e1cd35 Update doc with new escaping behavior
2019-12-27 08:28:59 +01:00
Laurent VOULLEMIER 92e1cd35c5 Update doc with new escaping behavior
When applied on ternary statements
2019-12-27 08:28:48 +01:00
Fabien Potencier 1a874b581a Remove obsolete page 2019-12-20 13:14:10 +01:00
Fabien Potencier 0a5fd1762a minor #3223 Remove the (feldenla)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3223).

Discussion
----------

Remove `the`

Remove the article `the` to make a correct statement.

Commits
-------

8b8cfb0f language typo
2019-12-20 13:13:13 +01:00
feldenla 8b8cfb0f4e language typo 2019-12-20 13:13:08 +01:00
Fabien Potencier 37aa32055c minor #3222 Lower the PHP requirement for Twig 3 (javiereguiluz)
This PR was merged into the 3.x branch.

Discussion
----------

Lower the PHP requirement for Twig 3

This lower version matches Symfony 5 requirement.

Commits
-------

3c4cc70f Lower the PHP requirement
2019-12-20 13:10:34 +01:00
Javier Eguiluz 3c4cc70fef Lower the PHP requirement 2019-12-19 17:48:12 +01:00
Fabien Potencier bf9544515e minor #3216 Add missing suggestions in Twig Extra Bundle (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add missing suggestions in Twig Extra Bundle

Commits
-------

8c2c193a Add missing suggestions in Twig Extra Bundle
2019-12-11 11:42:19 +01:00
Fabien Potencier 8c2c193a29 Add missing suggestions in Twig Extra Bundle 2019-12-11 11:08:55 +01:00
Fabien Potencier e9f5fff78f Merge branch '1.x' into 3.x
* 1.x:
  Add missing link in docs
  Correct return type of twig_date_converter
2019-12-09 17:39:23 +01:00
Fabien Potencier 46e232b37c Merge branch '1.x' into 2.x
* 1.x:
  Add missing link in docs
  Correct return type of twig_date_converter
2019-12-09 17:39:17 +01:00
Fabien Potencier 335dcad4b0 Add missing link in docs 2019-12-09 17:35:58 +01:00
Fabien Potencier e45476d9d0 minor #3215 [Minor] Correct return type of twig_date_converter (mcfedr)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead (closes #3215).

Discussion
----------

[Minor] Correct return type of twig_date_converter

if a `\DateTimeImmutable` is passed to `twig_date_converter` it will return a `\DateTimeImmutable`, not a `\DateTime`.

Commits
-------

e927e859 Correct return type of twig_date_converter
2019-12-09 17:33:13 +01:00
Fred Cox e927e859ea Correct return type of twig_date_converter 2019-12-09 17:33:08 +01:00
Fabien Potencier a5f91f3d8f Merge branch '2.x' into 3.x
* 2.x:
  Updated spaceless deprecation to point to `apply` tag, as the `filter` tag is now deprecated too
2019-11-28 15:04:38 +01:00
Fabien Potencier fdb691a424 minor #3205 Updated spaceless deprecation to point to apply tag, as the filter tag is now deprecated too (snebes)
This PR was squashed before being merged into the 2.x branch (closes #3205).

Discussion
----------

Updated spaceless deprecation to point to `apply` tag, as the `filter` tag is now deprecated too

Title says it all.  No reason to chase our tail if we find a random `spaceless` tag yet.

Commits
-------

a3435895 Updated spaceless deprecation to point to `apply` tag, as the `filter` tag is now deprecated too
2019-11-28 15:04:06 +01:00
Steve Nebes a343589583 Updated spaceless deprecation to point to apply tag, as the filter tag is now deprecated too 2019-11-28 15:04:01 +01:00
Fabien Potencier c433c6ae0b Merge branch '2.x' into 3.x
* 2.x:
  Fix tests
2019-11-28 15:03:28 +01:00
Fabien Potencier 41b651736c Merge branch '1.x' into 2.x
* 1.x:
  Fix tests
2019-11-28 15:02:56 +01:00
Fabien Potencier 3853841c9f minor #3206 Fix tests (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix tests

Commits
-------

8a6010f6 Fix tests
2019-11-28 15:02:09 +01:00
Fabien Potencier 8a6010f695 Fix tests 2019-11-28 14:58:09 +01:00
Fabien Potencier 1bce2f3051 Remove obsolete file 2019-11-18 18:30:31 +01:00
Fabien Potencier 3c5162ed7e Merge branch '2.x' into 3.x
* 2.x:
  Remove mention of the obsolete twig-extensions repository
  Remove usage of the old Autoloader class in the docs
2019-11-18 18:29:51 +01:00
Fabien Potencier aecce3d92e Merge branch '1.x' into 2.x
* 1.x:
  Remove mention of the obsolete twig-extensions repository
  Remove usage of the old Autoloader class in the docs
2019-11-18 18:29:44 +01:00
Fabien Potencier badf167c2c minor #3200 Remove mentions of the obsolete twig-extensions repository (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Remove mentions of the obsolete twig-extensions repository

Commits
-------

7f48a181 Remove mention of the obsolete twig-extensions repository
2019-11-18 18:28:41 +01:00
Fabien Potencier 7f48a181cd Remove mention of the obsolete twig-extensions repository 2019-11-18 18:27:43 +01:00
Fabien Potencier 6b2e6e6d05 Bump version to 3.0.1-DEV 2019-11-15 21:39:57 +01:00
Fabien Potencier 9b58bb8ac7 Prepare the 3.0.0 release v3.0.0 2019-11-15 21:38:32 +01:00
Fabien Potencier e2f3e2edfe Update CHANGELOG 2019-11-15 21:34:06 +01:00