479336e09f
Update Markdown packages
2021-07-07 09:07:49 +02:00
7926399e0a
Merge branch '1.x' into 2.x
...
* 1.x:
Fix implicit flot to int casts
2021-06-06 18:31:25 +02:00
4fe3a98928
bug #3535 Fix implicit float to int casts (derrabus)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix implicit float to int casts
PHP 8.1 is picky about implicit float-to-int casts if we lose precision because of that cast. This PR attempts to fix all issues on the 1.x branch.
Commits
-------
de9cd76d
2021-06-06 18:31:09 +02:00
b06cd707b1
bug #3536 Add ReturnTypeWillChange to JsonSerializable implementation (derrabus)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add ReturnTypeWillChange to JsonSerializable implementation
On PHP 8.1, implementations of `JsonSerializable` should declare a return type.
In order to avoid a deprecation warning and maintain backwards compatibility, I've added the `ReturnTypeWillChange` attribute to declare that our implementation will add the necessary return type in a future release.
Commits
-------
507f78d9
2021-06-06 18:30:46 +02:00
507f78d9c4
Add ReturnTypeWillChange to JsonSerializable implementation
...
Signed-off-by: Alexander M. Turek <me@derrabus.de >
2021-06-06 00:40:16 +02:00
de9cd76d7c
Fix implicit flot to int casts
2021-06-06 00:32:22 +02:00
019d6554d2
minor #3527 Allow Symfony 6 (nicolas-grekas)
...
This PR was merged into the 2.x branch.
Discussion
----------
Allow Symfony 6
Commits
-------
ea5de7e6
2021-05-20 16:27:11 +02:00
ea5de7e626
Allow Symfony 6
2021-05-20 16:22:31 +02:00
c2fc988fd7
Fix URLs
2021-05-19 09:15:15 +02:00
398487c101
Merge branch '1.x' into 2.x
...
* 1.x:
Replace secure.php.net with www.php.net
2021-05-19 09:14:37 +02:00
b8026c8907
minor #3525 Replace secure.php.net with www.php.net (mauriciofauth)
...
This PR was merged into the 1.x branch.
Discussion
----------
Replace secure.php.net with www.php.net
It is no longer necessary to use the _secure_ subdomain.
See: https://news-web.php.net/php.internals/104533 .
> Instead of having mirrors, we are moving all of PHP.net to HTTPS (and get rid of https://secure.php.net )
Commits
-------
1783298b
2021-05-19 09:12:00 +02:00
1783298bb8
Replace secure.php.net with www.php.net
...
See: https://news-web.php.net/php.internals/104533
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev >
2021-05-18 16:07:51 -03:00
51f3cbe312
Fix merge
2021-05-18 13:13:59 +02:00
6f3a8a2a38
Merge branch '1.x' into 2.x
...
* 1.x:
Add a note about end of 1.x maintenance
2021-05-18 13:13:43 +02:00
9a7f3c8d0e
Add a note about end of 1.x maintenance
2021-05-18 13:13:36 +02:00
66fa6d37f7
Merge branch '1.x' into 2.x
...
* 1.x:
Move Drupal test file to tests/
fix file permissions
Bump version
Prepare the 1.44.4 release
2021-05-18 13:10:20 +02:00
2fa8bce914
Move Drupal test file to tests/
2021-05-18 13:09:01 +02:00
589d6a5514
minor #3524 fix file permissions (romainmenke)
...
This PR was submitted for the 3.x branch but it was squashed and merged into the 1.x branch instead.
Discussion
----------
fix file permissions
`drupal_test.sh` was executable and when installing the plugin with `composer` it retains these permissions.
Better to call this script as `bash ./drupal_test.sh` and have `100644` as permissions.
I could only find one reference to this script and it was commented out.
Updated it anyway as it might be revived at some point.
Commits
-------
bd706520
2021-05-18 13:06:55 +02:00
bd70652057
fix file permissions
2021-05-18 13:06:51 +02:00
80de1a14c0
Bump version
2021-05-16 14:13:42 +02:00
27e5cf2b05
Prepare the 2.14.6 release
2021-05-16 14:12:47 +02:00
577c5423d6
Bump version
2021-05-16 14:11:59 +02:00
4d40042152
Prepare the 1.44.4 release
2021-05-16 14:11:20 +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
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
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
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
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
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
noniagriconomie
Fabien Potencier
Alexander M. Turek
Nicolas Grekas
Maurício Meneghini Fauth
romainmenke
Thomas Landauer