Commit Graph

53040 Commits

Author SHA1 Message Date
Fabien Potencier
b302ebc619 Merge branch '4.4' into 5.1
* 4.4:
  Remove full head content in HTML to text converter
  apply the sort callback on the whole search result
2021-01-05 07:22:18 +01:00
Fabien Potencier
1dead9a518 bug #39703 [Finder] apply the sort callback on the whole search result (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[Finder] apply the sort callback on the whole search result

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

Commits
-------

126105146f apply the sort callback on the whole search result
2021-01-05 07:04:52 +01:00
Fabien Potencier
ef11c2c6b4 bug #39717 [TwigBridge] Remove full head content in HTML to text converter (pupaxxo)
This PR was merged into the 4.4 branch.

Discussion
----------

[TwigBridge] Remove full head content in HTML to text converter

When extracting text from HTML part all the content between opening and closing tag should be removed

| 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       |  <!-- 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 -->
<!--
Replace this notice by a short README for your feature/bugfix. This will help people
understand your PR and can be used as a start for the documentation.

Additionally (see https://symfony.com/releases):
 - Always add tests and ensure they pass.
 - Never break backward compatibility (see https://symfony.com/bc).
 - Bug fixes must be submitted against the lowest maintained branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too.)
 - Features and deprecations must be submitted against branch 5.x.
-->

Without the `s` flag the preg_replace match only head (or style) tags on a single line

Commits
-------

9e6baee9f3 Remove full head content in HTML to text converter
2021-01-05 07:02:58 +01:00
Andrea Ruggiero
9e6baee9f3
Remove full head content in HTML to text converter
When extracting text from HTML part all the content between opening and closing tag should be removed
2021-01-04 22:15:57 +01:00
Christian Flothmann
acbafe889d do not break when loading schemas from network paths on Windows 2021-01-04 20:26:31 +01:00
Christian Flothmann
3e376a1d87 Merge branch '5.1' into 5.2
* 5.1:
  allow HttpKernel 5.x
2021-01-04 19:43:21 +01:00
Christian Flothmann
4468d6d19a minor #39715 [Cache] allow HttpKernel 5.x (xabbuh)
This PR was merged into the 5.1 branch.

Discussion
----------

[Cache] allow HttpKernel 5.x

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

Commits
-------

47385a150f allow HttpKernel 5.x
2021-01-04 19:42:29 +01:00
Christian Flothmann
47385a150f allow HttpKernel 5.x 2021-01-04 19:39:57 +01:00
Nicolas Grekas
85af7a2974 bug #39672 [FrameworkBundle] Fix UidNormalizer priority (fancyweb)
This PR was merged into the 5.2 branch.

Discussion
----------

[FrameworkBundle] Fix UidNormalizer priority

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

`AbstractUid` implements `\JsonSerializable`. `JsonSerializableNormalizer` has a priority of `-900`, so it's actually this normalizer that is used instead of the good one. It does not change the result but it adds an extra layer.

Commits
-------

1c652a7649 [FrameworkBundle] Fix UidNormalizer priority
2021-01-04 19:02:28 +01:00
Nicolas Grekas
1e8fe94fff minor #39695 [PropertyAccess] throw type error when incompatible types are passed (xabbuh)
This PR was merged into the 5.2 branch.

Discussion
----------

[PropertyAccess] throw type error when incompatible types are passed

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

Commits
-------

4c5cff6558 throw type error when incompatible types are passed
2021-01-04 19:01:42 +01:00
Nicolas Grekas
51d2da706e Merge branch '5.1' into 5.2
* 5.1:
  Cleanup CI scripts
  fix code style
  fix code style
  take query and request parameters into account when matching routes
  mistake
  fix tests to run assertions on returned Crawler instances
  propagate groups to nested constraints
2021-01-04 18:59:10 +01:00
Nicolas Grekas
929b4b5903 bug #39649 [Validator] propagate groups to nested constraints (xabbuh)
This PR was merged into the 5.1 branch.

Discussion
----------

[Validator] propagate groups to nested constraints

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

Commits
-------

13a4610824 propagate groups to nested constraints
2021-01-04 18:36:57 +01:00
Christian Flothmann
87b1e11ebb Merge branch '4.4' into 5.1
* 4.4:
  Cleanup CI scripts
  fix code style
  fix code style
  take query and request parameters into account when matching routes
  mistake
  fix tests to run assertions on returned Crawler instances
2021-01-04 18:34:17 +01:00
Nicolas Grekas
426bf9640a minor #39691 [DomCrawler] fix tests to run assertions on returned Crawler instances (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[DomCrawler] fix tests to run assertions on returned Crawler instances

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

Commits
-------

1d0c91629a fix tests to run assertions on returned Crawler instances
2021-01-04 18:30:04 +01:00
Nicolas Grekas
e8d5d29c30 bug #39708 [WebProfilerBundle] take query and request parameters into account when matching routes (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[WebProfilerBundle] take query and request parameters into account when matching routes

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

Commits
-------

28b6051f53 take query and request parameters into account when matching routes
2021-01-04 18:14:21 +01:00
Nicolas Grekas
c9ae215e9f minor #39707 [Validator] mistake (gbere)
This PR was merged into the 4.4 branch.

Discussion
----------

[Validator] mistake

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

Commits
-------

caa59fae81 mistake
2021-01-04 18:13:08 +01:00
Nicolas Grekas
bb5d52c42d minor #39710 fix code style (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

fix code style

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

Commits
-------

89fedfa9e9 fix code style
2021-01-04 18:09:16 +01:00
Nicolas Grekas
69761c7e40 minor #39711 Cleanup CI scripts (nicolas-grekas)
This PR was merged into the 4.4 branch.

Discussion
----------

Cleanup CI scripts

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

Commits
-------

09e51d6b42 Cleanup CI scripts
2021-01-04 18:08:10 +01:00
Nicolas Grekas
09e51d6b42 Cleanup CI scripts 2021-01-04 17:51:14 +01:00
Nicolas Grekas
9b318b3fd1 minor #39713 [Cache] use the clock mock to make test more resilient (xabbuh)
This PR was merged into the 5.2 branch.

Discussion
----------

[Cache] use the clock mock to make test more resilient

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

see for example https://ci.appveyor.com/project/fabpot/symfony/builds/37097868#L1534

Commits
-------

35f836a66d use the clock mock to make test more resilient
2021-01-04 17:35:05 +01:00
Christian Flothmann
35f836a66d use the clock mock to make test more resilient 2021-01-04 17:00:46 +01:00
Christian Flothmann
89fedfa9e9 fix code style 2021-01-04 16:15:05 +01:00
Fabien Potencier
262525b95b minor #39709 fix code style (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

fix code style

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

I ran the CS fixer and checked all test methods to not make use of `void`.

Commits
-------

689e3039fc fix code style
2021-01-04 15:37:48 +01:00
Christian Flothmann
689e3039fc fix code style 2021-01-04 15:27:21 +01:00
Christian Flothmann
126105146f apply the sort callback on the whole search result 2021-01-04 15:07:41 +01:00
Christian Flothmann
28b6051f53 take query and request parameters into account when matching routes 2021-01-04 14:59:34 +01:00
Gerard Berengué
caa59fae81
mistake 2021-01-04 14:29:17 +01:00
Christian Flothmann
4c5cff6558 throw type error when incompatible types are passed 2021-01-04 13:51:17 +01:00
Christian Flothmann
5b9e187631 Merge branch '5.1' into 5.2
* 5.1:
  harden test to not depend on the actual time
  [ProxyManager] fix tests
  actually compare the order of entries when any sorting is applied
  Dump abstract arguments
2021-01-04 13:41:39 +01:00
Christian Flothmann
74d8fb897a Merge branch '4.4' into 5.1
* 4.4:
  harden test to not depend on the actual time
  [ProxyManager] fix tests
  actually compare the order of entries when any sorting is applied
2021-01-04 13:34:36 +01:00
Fabien Potencier
0304f754b3 minor #39705 [ProxyManager] fix tests (nicolas-grekas)
This PR was merged into the 4.4 branch.

Discussion
----------

[ProxyManager] fix tests

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

Commits
-------

5ec2a252ee [ProxyManager] fix tests
2021-01-04 13:05:33 +01:00
Fabien Potencier
135a9b20af minor #39704 [Finder] actually compare the order of entries when any sorting is applied (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[Finder] actually compare the order of entries when any sorting is applied

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

Without this change the tests where still passing if the sorting didn't work as expected. There are three more tests that sort by file times. I do not really know how to make them more stable though.

Commits
-------

f1ed653eee actually compare the order of entries when any sorting is applied
2021-01-04 13:04:05 +01:00
Fabien Potencier
b9bdb8e5ed minor #39706 [HttpKernel] harden test to not depend on the actual time (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[HttpKernel] harden test to not depend on the actual time

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

From time to time this test fails (e.g. https://travis-ci.com/github/symfony/symfony/jobs/468014427#L7092). We can fix that by not depending on the system clock which is actually not needed in this test.

Commits
-------

28a956baa9 harden test to not depend on the actual time
2021-01-04 13:01:41 +01:00
Christian Flothmann
28a956baa9 harden test to not depend on the actual time 2021-01-04 12:47:44 +01:00
Nicolas Grekas
5ec2a252ee [ProxyManager] fix tests 2021-01-04 12:30:20 +01:00
Christian Flothmann
f1ed653eee actually compare the order of entries when any sorting is applied 2021-01-04 12:28:59 +01:00
Fabien Potencier
b76d5608cf bug #39692 [FrameworkBundle] Dump abstract arguments (jderusse)
This PR was merged into the 5.1 branch.

Discussion
----------

[FrameworkBundle] Dump abstract arguments

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

This PR fixes n exception thrown when dumping abstract arguments (ie. `./bin/console  debug:containter session.abstract_handler --show-arguments`)

Commits
-------

df769ec84c Dump abstract arguments
2021-01-04 08:57:52 +01:00
Alexander M. Turek
a378537a8e Merge branch '5.1' into 5.2
* 5.1:
  remove unneeded sprintf() call
  Fix CS
  Fix config merging in lock
  keep trailing newlines when dumping multi-line strings
  disable error bubbling by default when inherit_data is configured
2021-01-03 23:09:37 +01:00
Alexander M. Turek
3fca96d9de Merge branch '4.4' into 5.1
* 4.4:
  remove unneeded sprintf() call
  Fix CS
  Fix config merging in lock
  keep trailing newlines when dumping multi-line strings
  disable error bubbling by default when inherit_data is configured
2021-01-03 23:00:02 +01:00
Alexander M. Turek
04671ee726 minor #39694 [PropertyAccess] remove unneeded sprintf() call (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[PropertyAccess] remove unneeded sprintf() call

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

Commits
-------

a8252a43b8 remove unneeded sprintf() call
2021-01-03 13:23:32 +01:00
Christian Flothmann
a8252a43b8 remove unneeded sprintf() call 2021-01-03 12:55:43 +01:00
Jérémy Derussé
df769ec84c
Dump abstract arguments 2021-01-03 12:32:13 +01:00
Christian Flothmann
1d0c91629a fix tests to run assertions on returned Crawler instances 2021-01-03 11:13:13 +01:00
Fabien Potencier
a902dd8a1b bug #39683 [Yaml] keep trailing newlines when dumping multi-line strings (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[Yaml] keep trailing newlines when dumping multi-line strings

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

Commits
-------

4c513c24c7 keep trailing newlines when dumping multi-line strings
2021-01-03 09:28:04 +01:00
Fabien Potencier
da07550827 bug #39670 [Form] disable error bubbling by default when inherit_data is configured (xabbuh)
This PR was merged into the 4.4 branch.

Discussion
----------

[Form] disable error bubbling by default when inherit_data is configured

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

Commits
-------

8679c2ac05 disable error bubbling by default when inherit_data is configured
2021-01-03 09:24:31 +01:00
Fabien Potencier
4bced61887 Fix CS 2021-01-03 09:19:04 +01:00
Fabien Potencier
a0d66d2ecd bug #39686 [Lock] Fix config merging in lock (jderusse)
This PR was merged into the 4.4 branch.

Discussion
----------

[Lock] Fix config merging in lock

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

Commits
-------

6bb2d67cf1 Fix config merging in lock
2021-01-03 09:18:23 +01:00
Jérémy Derussé
6bb2d67cf1
Fix config merging in lock 2021-01-02 23:18:12 +01:00
Christian Flothmann
4c513c24c7 keep trailing newlines when dumping multi-line strings 2021-01-02 17:02:59 +01:00
Alexander M. Turek
0633f96941 Merge branch '5.1' into 5.2
* 5.1:
  fix postgres transport when the retry table is the same
  do not dump extra trailing newlines for multiline blocks
2021-01-01 23:54:04 +01:00