151d198eb2
Update CHANGELOG
2021-01-05 16:40:13 +01:00
6506035f9b
Merge branch '2.x' into 3.x
...
* 2.x:
Bump version
Prepare the 2.14.3 release
2021-01-05 16:39:55 +01:00
a0e2cc2572
Bump version
2021-01-05 16:39:16 +01:00
8bc568d460
Prepare the 2.14.3 release
2021-01-05 16:34:33 +01:00
3c4fe439b8
Fix compat with older Symfony versions
2021-01-05 16:24:51 +01:00
24fc19a36e
Merge branch '2.x' into 3.x
...
* 2.x:
Fix compat with older Symfony versions
Prepare the 2.14.2 release
2021-01-05 16:24:12 +01:00
33a9f2eae3
bug #3464 Fix compat with older Symfony versions (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix compat with older Symfony versions
Commits
-------
f4e14292
2021-01-05 16:23:26 +01:00
7656536b8c
bug #3463 Twig extra bundle now requires twig 3.2 (sylvia-vdv)
...
This PR was merged into the 3.x branch.
Discussion
----------
Twig extra bundle now requires twig 3.2
Updated requirements of composer.json in twig/extra/twig-extra-bundle:
Due to the addition of `registerUndefinedTokenParserCallback ` in the file `Twig/extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php`, version 3.2 of twig/twig is also required.
With older versions of twig/twig installed, an error is thrown:
```
Attempted to call an undefined method named "registerUndefinedTokenParserCallback" of class "Twig\Environment".
Did you mean to call e.g. "registerUndefinedFilterCallback" or "registerUndefinedFunctionCallback"?
```
Commits
-------
3dfcaec0
2021-01-05 16:22:52 +01:00
f4e1429227
Fix compat with older Symfony versions
2021-01-05 16:21:23 +01:00
3dfcaec0ce
require twig/twig ^3.2
2021-01-05 16:13:50 +01:00
393c9086ff
Prepare the 2.14.2 release
2021-01-05 11:26:31 +01:00
8ce9dcdf05
Bump version
2021-01-05 11:24:45 +01:00
bc4f0e2d62
Prepare the 3.2.0 release
2021-01-05 11:22:42 +01:00
bf0adab6ea
Update CHANGELOG
2021-01-05 11:21:57 +01:00
f8ab360f02
Merge branch '2.x' into 3.x
...
* 2.x:
Bump version to ${NEXT_VERSION}-DEV
Prepare the 1.44.2 release
Update CHANGELOG
2021-01-05 11:11:51 +01:00
3d9c908c84
Merge branch '1.x' into 2.x
...
* 1.x:
Bump version to ${NEXT_VERSION}-DEV
Prepare the 1.44.2 release
Update CHANGELOG
2021-01-05 11:11:45 +01:00
31adc5e157
Bump version to ${NEXT_VERSION}-DEV
2021-01-05 11:10:47 +01:00
138c493c5b
Prepare the 1.44.2 release
2021-01-05 11:10:05 +01:00
c04c68f2d3
Update CHANGELOG
2021-01-05 11:09:30 +01:00
718468e086
feature #3459 Add a cache tag (fabpot, nicolas-grekas)
...
This PR was merged into the 3.x branch.
Discussion
----------
Add a cache tag
Add a "cache" tag based on the Symfony cache component.
Replaces https://github.com/twigphp/twig-cache-extension and https://github.com/asm89/twig-cache-extension
Commits
-------
fff62b9e4d036a91
2021-01-05 11:05:34 +01:00
fff62b9eb1
Improve wiring
2021-01-05 10:59:10 +01:00
4d036a9148
Add a cache tag
2021-01-05 10:59:10 +01:00
cb88e0a68c
Merge branch '2.x' into 3.x
...
* 2.x:
Move things around
2021-01-01 15:58:18 +01:00
846ebbd7c8
minor #3461 Move things around (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Move things around
Commits
-------
18689187
2021-01-01 15:57:43 +01:00
1868918724
Move things around
2021-01-01 15:53:48 +01:00
b0afeb512e
Merge branch '2.x' into 3.x
...
* 2.x:
Move Extra Bundle config from XML to PHP
bump license year
2021-01-01 15:33:39 +01:00
7314edbb8a
minor #3460 Move Extra Bundle config from XML to PHP (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Move Extra Bundle config from XML to PHP
Commits
-------
b9712ce1
2021-01-01 15:33:06 +01:00
b9712ce137
Move Extra Bundle config from XML to PHP
2021-01-01 15:29:30 +01:00
7fab4be1bb
minor #3457 bump license year (abdounikarim)
...
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.
Discussion
----------
bump license year
Hello,
I updated licenses year to 2021.
Commits
-------
bed8f31b
2021-01-01 10:21:08 +01:00
bed8f31b96
bump license year
2021-01-01 10:21:03 +01:00
351a97ed15
Fix Composer version
2021-01-01 10:05:00 +01:00
5162646cfa
Merge branch '2.x' into 3.x
...
* 2.x:
Fix Composer version
2021-01-01 10:04:14 +01:00
dae3868f04
Fix Composer version
2021-01-01 10:02:52 +01:00
903461aeab
feature #3458 Add "registerUndefinedTokenParserCallback" (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Add "registerUndefinedTokenParserCallback"
Commits
-------
81751d66
2020-12-31 09:20:27 +01:00
81751d6671
Add "registerUndefinedTokenParserCallback"
2020-12-31 09:12:48 +01:00
dc7e21fb20
Merge branch '2.x' into 3.x
...
* 2.x:
Remove some PHP in docs
2020-12-30 09:23:56 +01:00
39991a167c
Remove some PHP in docs
2020-12-30 09:23:51 +01:00
e8e9e0fba3
Bump version
2020-12-30 09:19:17 +01:00
8eb855ffb6
Bump version
2020-12-30 09:17:29 +01:00
9ec64811c2
Merge branch '2.x' into 3.x
...
* 2.x:
Bump copyright year
2020-12-30 09:16:33 +01:00
9fd55773e3
Merge branch '1.x' into 2.x
...
* 1.x:
Bump copyright year
2020-12-30 09:16:23 +01:00
d6cbc70064
Bump copyright year
2020-12-30 09:16:13 +01:00
e3bca056f1
feature #3448 Mark built-in node visitors as @internal (fabpot)
...
This PR was squashed before being merged into the 3.x branch.
Discussion
----------
Mark built-in node visitors as @internal
refs #3445
Commits
-------
b95735daca3bb518
2020-11-30 13:06:55 +01:00
b95735da2e
Mark built-in token parsers as @internal
2020-11-30 12:04:32 +01:00
ca3bb5188c
Mark built-in node visitors as @internal
2020-11-30 09:16:20 +01:00
155f7404df
Merge branch '2.x' into 3.x
...
* 2.x:
Fix typo
Typo
2020-11-27 14:05:45 +01:00
c5379903e5
Merge branch '1.x' into 2.x
...
* 1.x:
Fix typo
Typo
2020-11-27 14:05:37 +01:00
2f0947e1af
Fix typo
2020-11-27 14:05:10 +01:00
0feba1ade4
minor #3442 Typo (OlafvdSpek)
...
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.
Discussion
----------
Typo
Commits
-------
43f382ba
2020-11-27 14:04:49 +01:00
43f382ba1b
Typo
2020-11-27 14:04:41 +01:00
Fabien Potencier
sylvia-vdv
Nicolas Grekas
abdounikarim
Olaf van der Spek