Commit Graph

5604 Commits

Author SHA1 Message Date
Ryan Weaver ef15dd3abf Allowing compat with Twig 2 by conditionally calling method 2021-02-06 16:13:17 -05:00
Fabien Potencier b0764968c2 minor #3483 Invalid "tag" configuration key (mikemix)
This PR was merged into the 3.x branch.

Discussion
----------

Invalid "tag" configuration key

Commits
-------

849bfacf Invalid "tag" configuration key
2021-02-05 11:26:07 +01:00
Mike Zukowsky 849bfacfeb Invalid "tag" configuration key 2021-02-04 22:58:33 +01:00
Fabien Potencier b0863c559c Merge branch '2.x' into 3.x
* 2.x:
  Add some return types
  remove the C extension
  Fix length filter doc
2021-02-02 16:25:52 +01:00
Fabien Potencier 5a60e72afa Merge branch '1.x' into 2.x
* 1.x:
  Add some return types
  remove the C extension
  Fix length filter doc
2021-02-02 16:25:09 +01:00
Fabien Potencier ad02eb9236 minor #3481 Fix length filter doc Add some return types (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Fix length filter doc Add some return types

These return types preemptively tell consumers that Twig 4 / PHP 9 might add real return types here.

For `Profile`, we can add the return types right away because the class is `@final`.

Spotted by DebugClassLoader comparing return types of internal PHP base types / magic methods.

Commits
-------

