Commit Graph

5292 Commits

Author SHA1 Message Date
Fabien Potencier 7da9b043c9 minor #3512 Fixing links (ThomasLandauer)
This PR was merged into the 2.x branch.

Discussion
----------

Fixing links

Commits
-------

cf7d50c4 Fixing links
2021-04-24 10:08:28 +02:00
Thomas Landauer cf7d50c411 Fixing links 2021-04-23 16:45:01 +02:00
Fabien Potencier f7250c6ea6 bug #3505 Fix code for PHP 8.1 (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix code for PHP 8.1

Commits
-------

953974a7 Fix code for PHP 8.1
2021-04-10 10:17:25 +02:00
Fabien Potencier 953974a7b3 Fix code for PHP 8.1 2021-04-10 10:14:28 +02:00
Fabien Potencier cc79d68e5d minor #3504 Tweak wording on docs (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Tweak wording on docs

Commits
-------

33729ab9 Tweak wording on docs
2021-04-10 09:43:44 +02:00
Fabien Potencier 33729ab9a3 Tweak wording on docs 2021-04-10 09:41:46 +02:00
Fabien Potencier 9266f505bc minor #3447 Adding link to RFC (ThomasLandauer)
This PR was squashed before being merged into the 2.x branch.

Discussion
----------

Adding link to RFC

Reason for rewording the `twig/extra-bundle` part: It was not clear what "use" means here:

> Then, use the twig/extra-bundle on Symfony projects

Commits
-------

56fd57b3 Adding link to RFC
2021-04-10 09:36:09 +02:00
Thomas Landauer 56fd57b32b Adding link to RFC 2021-04-10 09:36:04 +02:00
Fabien Potencier 02fe3a544c Merge branch '1.x' into 2.x
* 1.x:
  Fix: A template name cannot be an absolute path
2021-04-07 17:57:49 +02:00
Fabien Potencier 83f26e402b bug #3499 Fix: A template name cannot be an absolute path (mvorisek)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Fix: A template name cannot be an absolute path

fixes #3209, https://github.com/PrestaShop/PrestaShop/issues/20709

The source of this is in https://github.com/twigphp/Twig/blob/v3.3.0/src/Loader/FilesystemLoader.php#L212 which NEVER accepts an absolute name (path is always prefixed with path). As discussed in https://github.com/twigphp/Twig/issues/3209#issuecomment-814816613.

The original code emit php warning when `open_basedir` is set on Windows on NTS PHP build (because of PHP inconsistency between TS and NTS, see https://bugs.php.net/bug.php?id=78939). This PR fixes this issue and no warning is emitted.

This fix is important as Symfony relies on exception when absolute path is given in https://github.com/symfony/symfony/blob/v3.4.47/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php#L82.

Please merge and issue a patch release for every major Twig version.

Commits
-------

3a67fc7d Fix: A template name cannot be an absolute path
2021-04-07 17:57:29 +02:00
Michael Voříšek 3a67fc7dc5 Fix: A template name cannot be an absolute path 2021-04-07 17:57:24 +02:00
Fabien Potencier 1987bd0130 Fix CS 2021-04-07 17:49:48 +02:00
Thomas Landauer cfda3dd53d Slug filter: Mentioning requiredStringExtension
See https://github.com/twigphp/Twig/issues/3500#issuecomment-814923747
2021-04-07 17:45:21 +02:00
Fabien Potencier 5b5cfd8680 Fix CS 2021-04-07 17:42:46 +02:00
Fabien Potencier 7c35939dfe minor #3502 Added installation instructions (ThomasLandauer)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Added installation instructions

Commits
-------

4e2fd8f2 Added installation instructions
2021-04-07 17:41:33 +02:00
Thomas Landauer 4e2fd8f216 Added installation instructions 2021-04-07 17:41:24 +02:00
Fabien Potencier ec04504c9b Merge branch '1.x' into 2.x
* 1.x:
  Fix reference in docs
2021-04-06 08:27:19 +02:00
Fabien Potencier f5d3c704df Fix reference in docs 2021-04-06 08:27:15 +02:00
Fabien Potencier 36427589d0 minor #3498 Allow installation of league/html-to-markdown 5.x (colinodell)
This PR was merged into the 2.x branch.

Discussion
----------

Allow installation of league/html-to-markdown 5.x

Release notes: https://github.com/thephpleague/html-to-markdown/releases/tag/5.0.0

There were no changes that would impact how this Twig Markdown Extension calls the html-to-markdown library, meaning that both 4.8+ and 5.x should be fully compatible.

Commits
-------

2c6fa023 Allow installation of league/html-to-markdown 5.x
2021-04-01 14:19:05 +02:00
Colin O'Dell 2c6fa0236a Allow installation of league/html-to-markdown 5.x 2021-03-31 09:56:20 -04:00
Fabien Potencier 116bfb0bc9 Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
2021-03-22 09:23:49 +01:00
Fabien Potencier 9773024395 Fix CS 2021-03-22 09:23:44 +01:00
Fabien Potencier 0b103dfeb0 Merge branch '1.x' into 2.x
* 1.x:
  added PHP 8.1 as experimental
2021-03-22 09:23:06 +01:00
Fabien Potencier 47201dc3bc bug #3495 added PHP 8.1 as experimental (oleg-andreyev)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

added PHP 8.1 as experimental

fixes #3494

Commits
-------

bef89dcc added PHP 8.1 as experimental
2021-03-22 09:19:59 +01:00
Oleg Andreyev bef89dcc1e added PHP 8.1 as experimental 2021-03-22 09:19:53 +01:00
Fabien Potencier 37e48403c2 Bump version 2021-03-10 11:07:14 +01:00
Fabien Potencier 0b4ba691fb Prepare the 2.14.4 release v2.14.4 2021-03-10 11:05:55 +01:00
Fabien Potencier 728c611e86 minor #3488 [Doc] Update the Twig version where spaceless filter was added (javiereguiluz)
This PR was merged into the 2.x branch.

Discussion
----------

[Doc] Update the Twig version where spaceless filter was added

Commits
-------

e23852c8 [Doc] Update the Twig version where spaceless filter was added
2021-02-22 12:56:05 +01:00
Javier Eguiluz e23852c8c6 [Doc] Update the Twig version where spaceless filter was added 2021-02-22 12:47:30 +01:00
Fabien Potencier 429f90a02d Update CHANGELOG 2021-02-08 10:50:07 +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 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 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 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 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 f4e1429227 Fix compat with older Symfony versions 2021-01-05 16:21:23 +01:00
Fabien Potencier 393c9086ff Prepare the 2.14.2 release v2.14.2 2021-01-05 11:26:31 +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