Commit Graph

53810 Commits

Author SHA1 Message Date
Matthieu Calie
46bdeb8507 [SecurityBundle] Link UserProviderListener to correct firewall dispatcher 2021-06-02 21:06:22 +02:00
Alexander M. Turek
0f4cbc0917 Merge branch '4.4' into 5.2
* 4.4:
  Bump Symfony version to 4.4.26
  Update VERSION for 4.4.25
  Update CONTRIBUTORS for 4.4.25
  Update CHANGELOG for 4.4.25
2021-06-01 20:46:09 +02:00
Fabien Potencier
0d3befa984 Bump Symfony version to 5.2.11 2021-06-01 12:21:53 +02:00
Fabien Potencier
dbfafadaab
Merge pull request #41488 from fabpot/release-5.2.10
released v5.2.10
2021-06-01 11:28:46 +02:00
Fabien Potencier
b8908bcb43 Update VERSION for 5.2.10 2021-06-01 11:28:31 +02:00
Fabien Potencier
e715f2ca86 Update CHANGELOG for 5.2.10 2021-06-01 11:28:26 +02:00
Fabien Potencier
ca61cd64b1 Bump Symfony version to 4.4.26 2021-06-01 11:02:47 +02:00
Nicolas Grekas
8b570e1b22 cs fix 2021-06-01 09:40:53 +02:00
Fabien Potencier
c71e9ba222
Merge pull request #41477 from fabpot/release-4.4.25
released v4.4.25
2021-06-01 09:12:23 +02:00
Fabien Potencier
da21ba31cf Update VERSION for 4.4.25 2021-06-01 09:12:08 +02:00
Fabien Potencier
e54bddeaea Update CONTRIBUTORS for 4.4.25 2021-06-01 09:12:02 +02:00
Fabien Potencier
2213e6ad85 Update CHANGELOG for 4.4.25 2021-06-01 09:11:35 +02:00
Nicolas Grekas
4114326f9c Merge branch '4.4' into 5.2
* 4.4:
  [Form] Use !isset for checks cause this doesn't falsely include 0
  [Mailer] Fix typo in README
  sync ./phpunit in all branches
2021-05-27 14:55:18 +02:00
Nicolas Grekas
9b89b2ec04 bug #41000 [Form] Use !isset for checks cause this doesn't falsely include 0 (Kai Dederichs)
This PR was submitted for the 5.2 branch but it was squashed and merged into the 4.4 branch instead.

Discussion
----------

[Form] Use !isset for checks cause this doesn't falsely include 0

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #40999
| License       | MIT

By using isset 0 won't falsely included anymore

Commits
-------

cd541c5a63 [Form] Use !isset for checks cause this doesn't falsely include 0
2021-05-27 14:54:21 +02:00
Kai Dederichs
cd541c5a63 [Form] Use !isset for checks cause this doesn't falsely include 0 2021-05-27 14:54:13 +02:00
Nicolas Grekas
11a88370e3 minor #41403 [Mailer] Fix typo in README (W0rma)
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

[Mailer] Fix typo in README

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

Commits
-------

14f2a2974c [Mailer] Fix typo in README
2021-05-27 14:49:44 +02:00
Dieter
14f2a2974c [Mailer] Fix typo in README 2021-05-27 14:49:37 +02:00
Nicolas Grekas
747e2ac886 sync ./phpunit in all branches 2021-05-27 14:44:44 +02:00
Nicolas Grekas
6f461b04d3 Merge branch '4.4' into 5.2
* 4.4:
  [VarDumper] fix tests
2021-05-27 12:48:07 +02:00
Nicolas Grekas
ba5899362b minor #41418 [VarDumper] fix tests (nicolas-grekas)
This PR was submitted for the 6.0 branch but it was merged into the 4.4 branch instead.

Discussion
----------

[VarDumper] fix tests

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Fixing VarDumper on appveyor hopefully.

Commits
-------

bdf3222c60 [VarDumper] fix tests
2021-05-27 11:48:39 +02:00
Nicolas Grekas
bdf3222c60 [VarDumper] fix tests 2021-05-27 11:48:32 +02:00
Nicolas Grekas
536266cea3 [Intl] fix bad merge 2021-05-27 08:39:54 +02:00
Nicolas Grekas
fff1fdee1f Remove notice about reverted behavior 2021-05-26 19:55:59 +02:00
Nicolas Grekas
9c8d237771 Merge branch '4.4' into 5.2
* 4.4:
  [PhpUnitBridge] fix PHP version check
  keep container.service_subscriber tag on the decorated definition
2021-05-26 19:55:25 +02:00
Nicolas Grekas
519d348b4a bug #41407 [DependencyInjection] keep container.service_subscriber tag on the decorated definition (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[DependencyInjection] keep container.service_subscriber tag on the decorated definition

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

Commits
-------

b917fafc8d keep container.service_subscriber tag on the decorated definition
2021-05-26 19:54:16 +02:00
Nicolas Grekas
42e4736e09 [PhpUnitBridge] fix PHP version check 2021-05-26 19:49:37 +02:00
Nicolas Grekas
b581c13f83 Merge branch '4.4' into 5.2
* 4.4:
  Fix CS in README files
