Commit Graph

47024 Commits

Author SHA1 Message Date
Nicolas Grekas
1c328c64ad Merge branch '3.4' into 4.4
* 3.4:
  [Cache] fix compat with doctrine/dbal v3
2020-06-09 13:52:05 +02:00
Nicolas Grekas
0f76308929 [Cache] fix compat with doctrine/dbal v3 2020-06-09 13:48:38 +02:00
Nicolas Grekas
7bbbd3dd0d [Lock] fix compat with doctrine/dbal v3 2020-06-09 13:46:03 +02:00
Fabien Potencier
5a0645974f minor #37141 [Messenger] fix forward compatibility with Doctrine DBAL 2.11+ (xabbuh)
This PR was merged into the 5.1 branch.

Discussion
----------

[Messenger] fix forward compatibility with Doctrine DBAL 2.11+

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

The methods will be deprecated in 2.11 (see doctrine/dbal#4019), but the forward compatibility layer is only present in 3.0 (see doctrine/dbal#4007).

Commits
-------

bca4f9970b fix forward compatibility with Doctrine DBAL 2.11+
2020-06-09 13:31:06 +02:00
Nicolas Grekas
ae6894c3ed Merge branch '3.4' into 4.4
* 3.4:
  fix forward compatibility with Doctrine DBAL 3
  [WebProfilerBundle] Set NullLogger for functional tests
  [travis] add nightly to allowed failures
2020-06-09 13:29:11 +02:00
Nicolas Grekas
e26d5f217b bug #37169 [Cache] fix forward compatibility with Doctrine DBAL 3 (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[Cache] fix forward compatibility with Doctrine DBAL 3

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix https://github.com/symfony/symfony/pull/36987#issuecomment-641208638
| License       | MIT
| Doc PR        |

Commits
-------

316efef8b8 fix forward compatibility with Doctrine DBAL 3
2020-06-09 13:26:53 +02:00
Christian Flothmann
316efef8b8 fix forward compatibility with Doctrine DBAL 3 2020-06-09 13:16:53 +02:00
Nicolas Grekas
911c5d5cbd minor #37164 [WebProfilerBundle] Set NullLogger for functional tests (fancyweb)
This PR was merged into the 3.4 branch.

Discussion
----------

[WebProfilerBundle] Set NullLogger for functional tests

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | https://github.com/symfony/symfony/issues/36962
| License       | MIT
| Doc PR        | -

Commits
-------

0b9519975d [WebProfilerBundle] Set NullLogger for functional tests
2020-06-09 11:15:27 +02:00
Thomas Calvet
0b9519975d [WebProfilerBundle] Set NullLogger for functional tests 2020-06-09 10:25:18 +02:00
Fabien Potencier
9b132bcb87 bug #37159 [Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn (atailouloute)
This PR was submitted for the master branch but it was merged into the 4.4 branch instead.

Discussion
----------

[Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn

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

Commits
-------

c5833fa784 [Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn
2020-06-09 10:20:56 +02:00
Ahmed TAILOULOUTE
c5833fa784 [Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn 2020-06-09 10:20:50 +02:00
Fabien Potencier
017af041f8 minor #37163 [FrameworkBundle] Fix XSD definition (fabpot)
This PR was merged into the 4.4 branch.

Discussion
----------

[FrameworkBundle] Fix XSD definition

| Q             | A
| ------------- | ---
| Branch?       | 4.4 <!-- see below -->
| Bug fix?      | yes
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | n/a <!-- prefix each issue number with "Fix #", if any -->
| License       | MIT
| Doc PR        | n/a

Commits
-------

38ad0063a0 [FrameworkBundle] Fix XSD definition
2020-06-09 09:58:29 +02:00
Fabien Potencier
38ad0063a0 [FrameworkBundle] Fix XSD definition 2020-06-09 09:39:38 +02:00
Fabien Potencier
4d6a02a0e1 minor #37131 Update welcome.html.php (ThomasLandauer)
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

Update welcome.html.php

Added info about `kernel.debug` - see https://github.com/symfony/symfony-docs/pull/13772#issuecomment-640264394 which is a follow-up of https://github.com/symfony/symfony/issues/37129

| Q             | A
| ------------- | ---
| Branch?       | 4.4. No need to change 3.4, since it's already present: https://github.com/symfony/symfony/blob/3.4/src/Symfony/Component/HttpKernel/Resources/welcome.html.php#L65
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #37129
| License       | MIT
| Doc PR        | not necessary

Commits
-------

53491b9762 Update welcome.html.php
2020-06-08 20:54:18 +02:00
Thomas Landauer
53491b9762 Update welcome.html.php 2020-06-08 20:54:12 +02:00
Nicolas Grekas
6ee6b2e1b8 [travis] add nightly to allowed failures 2020-06-08 17:48:27 +02:00
Nicolas Grekas
3755efd88c bug #37048 [HttpClient] fix monitoring timeouts when other streams are active (nicolas-grekas)
This PR was merged into the 4.4 branch.

Discussion
----------

[HttpClient] fix monitoring timeouts when other streams are active

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

Commits
-------

d2a53f0bda [HttpClient] fix monitoring timeouts when other streams are active
2020-06-07 17:37:15 +02:00
Nicolas Grekas
1e7f3e26a1 Merge branch '3.4' into 4.4
* 3.4:
  [PhpUnitBridge] fix syntax on PHP 5.3
  [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed
  properly cascade validation to child forms
  [PhpUnitBridge] fix undefined var on version 3.4
  bumped Symfony version to 3.4.42
  updated VERSION for 3.4.41
  update CONTRIBUTORS for 3.4.41
  updated CHANGELOG for 3.4.41
2020-06-07 17:34:22 +02:00
Fabien Potencier
879e68c49b minor #37118 [Mime] Remove unused var (fabpot)
This PR was merged into the 4.4 branch.

Discussion
----------

[Mime] Remove unused var

| 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       | n/a <!-- prefix each issue number with "Fix #", if any -->
| License       | MIT
| Doc PR        | n/a

Commits
-------

86613797d1 [Mime] Remove unused var
2020-06-06 12:23:53 +02:00
Fabien Potencier
86613797d1 [Mime] Remove unused var 2020-06-05 23:43:09 +02:00
Nicolas Grekas
d2a53f0bda [HttpClient] fix monitoring timeouts when other streams are active 2020-06-05 22:14:25 +02:00
Nicolas Grekas
9f3b43ab42 [PhpUnitBridge] fix syntax on PHP 5.3 2020-06-04 17:36:03 +02:00
Fabien Potencier
3e0330fd41 bug #37085 [Form] properly cascade validation to child forms (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[Form] properly cascade validation to child forms

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #37025, Fix #37027
| License       | MIT
| Doc PR        |

TODO:

- [x] improve test coverage

Commits
-------

7df5298ddf properly cascade validation to child forms
2020-06-04 14:25:55 +02:00
Nicolas Grekas
400ab7c59b bug #37095 [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed

…nnot be parsed

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #37086
| License       | MIT
| Doc PR        | -

Commits
-------

d3f9b7f833 [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed
2020-06-04 12:31:39 +02:00
Nicolas Grekas
d3f9b7f833 [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed 2020-06-04 12:28:01 +02:00
Christian Flothmann
7df5298ddf properly cascade validation to child forms 2020-06-04 12:14:17 +02:00
Nicolas Grekas
edd0065c77 bug #37092 [PhpUnitBridge] fix undefined var on version 3.4 (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] fix undefined var on version 3.4

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

Commits
-------

bd6a06a8b3 [PhpUnitBridge] fix undefined var on version 3.4
2020-06-04 11:19:11 +02:00
Nicolas Grekas
bd6a06a8b3 [PhpUnitBridge] fix undefined var on version 3.4 2020-06-04 11:02:21 +02:00
Fabien Potencier
fe61dd5c19 bug #37065 [HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray() (jeroennoten)
This PR was merged into the 4.4 branch.

Discussion
----------

[HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray()

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

Commits
-------

69547d9cfc [HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray()
2020-06-03 10:00:49 +02:00
Fabien Potencier
950ff7e40c bug #37077 [WebProfilerBundle] Move ajax clear event listener initialization on loadToolbar (Bruno BOUTAREL)
This PR was merged into the 4.4 branch.

Discussion
----------

[WebProfilerBundle] Move ajax clear event listener initialization on loadToolbar

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #37073
| License       | MIT

Fix ajax clear event listener stacking on each ajax request made.
Comment says if should be synced with `TwigBundle/Resources/views/base_js.html.twig`

If not applicable feel free to deny.

Commits
-------

cf4587b498 Move ajax clear event listener initialization on loadToolbar
2020-06-02 21:29:14 +02:00
Bruno BOUTAREL
cf4587b498 Move ajax clear event listener initialization on loadToolbar 2020-06-02 18:20:08 +02:00
Jeroen Noten
69547d9cfc [HttpClient] Throw JsonException instead of TransportException on empty response in Response::toArray() 2020-06-02 15:48:45 +02:00
Fabien Potencier
a2f4342d08 bug #37049 [Serializer] take into account the context when preserving empty array objects (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[Serializer] take into account the context when preserving empty array objects

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

Commits
-------

98fff21140 take into account the context when preserving empty array objects
2020-06-02 10:39:56 +02:00
Christian Flothmann
98fff21140 take into account the context when preserving empty array objects 2020-06-01 19:29:37 +02:00
Fabien Potencier
d87b6665dd minor #37032 [VarExporter] tfix: s/markAsSkipped/markTestSkipped/ (DavidPrevot)
This PR was merged into the 4.4 branch.

Discussion
----------

[VarExporter] tfix: s/markAsSkipped/markTestSkipped/

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

Just fixes a typo causing the testsuite to fail at least on PHP 7.4.5

Commits
-------

393c9d920a [VarExporter] tfix: s/markAsSkipped/markTestSkipped/
2020-06-01 07:20:03 +02:00
David Prévot
393c9d920a [VarExporter] tfix: s/markAsSkipped/markTestSkipped/ 2020-05-31 15:10:09 -10:00
Fabien Potencier
d45883fb7b bumped Symfony version to 4.4.10 2020-05-31 07:29:28 +02:00
Fabien Potencier
92c4593e3c
Merge pull request #37017 from fabpot/release-4.4.9
released v4.4.9
2020-05-31 07:26:09 +02:00
Fabien Potencier
8e93e5bec1 updated VERSION for 4.4.9 2020-05-31 07:25:51 +02:00
Fabien Potencier
b533b07e71 updated CHANGELOG for 4.4.9 2020-05-31 07:25:41 +02:00
Fabien Potencier
3519647496 bumped Symfony version to 3.4.42 2020-05-31 07:24:17 +02:00
Fabien Potencier
a72c510fb3
Merge pull request #37016 from fabpot/release-3.4.41
released v3.4.41
2020-05-31 07:14:34 +02:00
Fabien Potencier
8b909cef4b updated VERSION for 3.4.41 2020-05-31 07:14:17 +02:00
Fabien Potencier
46a783df63 update CONTRIBUTORS for 3.4.41 2020-05-31 07:14:13 +02:00
Fabien Potencier
c1b56cd1f8 updated CHANGELOG for 3.4.41 2020-05-31 07:13:42 +02:00
Nicolas Grekas
bdb01db3dc bug #37008 [Security] Fixed AbstractToken::hasUserChanged() (wouterj)
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

[Security] Fixed AbstractToken::hasUserChanged()

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

This PR completely reverts #35944.

That PR tried to fix a BC break (ref #35941, #35509) introduced by #31177. However, this broke many authentications (ref #36989), as the User is serialized in the session (as hinted by @stof). Many applications don't include the `roles` property in the serialization (at least, the MakerBundle doesn't include it).

In 5.2, we should probably deprecate having different roles in token and user, which fixes the BC breaks all together.

Commits
-------

f297beb42c [Security] Fixed AbstractToken::hasUserChanged()
2020-05-30 23:50:18 +02:00
Wouter de Jong
f297beb42c [Security] Fixed AbstractToken::hasUserChanged() 2020-05-30 23:50:11 +02:00
Nicolas Grekas
d9506ab843 Merge branch '3.4' into 4.4
* 3.4:
  [DI] fix typo
2020-05-30 23:49:23 +02:00
Nicolas Grekas
fa31260e5e [DI] fix typo 2020-05-30 23:06:01 +02:00
Nicolas Grekas
143718c750 Merge branch '3.4' into 4.4
* 3.4:
  Fix abstract method name in PHP doc block
2020-05-30 22:07:26 +02:00