Commit Graph

5653 Commits

Author SHA1 Message Date
Den 17c6371fb5 Some code style fixes 2021-05-14 10:26:05 +02:00
Fabien Potencier 32d72de188 minor #3508 Add missing arguments in intl docs (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Add missing arguments in intl docs

Commits
-------

c0f02244 Add missing arguments in intl docs
2021-04-15 12:09:30 +02:00
Fabien Potencier c0f02244c3 Add missing arguments in intl docs 2021-04-15 11:42:44 +02:00
Fabien Potencier 5557d48e0e Revert 2021-04-10 10:18:09 +02:00
Fabien Potencier 680e42979a Merge branch '2.x' into 3.x
* 2.x:
  Fix code for PHP 8.1
2021-04-10 10:17:37 +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 eda44caf9b Merge branch '2.x' into 3.x
* 2.x:
  Tweak wording on docs
  Adding link to RFC
2021-04-10 09:46:12 +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 f1e0ebc18a Merge branch '2.x' into 3.x
* 2.x:
  Fix: A template name cannot be an absolute path
2021-04-07 17:57:57 +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 6833f77550 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Slug filter: Mentioning requiredStringExtension
  Fix CS
  Added installation instructions
2021-04-07 17:50:10 +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 a4c3ce956e minor #3501 Slug filter: Mentioning requiredStringExtension (ThomasLandauer)
This PR was merged into the 3.x branch.

Discussion
----------

Slug filter: Mentioning requiredStringExtension

See https://github.com/twigphp/Twig/issues/3500#issuecomment-814923747

BTW: This PR is similar, please take a look too: https://github.com/twigphp/Twig/pull/3447

Commits
-------

84f6e32f Slug filter: Mentioning requiredStringExtension
2021-04-07 17:44:42 +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
Thomas Landauer 84f6e32f30 Slug filter: Mentioning requiredStringExtension
See https://github.com/twigphp/Twig/issues/3500#issuecomment-814923747
2021-04-07 16:56:57 +02:00
Fabien Potencier cdd521375e Merge branch '2.x' into 3.x
* 2.x:
  Fix reference in docs
2021-04-06 08:27:27 +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 69c4e24d6a Merge branch '2.x' into 3.x
* 2.x:
  Allow installation of league/html-to-markdown 5.x
2021-04-01 14:19:25 +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 94b7c1c2f6 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  added PHP 8.1 as experimental
2021-03-22 09:23:56 +01: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 be5dc6a6c4 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.4 release
2021-03-10 11:08:48 +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 925e9c9112 Bump version 2021-03-10 11:04:02 +01:00
Fabien Potencier ffd778b6ce Merge branch '2.x' into 3.x
* 2.x:
  [Doc] Update the Twig version where spaceless filter was added
2021-03-10 11:02:03 +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 1f3b7e2c06 Prepare the 3.3.0 release v3.3.0 2021-02-08 10:54:36 +01:00
Fabien Potencier d56d9b13be Bump version to 3.3.0 2021-02-08 10:54:03 +01:00
Fabien Potencier 9d9e9e3f17 Update CHANGELOG 2021-02-08 10:51:31 +01:00
Fabien Potencier 377059bc76 Merge branch '2.x' into 3.x
* 2.x:
  Update CHANGELOG
2021-02-08 10:50:13 +01:00
Fabien Potencier 429f90a02d Update CHANGELOG 2021-02-08 10:50:07 +01:00
Fabien Potencier 7a72546222 bug #3484 Allowing compat with Twig 2 by conditionally calling method (weaverryan)
This PR was merged into the 3.x branch.

Discussion
----------

Allowing compat with Twig 2 by conditionally calling method

This is an annoying, edge-case issue. The original fix was #3463. The problem, discovered by MakerBundle's tests (I'm not sure why it didn't pop up sooner) is if you're using PHP 7.1... for example with Symfony 4.4 LTS. In that situation, if you run:

```
composer require symfony/twig-pack
```

You will get:

* `twig/twig` v2 (since v3 required PHP 7.2)
* `twig/twig-extra-bundle` 3.2.0 (3.2.1 doesn't allow `twig/twig` v2, but 3.2.0 does).

The result is the container explodes:

```
!!
!!  [critical] Uncaught Error: Call to undefined method Twig\Environment::registerUndefinedTokenParserCallback()
!!
!!
!!  In srcApp_KernelDevDebugContainer.php line 1176:
!!
!!    Attempted to call an undefined method named "registerUndefinedTokenParserCa
!!    llback" of class "Twig\Environment".
!!    Did you mean to call e.g. "registerUndefinedFilterCallback" or "registerUnd
!!    efinedFunctionCallback"?
```

Is this worth fixing? If not, we'll need to work around in the MakerBundle tests.

Thanks!

Commits
-------

ef15dd3a Allowing compat with Twig 2 by conditionally calling method
2021-02-08 10:43:21 +01:00
Ryan Weaver ef15dd3abf Allowing compat with Twig 2 by conditionally calling method 2021-02-06 16:13:17 -05:00