geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,025 Commits 10 Branches 273 Tags
6a50ca063904a8bf657e95cd0cfa89db138dc7ac
Commit Graph

5025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier 6a50ca0639 Revert previous merge partially 2019-10-01 12:35:06 +02:00
Fabien Potencier 92c4287b81 Merge branch '2.x' into 3.x 
* 2.x:
  Twig 2 is compatible with PHP 7.0
 2019-10-01 12:33:23 +02:00
Fabien Potencier 4625774716 feature #3157 Twig 2 is compatible with PHP 7.0 (nicolas-grekas) 
This PR was merged into the 2.x branch.

Discussion
----------

Twig 2 is compatible with PHP 7.0

7.1 was needed for #3102, but this is not the case anymore since #3113

Commits
-------

b845ed96 Twig 2 is compatible with PHP 7.0
 2019-10-01 12:31:38 +02:00
Fabien Potencier b50062d269 Merge branch '2.x' into 3.x 
* 2.x:
  Fix issue #3159
  Fix issue #3160
 2019-10-01 12:18:56 +02:00
Fabien Potencier f8c5f86761 Merge branch '1.x' into 2.x 
* 1.x:
  Fix issue #3159
  Fix issue #3160
 2019-10-01 12:18:48 +02:00
Fabien Potencier 8909a16264 minor #3163 Fix issue #3159 (ericmorand) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3163).

Discussion
----------

Fix issue #3159

Commits
-------

cfac11e9 Fix issue #3159
 2019-10-01 12:18:05 +02:00
Eric MORAND cfac11e98a Fix issue #3159 2019-10-01 12:18:00 +02:00
Fabien Potencier 0d2b2aabf6 minor #3164 Fix issue #3160 (ericmorand) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3164).

Discussion
----------

Fix issue #3160

Commits
-------

4eb40f2f Fix issue #3160
 2019-10-01 12:13:33 +02:00
Eric MORAND 4eb40f2fc8 Fix issue #3160 2019-10-01 12:13:28 +02:00
Fabien Potencier 21033f1348 minor #3158 [3] Fix leftover (nicolas-grekas) 
This PR was merged into the 3.x branch.

Discussion
----------

[3] Fix leftover

Commits
-------

551a6c1c [3] Fix leftover
 2019-09-22 19:18:32 +02:00
Nicolas Grekas 551a6c1cb8 [3] Fix leftover 2019-09-20 15:26:44 +02:00
Nicolas Grekas b845ed969e Twig 2 is compatible with PHP 7.0 2019-09-20 15:13:40 +02:00
Fabien Potencier a22e04e35f feature #3156 [3.0] remove the most blocking return types (nicolas-grekas) 
This PR was merged into the 3.x branch.

Discussion
----------

[3.0] remove the most blocking return types

These return types make it needlessly hard to move to Twig 3.
This should make Symfony 4.4 compatible with Twig 3, and should help make the CI of Symfony 5 green.
> `Declaration of Twig\Extra\CssInliner\CssInlinerExtension::getFilters() must be compatible with Twig\Extension\AbstractExtension::getFilters(): array in /home/travis/build/symfony/symfony/vendor/twig/cssinliner-extra/src/CssInlinerExtension.php`

Commits
-------

ac0f5125 [3.0] remove the most blocking return types
 2019-09-20 15:05:43 +02:00
Nicolas Grekas ac0f512553 [3.0] remove the most blocking return types 2019-09-20 15:04:28 +02:00
Fabien Potencier aab339e211 Fix code 2019-09-20 15:04:21 +02:00
Fabien Potencier ada0355047 Merge branch '2.x' into 3.x 
* 2.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
 2019-09-20 14:54:03 +02:00
Fabien Potencier c2fd9990fc Merge branch '1.x' into 2.x 
* 1.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
 2019-09-20 14:53:54 +02:00
Fabien Potencier 4d766ec17b bug #3155 Optimize block('foo') ?? 'bar' (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Optimize block('foo') ?? 'bar'

closes #3154

Commits
-------

7a99a4e7 Optimize block('foo') ?? 'bar'
 2019-09-20 14:45:25 +02:00
Fabien Potencier 7a99a4e7e5 Optimize block('foo') ?? 'bar' 2019-09-20 12:40:56 +02:00
Fabien Potencier 8599981de8 Merge branch '2.x' into 3.x 
* 2.x:
  Bump min version for pinky
  fix variable name
 2019-09-17 08:08:20 +02:00
Fabien Potencier d83802c011 Bump min version for pinky 2019-09-17 08:08:14 +02:00
Fabien Potencier ada3096c0b minor #3150 fix variable name (galdiolo) 
This PR was merged into the 2.x branch.

Discussion
----------

fix variable name

Commits
-------

2cb5387e fix variable name
 2019-09-15 10:34:00 +02:00
Claudio Galdiolo 2cb5387e75 fix variable name 2019-09-14 13:04:38 +02:00
Fabien Potencier ab735c7a1d Merge branch '2.x' into 3.x 
* 2.x:
  Move country_timezone to a function
  Renamed inky to inky_to_html
  Minor fix in a filter description
  Minor fixes in the docs of some intl filters
 2019-09-07 14:46:43 +02:00
Fabien Potencier ac72085e78 feature #3149 Move country_timezone to a function (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Move country_timezone to a function

