21578f00e8
Prepare the 3.3.2 release
2021-05-16 14:14:13 +02:00
93f29df51b
Update CHANGELOG
2021-05-16 14:08:10 +02:00
ad86c88359
Merge branch '2.x' into 3.x
...
* 2.x:
Update CHANGELOG
Update CHANGELOG
Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
2021-05-16 14:07:50 +02:00
ba86601f7c
Update CHANGELOG
2021-05-16 14:07:41 +02:00
ceb4de0448
Merge branch '1.x' into 2.x
...
* 1.x:
Update CHANGELOG
Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
2021-05-16 14:07:24 +02:00
f7bfa2ec6f
Update CHANGELOG
2021-05-16 14:07:12 +02:00
124f10c27e
Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
...
This reverts commit 83f26e402bf5d3c704df
2021-05-16 14:06:26 +02:00
9e6e700f96
minor #3509 Some code style fixes (dionisvl)
...
This PR was squashed before being merged into the 3.x branch.
Discussion
----------
Some code style fixes
Fixes that:
- Type cast is unnecessary
- Unnecessary curly braces syntax for variable
- Operations priority might differ that except
Commits
-------
17c6371f
2021-05-14 10:26:10 +02:00
17c6371fb5
Some code style fixes
2021-05-14 10:26:05 +02:00
491aa7d3fc
Bump version
2021-05-12 10:06:33 +02:00
ac44433c49
Prepare the 3.3.1 release
2021-05-12 10:05:35 +02:00
55f80d62c5
Update CHANGELOG
2021-05-12 10:05:14 +02:00
c0c30e7a03
Merge branch '2.x' into 3.x
...
* 2.x:
Bump version
Prepare the 2.14.5 release
Update CHANGELOG
Bump version
Prepare the 1.44.3 release
Update CHANGELOG
2021-05-12 10:04:06 +02:00
f602d0c11d
Bump version
2021-05-12 10:03:33 +02:00
c9dd15b3a8
Prepare the 2.14.5 release
2021-05-12 10:02:35 +02:00
40e95742e2
Update CHANGELOG
2021-05-12 10:02:19 +02:00
2b14e73846
Merge branch '1.x' into 2.x
...
* 1.x:
Bump version
Prepare the 1.44.3 release
Update CHANGELOG
2021-05-12 10:00:40 +02:00
35f8b78b66
Bump version
2021-05-12 09:59:57 +02:00
920a9b9a61
Prepare the 1.44.3 release
2021-05-12 09:58:47 +02:00
18e7034b99
Update CHANGELOG
2021-05-12 09:58:27 +02:00
73760b05a1
minor #3522 Fix CS (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Fix CS
Commits
-------
fcbaa669
2021-05-12 09:51:57 +02:00
fcbaa669ab
Fix CS
2021-05-12 09:47:40 +02:00
13e360972a
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
Migrate to the new PHP CS Fixer config file
Fixing links
2021-05-12 09:45:40 +02:00
15fba97570
minor #3521 CS fixes (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
CS fixes
Commits
-------
2dd1d909
2021-05-12 09:43:21 +02:00
2dd1d909b9
Fix CS
2021-05-12 09:37:17 +02:00
157fa56829
Merge branch '1.x' into 2.x
...
* 1.x:
Fix CS
Migrate to the new PHP CS Fixer config file
2021-05-12 09:27:30 +02:00
87c09f6d87
minor #3520 Fix CS (fabpot)
...
This PR was squashed before being merged into the 1.x branch.
Discussion
----------
Fix CS
Commits
-------
59f3e8e5bded3886
2021-05-12 09:24:36 +02:00
59f3e8e5dc
Fix CS
2021-05-12 09:19:37 +02:00
bded388664
Migrate to the new PHP CS Fixer config file
2021-05-12 09:11:44 +02:00
7da9b043c9
minor #3512 Fixing links (ThomasLandauer)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fixing links
Commits
-------
cf7d50c4
2021-04-24 10:08:28 +02:00
cf7d50c411
Fixing links
2021-04-23 16:45:01 +02:00
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
2021-04-15 12:09:30 +02:00
c0f02244c3
Add missing arguments in intl docs
2021-04-15 11:42:44 +02:00
5557d48e0e
Revert
2021-04-10 10:18:09 +02:00
680e42979a
Merge branch '2.x' into 3.x
...
* 2.x:
Fix code for PHP 8.1
2021-04-10 10:17:37 +02:00
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
2021-04-10 10:17:25 +02:00
953974a7b3
Fix code for PHP 8.1
2021-04-10 10:14:28 +02:00
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
cc79d68e5d
minor #3504 Tweak wording on docs (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Tweak wording on docs
Commits
-------
33729ab9
2021-04-10 09:43:44 +02:00
33729ab9a3
Tweak wording on docs
2021-04-10 09:41:46 +02:00
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
2021-04-10 09:36:09 +02:00
56fd57b32b
Adding link to RFC
2021-04-10 09:36:04 +02:00
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
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
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
2021-04-07 17:57:29 +02:00
3a67fc7dc5
Fix: A template name cannot be an absolute path
2021-04-07 17:57:24 +02:00
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
1987bd0130
Fix CS
2021-04-07 17:49:48 +02:00
cfda3dd53d
Slug filter: Mentioning requiredStringExtension
...
See https://github.com/twigphp/Twig/issues/3500#issuecomment-814923747
2021-04-07 17:45:21 +02:00
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
2021-04-07 17:44:42 +02:00
Fabien Potencier
Den
Thomas Landauer
Michael Voříšek