2021-05-26 19:40:38 +02:00
Nicolas Grekas
ce7d3c41ae Fix CS in README files 2021-05-26 19:39:37 +02:00
Nicolas Grekas
4e3912e050 Merge branch '4.4' into 5.2
* 4.4:
  [HttpKernel] Fixes tests for PHP7.4+
  [Filesystem] fix readlink for Windows
2021-05-26 19:33:56 +02:00
Nicolas Grekas
54bee29572 bug #40866 [Filesystem] fix readlink() for Windows (a1812)
This PR was merged into the 4.4 branch.

Discussion
----------

[Filesystem] fix readlink() for Windows

| Q             | A
| ------------- | ---
| Branch?       |  4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

**How to reproduce**

Windows 10.0.19042.928, PHP 8.0.3, PHPUnit 9.5.4
run as Administrator
C:\php\php.exe ./phpunit --bootstrap ./vendor/autoload.php --configuration ./phpunit.xml.dist ./src/Symfony/Component/Filesystem/Tests

There were 2 failures:

1) Symfony\Component\Filesystem\Tests\FilesystemTest::testRemoveCleansInvalidLinks
Failed asserting that 'C:\Users\albat\AppData\Local\Temp\1618836823.005.2057903605\directory\dir\' is false.

D:\Z__PHP_PROJECT\symfony\src\Symfony\Component\Filesystem\Tests\FilesystemTest.php:379

2) Symfony\Component\Filesystem\Tests\FilesystemTest::testReadAbsoluteLink
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'C:\Users\albat\AppData\Local\Temp\1618836823.1681.131301953\dir\link'
+'C:\Users\albat\AppData\Local\Temp\1618836823.1681.131301953\file'

Commits
-------

f1b95d3c93 [Filesystem] fix readlink for Windows
2021-05-26 19:30:55 +02:00
Nicolas Grekas
12030e5622 minor #41412 [HttpKernel] Fixes file_get_content in HttpCache's Store for PHP7.4+ (0x346e3730)
This PR was merged into the 4.4 branch.

Discussion
----------

[HttpKernel] Fixes file_get_content in HttpCache's Store for PHP7.4+

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

While trying to get 6.0 branch tests green, I encountered an error on multiple HttpKernel tests.
After investigating, it comes from the file_get_contents in the load method of the Store class from HttpCache. For obscure reasons, some calls are in errors and the content can't be read for "permission denied".
This is happening only on PHP 7.4.0+ (and that explains why the tests are green on the branch 5.4 as it runs php 7.2), adding the `@` error suppressor fixes this.

Commits
-------

c3ac11cc64 [HttpKernel] Fixes tests for PHP7.4+
2021-05-26 19:22:19 +02:00
Nicolas Grekas
7220998a39 Merge branch '4.4' into 5.2
* 4.4:
  Fix markdown
2021-05-26 14:52:38 +02:00
Oskar Stark
26d682fd96 minor #41415 Fix markdown in README files (OskarStark)
This PR was merged into the 4.4 branch.

Discussion
----------

Fix markdown in README files

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

I would up merge it and fix the upper branches while upmerging or via separate PR's, whatever is prefered

Commits
-------

ad0890c604 Fix markdown
2021-05-26 13:45:23 +02:00
Oskar Stark
ad0890c604 Fix markdown 2021-05-26 13:20:16 +02:00
Antonin "0x346e3730" CLAUZIER
c3ac11cc64
[HttpKernel] Fixes tests for PHP7.4+ 2021-05-26 12:28:46 +02:00
Christian Flothmann
b917fafc8d keep container.service_subscriber tag on the decorated definition 2021-05-25 15:33:15 +02:00
Nicolas Grekas
02807a430b Merge branch '4.4' into 5.2
* 4.4:
  [Form] fix support for years outside of the 32b range on x86 arch
2021-05-24 12:32:03 +02:00
Nicolas Grekas
7ccda8eedb bug #41394 [Form] fix support for years outside of the 32b range on x86 arch (nicolas-grekas)
This PR was merged into the 4.4 branch.

Discussion
----------

[Form] fix support for years outside of the 32b range on x86 arch

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Commits
-------

2353f19cc2 [Form] fix support for years outside of the 32b range on x86 arch
2021-05-24 12:31:21 +02:00
Nicolas Grekas
2353f19cc2 [Form] fix support for years outside of the 32b range on x86 arch 2021-05-24 12:24:40 +02:00
Nicolas Grekas
d2326a474b minor #41388 [Security] Add an upgrade note about the removal of Serializable (derrabus)
This PR was merged into the 5.2 branch.

Discussion
----------

[Security] Add an upgrade note about the removal of Serializable

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | N/A
| License       | MIT
| Doc PR        | N/A

Jumping from Symfony 5 on PHP 7.2/7.3 to Symfony 6 on PHP 8 directly will fry your sessions. I've added a note that PHP should be upgraded first. I believe that most apps will take that patch anyway, so this shouldn't be much of a footgun. 🤞🏻

Commits
-------

