Commit Graph

5485 Commits

Author SHA1 Message Date
Fabien Potencier 1327db55e9 Merge branch '2.x' into 3.x
* 2.x:
  Update format_time.rst
  Fix "include(template_from_string())"
  Fix PHPUnit config
2020-10-27 15:15:09 +01:00
Fabien Potencier 497f027cd4 Merge branch '1.x' into 2.x
* 1.x:
  Fix "include(template_from_string())"
  Fix PHPUnit config
2020-10-27 15:14:55 +01:00
Fabien Potencier 9fb2deee6e bug #3413 Fix "include(template_from_string())" when not using a sandbox (fabpot)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Fix "include(template_from_string())" when not using a sandbox

Closed #3411

Commits
-------

df9c9f21 Fix "include(template_from_string())"
3d91e335 Fix PHPUnit config
2020-10-27 15:14:35 +01:00
Fabien Potencier 1e2bc88d20 minor #3415 Update format_time.rst (ThomasLandauer)
This PR was merged into the 2.x branch.

Discussion
----------

Update format_time.rst

Adding link to format_datetime - same as https://github.com/twigphp/Twig/pull/3414

Commits
-------

51366923 Update format_time.rst
2020-10-27 14:49:21 +01:00
Thomas Landauer 51366923cc Update format_time.rst
Adding link to format_datetime - same as https://github.com/twigphp/Twig/pull/3414
2020-10-27 14:26:10 +01:00
Fabien Potencier 9712c4b156 Merge branch '2.x' into 3.x
* 2.x:
  Update format_date.rst
2020-10-27 13:59:52 +01:00
Fabien Potencier 7c15608957 minor #3414 Update format_date.rst (ThomasLandauer)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Update format_date.rst

Adding link to `format_datetime` - I hope the link syntax is correct :-)

Commits
-------

ce747dc4 Update format_date.rst
2020-10-27 13:59:12 +01:00
Thomas Landauer ce747dc4c6 Update format_date.rst
Adding link to `format_datetime` - I hope the link syntax is correct :-)
2020-10-27 13:59:07 +01:00
Fabien Potencier bfdaee83f4 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
2020-10-27 13:57:04 +01:00
Fabien Potencier 5fd9bf13bb Fix CS 2020-10-27 13:56:56 +01:00
Fabien Potencier d0185a77d3 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CHANGELOG
  Bump version to 2.14.1-DEV
  Prepare the 2.14.0 release
  Bump version to 1.44.1-DEV
  Prepare the 1.44.0 release
2020-10-27 13:56:17 +01:00
Fabien Potencier 8548e6f5b3 Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
  Bump version to 1.44.1-DEV
  Prepare the 1.44.0 release
2020-10-27 13:55:39 +01:00
Fabien Potencier 3078be718c Fix CS 2020-10-27 13:53:45 +01:00
Fabien Potencier df9c9f2165 Fix "include(template_from_string())" 2020-10-27 13:39:31 +01:00
Fabien Potencier 3d91e33522 Fix PHPUnit config 2020-10-27 13:37:42 +01:00
Fabien Potencier 4f16844c1c Bump version to 3.1.1-DEV 2020-10-21 15:08:11 +02:00
Fabien Potencier 78173b3c85 Fix CHANGELOG 2020-10-21 14:45:52 +02:00
Fabien Potencier 9a29e1fa7b Prepare the 3.1.0 release v3.1.0 2020-10-21 14:45:34 +02:00
Fabien Potencier 59a3b141a7 Bump version to 2.14.1-DEV 2020-10-21 14:44:28 +02:00
Fabien Potencier d495243dad Prepare the 2.14.0 release v2.14.0 2020-10-21 14:35:06 +02:00
Fabien Potencier 18f9309f35 Bump version to 1.44.1-DEV 2020-10-21 14:33:23 +02:00
Fabien Potencier e7c93a4af5 Prepare the 1.44.0 release v1.44.0 2020-10-21 14:32:35 +02:00
Fabien Potencier df7471fed6 Merge branch '2.x' into 3.x
* 2.x:
  Fix PHP 8 support
2020-10-21 14:27:08 +02:00
Fabien Potencier 53650c55c1 Merge branch '1.x' into 2.x
* 1.x:
  Fix PHP 8 support
2020-10-21 14:27:01 +02:00
Fabien Potencier b1c9faa33e Fix PHP 8 support 2020-10-21 14:08:16 +02:00
Fabien Potencier 3c56677c85 Merge branch '2.x' into 3.x
* 2.x:
  Fix PHP 8 support
2020-10-21 13:43:41 +02:00
Fabien Potencier 2ffab581fe Merge branch '1.x' into 2.x
* 1.x:
  Fix PHP 8 support