Commits
-------

c046e69e Move country_timezone to a function
 2019-09-07 09:26:32 +02:00
Fabien Potencier 1fcf9143e2 feature #3148 Rename inky to inky_to_html (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Rename inky to inky_to_html

closes #3142

Commits
-------

9f9a2088 Renamed inky to inky_to_html
 2019-09-07 09:25:39 +02:00
Fabien Potencier c046e69e67 Move country_timezone to a function 2019-09-07 08:58:31 +02:00
Fabien Potencier 9f9a2088a7 Renamed inky to inky_to_html 2019-09-07 08:57:51 +02:00
Fabien Potencier 2a9fa7ba93 minor #3147 Minor fix in a filter description (javiereguiluz) 
This PR was merged into the 2.x branch.

Discussion
----------

Minor fix in a filter description

Commits
-------

890d507f Minor fix in a filter description
 2019-09-07 08:25:43 +02:00
Javier Eguiluz 890d507ff1 Minor fix in a filter description 2019-09-06 19:55:25 +02:00
Fabien Potencier 18f56ad9b2 minor #3146 Minor fixes in the docs of some intl filters (javiereguiluz) 
This PR was merged into the 2.x branch.

Discussion
----------

Minor fixes in the docs of some intl filters

I'll do another PR to fix https://github.com/twigphp/intl-extra/README.md

Commits
-------

b9abb294 Minor fixes in the docs of some intl filters
 2019-09-06 17:38:53 +02:00
Javier Eguiluz b9abb294ab Minor fixes in the docs of some intl filters 2019-09-06 17:34:43 +02:00
Fabien Potencier 144c557bb1 bumped version to 1.42.4-DEV 2019-08-24 14:51:38 +02:00
Fabien Potencier 201baee843 prepared the 1.42.3 release v1.42.3 2019-08-24 14:51:03 +02:00
Fabien Potencier 743135fcc1 updated ChANGELOG 2019-08-24 14:49:29 +02:00
Fabien Potencier c4931cf603 Merge branch '2.x' into 3.x 
* 2.x:
  Handle opcache_invalidate() being disabled on shared hosting platforms
 2019-08-21 07:13:11 +02:00
Fabien Potencier 38341bbefd Merge branch '1.x' into 2.x 
* 1.x:
  Handle opcache_invalidate() being disabled on shared hosting platforms
 2019-08-21 07:13:01 +02:00
Fabien Potencier 5ed74a1bae bug #3105 Handle opcache_invalidate() being disabled on shared hosting platforms (RhvsW) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3105).

Discussion
----------

Handle opcache_invalidate() being disabled on shared hosting platforms

This fix makes twig gracefully fail on opcache API being disabled on shared hosting platforms for security reasons.
Tested with Grav CMS.

Commits
-------

349a5f26 Handle opcache_invalidate() being disabled on shared hosting platforms
 2019-08-21 07:12:26 +02:00
Rhys 349a5f26c3 Handle opcache_invalidate() being disabled on shared hosting platforms 
This fix makes twig gracefully fail on opcache API being disabled on shared hosting platforms for security reasons.
Tested with Grav CMS.
 2019-08-21 07:12:20 +02:00
Fabien Potencier e78c489deb Merge branch '2.x' into 3.x 
* 2.x:
  added the spaceship operator
  added support for an "arrow" function on the "sort" filter
 2019-08-20 10:38:25 +02:00
Fabien Potencier 55704ce1d2 feature #3133 Add the spaceship operator (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add the spaceship operator

Commits
-------

f5950a5b added the spaceship operator
 2019-08-20 10:37:55 +02:00
Fabien Potencier f5950a5b1f added the spaceship operator 2019-08-20 10:30:06 +02:00
Fabien Potencier 491d4a814d feature #3132 Add support for an "arrow" function on the "sort" filter (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add support for an "arrow" function on the "sort" filter

closes #3131

Commits
-------

330024b6 added support for an "arrow" function on the "sort" filter
 2019-08-20 10:29:20 +02:00
Fabien Potencier 330024b67e added support for an "arrow" function on the "sort" filter 2019-08-20 10:18:43 +02:00
Fabien Potencier e5b29ee1f7 Merge branch '2.x' into 3.x 
* 2.x:
  cleaned up the code
  Fix intl-extra docs and links
  removed unneeded condition
  moved mime to req
 2019-08-12 09:27:28 +02:00
Fabien Potencier 163f6a0979 minor #3126 Clean up the code (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Clean up the code

Commits
-------

ba8f7a5e cleaned up the code
 2019-08-12 09:26:54 +02:00
Fabien Potencier ba8f7a5e4c cleaned up the code 2019-08-12 09:23:06 +02:00
Fabien Potencier 905f551621 minor #3125 Fix intl-extra docs and links (pierredup) 
This PR was squashed before being merged into the 2.x branch (closes #3125).

Discussion
----------

Fix intl-extra docs and links

Commits
-------

6f73ac72 Fix intl-extra docs and links
 2019-08-12 09:17:35 +02:00
Pierre du Plessis 6f73ac72de Fix intl-extra docs and links 2019-08-12 09:17:28 +02:00
Fabien Potencier cf444dde71 removed unneeded condition 2019-08-12 08:43:14 +02:00