76572581aa Add an upgrade note about the removal of Serializable
2021-05-23 22:43:46 +02:00
Alexander M. Turek
76572581aa Add an upgrade note about the removal of Serializable 2021-05-23 20:55:38 +02:00
Nicolas Grekas
019b2c60c7 bug #41380 Make Mailgun Header compatible with other Bridges (jderusse)
This PR was merged into the 5.2 branch.

Discussion
----------

Make Mailgun Header compatible with other Bridges

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

This revert deprecating passing a header without the required Mailgun `h:` prefix.
And makes the bridge compatible with other bridges.

See:
- https://github.com/symfony/symfony/pull/36148#discussion_r619232776
- https://github.com/symfony/symfony/pull/41308#discussion_r637197208

Commits
-------

82f1f9c618 Make Mailgun Header compatible with other Bridges
2021-05-23 18:59:21 +02:00
Alexander M. Turek
174efe8b08 Merge branch '4.4' into 5.2
* 4.4:
  [Messenger] Fix merging PrototypedArrayNode associative values
2021-05-22 21:53:56 +02:00
Alexander M. Turek
5e193430ad minor #41307 [Mailer] Remove dead code (jderusse)
This PR was merged into the 5.2 branch.

Discussion
----------

[Mailer] Remove dead code

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Since #40481 the `async-aws/ses` package is required, thus the class always exists. We can remove this check

Commits
-------

52c1934717 [mailer] Remove useless code
2021-05-22 21:50:30 +02:00
Alexander M. Turek
53d9b105a0 bug #39847 [Messenger] Fix merging PrototypedArrayNode associative values (svityashchuk)
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

[Messenger] Fix merging PrototypedArrayNode associative values

Now keys will not be considered as irrelevant.

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #39846, fix #36874
| License       | MIT
| Doc PR        |

The problem was because in ConfigTree `options` are defined as `arrayNode` and has a `prototype('variable')`. So for combining config together `PrototypedArrayNode::mergeValues()` was called. And there was a trouble - for that `PrototypedArrayNode` `$rightSide` values were added without keys:

`\Symfony\Component\Config\Definition\PrototypedArrayNode::mergeValues`
```php
foreach ($rightSide as $k => $v) {
    // prototype, and key is irrelevant, append the element
    if (null === $this->keyAttribute) {
        $leftSide[] = $v;
        continue;
    }
```

Commits
-------

11128c9c0b [Messenger] Fix merging PrototypedArrayNode associative values
2021-05-22 21:45:48 +02:00
Oleksii Svitiashchuk
11128c9c0b [Messenger] Fix merging PrototypedArrayNode associative values 2021-05-22 21:45:39 +02:00
Jérémy Derussé
82f1f9c618
Make Mailgun Header compatible with other Bridges 2021-05-22 13:53:20 +02:00
Alexander M. Turek
c9dea7c750 Merge branch '4.4' into 5.2
* 4.4:
  Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed
2021-05-21 16:03:40 +02:00
Nicolas Grekas
3bb1ec3730 minor #41348 Fix PHP 8.1 deprecations (derrabus)
This PR was merged into the 5.2 branch.

Discussion
----------

Fix PHP 8.1 deprecations

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | N/A
| License       | MIT
| Doc PR        | N/A

Follow-up of #41240 on the 5.2 branch

Commits
-------

fb99f93546 Fix PHP 8.1 deprecations
2021-05-21 08:37:45 +02:00
Nicolas Grekas
a76cdecd01 bug #41346 [WebProfilerBundle] Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed (weaverryan)
This PR was merged into the 4.4 branch.

Discussion
----------

[WebProfilerBundle] Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #41305
| License       | MIT
| Doc PR        | Not needed

This bug was introduced in #41168.

Best viewed with: https://github.com/symfony/symfony/pull/41346/files?w=1 - we could also remove the new indentation in `exception.js`.

In that PR, we innocently don't reload `Sfjs` if it doesn't exist. However, on an error page, that template ALSO adds an `Sfjs`, and that `Sfjs` is *smaller* - containing only a subset of the `Sfjs` functions. This is tricky, but this PR fixes it.

Here are the various situations:

1) I hit an exception page. The `Sfjs` from `exception.js` is loaded first. This adds the smaller `Sfjs`. Then the `base_js.html.twig` version is hit. Because `Sfjs` is missing the `loadToolbar()` method, that code DOES run again to reinitialize it.

2) I am on a normal page, then travel to an exception page with Turbo. In this case, the original `Sfjs` from `base_js.html.twig` was processed. Then, on the exception page, the `Sfjs` from `exception.js` is ignored, as is the 2nd execution of `base_js.html.twig`.

Overall, the JS could use some work for supporting things like Turbo (e.g. `DOMContentLoaded` doesn't work with Turbo, so the exception page JS is broken). But I wanted to focus on fixing the bug in this PR.

As a reminder, #41168 (avoiding overriding `Sfjs`) was done to help with the AJAX toolbar and Turbo - it's explained in point (1) on #41168.

Cheers!

Commits
-------

5fa42f11f3 Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed
2021-05-21 08:36:22 +02:00