2020-10-21 13:43:35 +02:00
Fabien Potencier d46aeb0724 Fix PHP 8 support 2020-10-21 13:43:26 +02:00
Fabien Potencier 552c6bafe0 Merge branch '2.x' into 3.x
* 2.x:
  Drop support for PHP 7.1
  Update CHANGELOG
  Emphase the fact that the include tag outputs data
  Update ChANGELOG
2020-10-21 12:25:26 +02:00
Fabien Potencier dbc45e2421 Merge branch '1.x' into 2.x
* 1.x:
  Drop support for PHP 7.1
  Update CHANGELOG
  Emphase the fact that the include tag outputs data
  Update ChANGELOG
2020-10-21 12:24:53 +02:00
Fabien Potencier 4058579e9b feature #3410 Drop support for PHP 7.1 (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Drop support for PHP 7.1

Commits
-------

83d8e431 Drop support for PHP 7.1
2020-10-21 12:23:09 +02:00
Fabien Potencier 83d8e43136 Drop support for PHP 7.1 2020-10-21 12:11:02 +02:00
Fabien Potencier 4fa38c37f7 Update CHANGELOG 2020-10-21 11:56:12 +02:00
Fabien Potencier 9b76dcd70f Merge branch '2.x' into 3.x
* 2.x:
  Tweak docs
  Improving truncate documentation
2020-10-14 08:38:04 +02:00
Fabien Potencier fa2f1ccdb4 Tweak docs 2020-10-14 08:37:57 +02:00
Fabien Potencier 996f784c19 minor #3407 Improving truncate documentation (cavemon)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Improving truncate documentation

Adding description and example of third parameter for `truncate` method to preserve whole words.  This seems like a common use case and extremely useful addition that should be documented.

Commits
-------

cc017dec Improving truncate documentation
2020-10-14 08:37:17 +02:00
cavemon cc017decd1 Improving truncate documentation
Adding description and example of third parameter for `truncate` method to preserve whole words.  This seems like a common use case and extremely useful addition that should be documented.
2020-10-14 08:37:11 +02:00
Fabien Potencier e54fe12355 Merge branch '2.x' into 3.x
* 2.x:
  Tweak docs
  [doc] Quick access to ICU user guide
2020-10-14 08:35:48 +02:00
Fabien Potencier af6f99f7f6 Tweak docs 2020-10-14 08:35:38 +02:00
Fabien Potencier 8b79e441f9 minor #3409 [doc] Quick access to ICU user guide (SiM07)
This PR was submitted for the 3.x branch but it was squashed and merged into the 2.x branch instead.

Discussion
----------

[doc] Quick access to ICU user guide

I usefull to access quicky to pattern documentation.

Commits
-------

90a2278d [doc] Quick access to ICU user guide
2020-10-14 08:34:41 +02:00
Simon Rolland 90a2278d60 [doc] Quick access to ICU user guide 2020-10-14 08:34:35 +02:00
Fabien Potencier 545f399f47 minor #3406 [Documentation] Emphase the fact that the include tag outputs data (nstCactus)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.

Discussion
----------

[Documentation] Emphase the fact that the include tag outputs data

Commits
-------

ef6debec Emphase the fact that the include tag outputs data
2020-10-07 10:01:49 +02:00
nstCactus ef6debec55 Emphase the fact that the include tag outputs data 2020-10-07 10:01:43 +02:00
Fabien Potencier 437c86db9b Update ChANGELOG 2020-09-27 07:04:55 +02:00
Fabien Potencier dba3517f4b Merge branch '2.x' into 3.x
* 2.x:
  Fix missing delimiter for preg_quote in lexer
2020-09-27 07:01:41 +02:00
Fabien Potencier f4aacffcbb Merge branch '1.x' into 2.x
* 1.x:
  Fix missing delimiter for preg_quote in lexer
2020-09-27 07:01:29 +02:00
Fabien Potencier b67eb715f2 bug #3401 Fix missing delimiter for preg_quote in lexer (waitxd)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Fix missing delimiter for preg_quote in lexer

Is is a really edge case (PHP < 7.3 and '#' as whitespace_trim symbol), but for the sake of consistency here's a proper fix.

Commits
-------

41605057 Fix missing delimiter for preg_quote in lexer
2020-09-27 06:58:47 +02:00
wait 41605057a4 Fix missing delimiter for preg_quote in lexer 2020-09-27 06:58:41 +02:00
Fabien Potencier 02586c7ad3 Merge branch '2.x' into 3.x
* 2.x:
  Add another paragraph about mentioning another needed library
2020-09-25 18:21:56 +02:00
Fabien Potencier 573c50dd67 minor #3400 Add another paragraph about mentioning another needed library (OskarStark)
This PR was submitted for the 3.x branch but it was squashed and merged into the 2.x branch instead.

Discussion
----------

Add another paragraph about mentioning another needed library

Commits
-------

4584576c Add another paragraph about mentioning another needed library
2020-09-25 18:21:38 +02:00