50d032c4 Add some return types
2021-02-02 16:24:34 +01:00
Nicolas Grekas 50d032c4df Add some return types 2021-02-02 16:16:41 +01:00
Fabien Potencier a8d40e3a4a Merge branch '2.x' into 3.x
* 2.x:
  Add slug filter (follow-up to PR #3386)
2021-01-29 15:39:43 +01:00
Fabien Potencier bfc7a6097f feature #3478 Add slug filter (follow-up to PR #3386) (EmilePerron)
This PR was submitted for the 3.x branch but it was squashed and merged into the 2.x branch instead.

Discussion
----------

Add slug filter (follow-up to PR #3386)

Hi,

This is a follow-up to PR #3386, in which @seb-jean had done most of the work.

I went ahead and implemented the remaining fixes for the pending comments/reviews, and added some documentation on the filter.

Let me know if anything else should be done before this can be merged, and I will get it done ASAP.

Cheers!

Commits
-------

0fd67941 Add slug filter (follow-up to PR #3386)
2021-01-29 15:39:11 +01:00
Émile Perron 0fd67941be Add slug filter (follow-up to PR #3386) 2021-01-29 15:39:04 +01:00
Fabien Potencier bfcf4091a9 minor #3476 remove the C extension (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

remove the C extension

fixes #3474

Commits
-------

db9cb3af remove the C extension
2021-01-26 10:11:36 +01:00
Christian Flothmann db9cb3af68 remove the C extension 2021-01-26 09:00:57 +01:00
Fabien Potencier 0fc3341a39 minor #3473 Fix length filter documentation about computation (VincentLanglet)
This PR was merged into the 1.x branch.

Discussion
----------

Fix length filter documentation about computation

According to https://github.com/twigphp/Twig/blob/1.x/src/Extension/CoreExtension.php#L1317

Commits
-------

473f73ef Fix length filter doc
2021-01-15 14:14:47 +01:00
Vincent Langlet 473f73ef2e Fix length filter doc 2021-01-15 12:57:47 +01:00
Fabien Potencier 4a47f0f5b4 Merge branch '2.x' into 3.x
* 2.x:
  Adding link to the SymfonyCasts Twig tutorial
2021-01-14 08:57:41 +01:00
Fabien Potencier 1a0162a612 Merge branch '1.x' into 2.x
* 1.x:
  Adding link to the SymfonyCasts Twig tutorial
2021-01-14 08:57:35 +01:00
Fabien Potencier 91e1a3cd56 minor #3472 Adding link to the SymfonyCasts Twig tutorial (weaverryan)
This PR was merged into the 1.x branch.

Discussion
----------

Adding link to the SymfonyCasts Twig tutorial

Hi!

We have (and have had) for a long time, a really nice Twig screencast on SymfonyCasts with interactive coding challenges so people can play with Twig. I thought a link from Twig's docs might be useful :). I was also thinking a link from https://twig.symfony.com/doc/3.x/ might make sense, but I think this isn't modifiable directly via the docs (but tell me if I'm wrong).

Here's the "look":

<img width="776" alt="Screen Shot 2021-01-13 at 1 07 40 PM" src="https://user-images.githubusercontent.com/121003/104491678-93ef6480-55a0-11eb-9dce-db24c0748267.png">

Thanks!

Commits
-------

500a7da9 Adding link to the SymfonyCasts Twig tutorial
2021-01-14 08:57:08 +01:00
Ryan Weaver 500a7da999 Adding link to the SymfonyCasts Twig tutorial 2021-01-13 13:07:49 -05:00
Fabien Potencier 7f5700f2bd Fix CHANGELOG 2021-01-12 13:19:16 +01:00
Fabien Potencier 15211849ad bug #3469 Allow macro calls and definition inside cache tag (Yann ROTROU)
This PR was merged into the 3.x branch.

Discussion
----------

Allow macro calls and definition inside cache tag

Solve #3466

Commits
-------

0bdad6fb Allow macro calls and definition inside cache tag
2021-01-12 13:18:26 +01:00
Yann ROTROU 0bdad6fbdc Allow macro calls and definition inside cache tag 2021-01-11 18:30:42 +01:00
Fabien Potencier 2179df17ee Bump version 2021-01-05 16:41:50 +01:00
Fabien Potencier f795ca686d Prepare the 2.14.3 release v3.2.1 2021-01-05 16:40:36 +01:00
Fabien Potencier 151d198eb2 Update CHANGELOG 2021-01-05 16:40:13 +01:00
Fabien Potencier 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
Fabien Potencier a0e2cc2572 Bump version 2021-01-05 16:39:16 +01:00
Fabien Potencier 8bc568d460 Prepare the 2.14.3 release v2.14.3 2021-01-05 16:34:33 +01:00
Fabien Potencier 3c4fe439b8 Fix compat with older Symfony versions 2021-01-05 16:24:51 +01:00
Fabien Potencier 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
Fabien Potencier 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 Fix compat with older Symfony versions
2021-01-05 16:23:26 +01:00
Fabien Potencier 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 require twig/twig ^3.2
2021-01-05 16:22:52 +01:00
Fabien Potencier f4e1429227 Fix compat with older Symfony versions 2021-01-05 16:21:23 +01:00
sylvia-vdv 3dfcaec0ce require twig/twig ^3.2 2021-01-05 16:13:50 +01:00
Fabien Potencier 393c9086ff Prepare the 2.14.2 release v2.14.2 2021-01-05 11:26:31 +01:00
Fabien Potencier 8ce9dcdf05 Bump version 2021-01-05 11:24:45 +01:00
Fabien Potencier bc4f0e2d62 Prepare the 3.2.0 release 2021-01-05 11:22:42 +01:00
Fabien Potencier bf0adab6ea Update CHANGELOG 2021-01-05 11:21:57 +01:00
Fabien Potencier 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
Fabien Potencier 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
Fabien Potencier 31adc5e157 Bump version to ${NEXT_VERSION}-DEV 2021-01-05 11:10:47 +01:00
Fabien Potencier 138c493c5b Prepare the 1.44.2 release v1.44.2 2021-01-05 11:10:05 +01:00
Fabien Potencier c04c68f2d3 Update CHANGELOG 2021-01-05 11:09:30 +01:00
Fabien Potencier 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
-------

fff62b9e Improve wiring
4d036a91 Add a cache tag
2021-01-05 11:05:34 +01:00
Nicolas Grekas fff62b9eb1 Improve wiring 2021-01-05 10:59:10 +01:00
Fabien Potencier 4d036a9148 Add a cache tag 2021-01-05 10:59:10 +01:00
Fabien Potencier cb88e0a68c Merge branch '2.x' into 3.x
* 2.x:
  Move things around
2021-01-01 15:58:18 +01:00
Fabien Potencier 846ebbd7c8 minor #3461 Move things around (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Move things around

Commits
-------

18689187 Move things around
2021-01-01 15:57:43 +01:00
Fabien Potencier 1868918724 Move things around 2021-01-01 15:53:48 +01:00
Fabien Potencier 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
Fabien Potencier 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 Move Extra Bundle config from XML to PHP
2021-01-01 15:33:06 +01:00