Commit Graph

39402 Commits

Author SHA1 Message Date
Nicolas Grekas
e6954494af feature #28858 [DI] Deprecated using env vars with cannotBeEmpty() (ro0NL)
This PR was squashed before being merged into the 4.3-dev branch (closes #28858).

Discussion
----------

[DI] Deprecated using env vars with cannotBeEmpty()

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes-ish
| New feature?  | yes
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | yes
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #28827
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

Continuation of #28838 for 4.2

Using environment variables for nodes marked `cannotBeEmpty()` is semantically not possible, we'll never know the value is empty yes/no during compile time. Neither we should assume one or another.

Commits
-------

397c19ee5f [DI] Deprecated using env vars with cannotBeEmpty()
2018-12-01 10:04:06 +01:00
Roland Franssen
397c19ee5f [DI] Deprecated using env vars with cannotBeEmpty() 2018-12-01 10:03:58 +01:00
Nicolas Grekas
67be665c02 feature #28976 [DI] Add a "default" EnvProcessor (jderusse)
This PR was squashed before being merged into the 4.3-dev branch (closes #28976).

Discussion
----------

[DI] Add a "default" EnvProcessor

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | TODO

This PR add a new fallback env processor in order to return a default value when the primary processor is not able to fetch a value (env variable, file or key does not exists)

```
#
default_host: localhost
host: '%env(default:default_host:OPTIONAL_ENV_VARIABLE)%"

default_secret: this secret is not secret
secret: '%env(default:default_secret:file:THIS_FILE_ONLY_EXIST_IN_PRODUCTION)%"

default_charset: utf8
charset: '%env(default:default_charset:key:charset:json:DATABASE_CONFIG)%"
```

Commits
-------

aee4e33cdb [DI] Add a \"default\" EnvProcessor
2018-12-01 10:02:00 +01:00
Jérémy Derussé
aee4e33cdb [DI] Add a \"default\" EnvProcessor 2018-12-01 10:01:52 +01:00
Nicolas Grekas
4df912bf6a feature #29127 [DomCrawler] Added return of element name in extract() method (andrey-helldar)
This PR was squashed before being merged into the 4.3-dev branch (closes #29127).

Discussion
----------

[DomCrawler] Added return of element name in `extract()` method

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#10646

Situation: you need to get an array of keys and values.
The current package code does not allow this to be done easily.
The changes made to the code will allow you to return the required data set.
```php
use Symfony\Component\DomCrawler\Crawler;

$crawler = new Crawler($content);

$crawler
    ->filter('ItemsList > Item')
    ->each(function (Crawler $element) {
        $data = $element
            ->children()
            ->extract(['_name', '_text']);

        var_dump($data);
    });

// Result:
array:2 [
  0 => array:2 [
    0 => "id",
    1 => "1"
  ],
  1 => array:2 [
    0 => "title",
    1 => "Foo Bar"
  ]
]
```

Commits
-------

79162c1eb5 [DomCrawler] Added return of element name in `extract()` method
2018-12-01 09:57:46 +01:00
Andrey Helldar
79162c1eb5 [DomCrawler] Added return of element name in extract() method 2018-12-01 09:57:40 +01:00
Nicolas Grekas
905119b752 feature #29145 [Workflow] Trigger entered event for subject entering in the Workflow for the first time (lyrixx)
This PR was merged into the 4.3-dev branch.

Discussion
----------

[Workflow] Trigger `entered` event for subject entering in the Workflow for the first time

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #28319
| License       | MIT
| Doc PR        |

Commits
-------

388840fd99 [Workflow] Trigger `entered` event for subject entering in the Workflow for the first time
2018-12-01 09:56:47 +01:00
Nicolas Grekas
a928d2b88d Merge branch '4.2'
* 4.2:
  fix cs
  [FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed
  [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings
  Added upgrade to HandlersLocator
  fix type for $value in DocBlock
  [WebProfilerBundle] Fix title case
  [Config] fix path exclusion during glob discovery
  [FrameworkBundle][Messenger] Restore check for messenger serializer default id
  Fix wrapped loop of event listener
  [DI] fix edge case in InlineServiceDefinitionsPass
  undeprecate the single-colon notation for controllers
  Update HttpKernel.php
2018-12-01 09:53:37 +01:00
Nicolas Grekas
afb4244179 Merge branch '4.1' into 4.2
* 4.1:
  fix cs
  [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings
  fix type for $value in DocBlock
  [WebProfilerBundle] Fix title case
  Fix wrapped loop of event listener
  [DI] fix edge case in InlineServiceDefinitionsPass
  undeprecate the single-colon notation for controllers
  Update HttpKernel.php
2018-12-01 09:52:38 +01:00
Nicolas Grekas
6cea166e65 Merge branch '3.4' into 4.1
* 3.4:
  fix cs
  [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings
  fix type for $value in DocBlock
  Fix wrapped loop of event listener
  Update HttpKernel.php
2018-12-01 09:51:37 +01:00
Nicolas Grekas
51d78b5eca fix cs 2018-12-01 09:50:52 +01:00
Nicolas Grekas
e9c4a8c570 bug #29399 [FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed (nicolas-grekas)
This PR was merged into the 4.2 branch.

Discussion
----------

[FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed

| Q             | A
| ------------- | ---
| Branch?       | 4.2
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #29384
| License       | MIT
| Doc PR        | -

Commits
-------

cf7501299d [FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed
2018-12-01 09:44:35 +01:00
Nicolas Grekas
cf7501299d [FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed 2018-12-01 09:31:03 +01:00
Nicolas Grekas
705445db5e minor #29371 Update HttpKernel.php (shreypuranik)
This PR was merged into the 3.4 branch.

Discussion
----------

Update HttpKernel.php

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      |  no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

This update adds a docblock to varToString method in HttpKernel Class

Commits
-------

3324e2a2a6 Update HttpKernel.php
2018-12-01 09:22:50 +01:00
Nicolas Grekas
1905cde840 bug #29375 [Validator] Allow ConstraintViolation::__toString() to expose codes that are not null or emtpy strings (phansys)
This PR was squashed before being merged into the 3.4 branch (closes #29375).

Discussion
----------

[Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings

|Q            |A  |
|---          |---|
|Branch       |2.8|
|Bug fix?     |yes|
|New feature? |no |
|BC breaks?   |no |
|Deprecations?|no |
|Tests pass?  |yes|
|Fixed tickets|n/a|
|License      |MIT|
|Doc PR       |n/a|

Allow to expose `0` or `"0"` validation codes.

Commits
-------

7bb0fb5cc3 [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings
2018-12-01 09:21:59 +01:00
Javier Spagnoletti
7bb0fb5cc3 [Validator] Allow ConstraintViolation::__toString() to expose codes that are not null or emtpy strings 2018-12-01 09:21:51 +01:00
Nicolas Grekas
fb4b75db1b bug #29376 [EventDispatcher] Fix eventListener wrapper loop in TraceableEventDispatcher (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[EventDispatcher] Fix eventListener wrapper loop in TraceableEventDispatcher

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | na

The `TracableEventDispatcher` wrap decorate (in the method `preProcess`) each listeners in a `WrappedListener` before delegating the dispatch to the real dispatcher, then remove the wrapper (in the method `postProcess`.

But, if a listener triggers an exception, the `postProcess` method is not called, and the wrapper in not removed.
If the same event is triggered a second time, the listeners will be decorated twice, etc, etc..
This is an issue with php-pm where the same event is triggered hundred of times within the same process.

This PR moves the `postProcess` in a finally block in order to be called even if an exception in thrown.

Commits
-------

3830a9e376 Fix wrapped loop of event listener
2018-12-01 09:20:40 +01:00
Nicolas Grekas
b869fc1db6 minor #29381 Added upgrade to HandlersLocator (alexander-schranz)
This PR was squashed before being merged into the 4.2 branch (closes #29381).

Discussion
----------

Added upgrade to HandlersLocator

| Q             | A
| ------------- | ---
| Branch?       | 4.2
| Bug fix?      | missing upgrade
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no tests
| Fixed tickets | fixes #29367
| License       | MIT

Added upgrade to HandlersLocator

Commits
-------

d4edb1b966 Added upgrade to HandlersLocator
2018-12-01 09:18:26 +01:00
Alexander Schranz
d4edb1b966 Added upgrade to HandlersLocator 2018-12-01 09:18:19 +01:00
Nicolas Grekas
eef2a948b8 bug #29386 undeprecate the single-colon notation for controllers (fbourigault)
This PR was merged into the 4.1 branch.

Discussion
----------

undeprecate the single-colon notation for controllers

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

This is the same as https://github.com/symfony/symfony/pull/29218 but for `Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader`.

Commits
-------

09371ad6f1 undeprecate the single-colon notation for controllers
2018-12-01 09:17:10 +01:00
Nicolas Grekas
21db588157 bug #29393 [DI] fix edge case in InlineServiceDefinitionsPass (nicolas-grekas)
This PR was merged into the 4.1 branch.

Discussion
----------

[DI] fix edge case in InlineServiceDefinitionsPass

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Looks like this can happen - dunno how
https://stackoverflow.com/questions/53558247/autowire-services-test-yaml-there-is-no-node-with-id-service-a

Commits
-------

8bd2bbfb1c [DI] fix edge case in InlineServiceDefinitionsPass
2018-12-01 09:16:32 +01:00
Nicolas Grekas
cb507a5b05 bug #29394 [Config] fix path exclusion during glob discovery (nicolas-grekas)
This PR was merged into the 4.2 branch.

Discussion
----------

[Config] fix path exclusion during glob discovery

| Q             | A
| ------------- | ---
| Branch?       | 4.2
| Bug fix?      | yes
| New feature?  | -
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Something we missed in #28200 - reported on Slack.

Commits
-------

4ada4dca43 [Config] fix path exclusion during glob discovery
2018-12-01 09:12:16 +01:00
Nicolas Grekas
c3ad8a5c9b bug #29395 [FrameworkBundle][Messenger] Restore check for messenger serializer default id (ogizanagi)
This PR was merged into the 4.2 branch.

Discussion
----------

[FrameworkBundle][Messenger] Restore check for messenger serializer default id

| Q             | A
| ------------- | ---
| Branch?       | 4.2 <!-- see below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets |  https://symfony-devs.slack.com/archives/C9PQ75TV3/p1543590611003500  <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

From Slack:

> @adamquaile [4:10 PM]
> So, I just updated to 4.2 today, and got this message:
> > The default Messenger serializer cannot be enabled as the Serializer support is not available. Try enabling it or running "composer require symfony/serializer-pack"
>
> In the docs it's stated:
> > In order to use Symfony's built-in AMQP transport, you will need the Serializer Component. Ensure that it is installed with:
>
>But I haven't yet configured AMQP - I'm using my own transport. Should I be getting this exception?

---
This check was removed in https://github.com/symfony/symfony/pull/28405, but is actually still necessary to not fail as soon as you can install the Messenger component without the Serializer one installed.

Commits
-------

1cf17c08e9 [FrameworkBundle][Messenger] Restore check for messenger serializer default id
2018-12-01 09:10:22 +01:00
Nicolas Grekas
48e34aa521 minor #29397 [WebProfilerBundle] Fix title case (ro0NL)
This PR was merged into the 4.1 branch.

Discussion
----------

[WebProfilerBundle] Fix title case

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

Split from #29312 for 4.1 👼

Commits
-------

3e16e25252 [WebProfilerBundle] Fix title case
2018-12-01 09:07:16 +01:00
Nicolas Grekas
5d0c93b214 minor #29396 fix type for $value in DocBlock (rudidude86)
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #29396).

Discussion
----------

fix type for $value in DocBlock

`$value` is supposed to be a string, not an int, according to [`NumberFormatter::setTextAttribute()` documentation](https://secure.php.net/manual/en/numberformatter.settextattribute.php)

| Q             | A
| ------------- | ---
| Branch?       | master for features / 3.4 up to 4.2 for bug fixes <!-- see below -->
| Bug fix?      | yes/no
| New feature?  | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | yes/no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest 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 the master branch.
-->

Commits
-------

ff2431a512 fix type for $value in DocBlock
2018-12-01 09:05:47 +01:00
Ryan Rud
ff2431a512 fix type for $value in DocBlock
`$value` is supposed to be a string, not an int, according to [`NumberFormatter::setTextAttribute()` documentation](https://secure.php.net/manual/en/numberformatter.settextattribute.php)
2018-12-01 09:05:41 +01:00
Roland Franssen
3e16e25252
[WebProfilerBundle] Fix title case 2018-12-01 07:23:04 +01:00
Nicolas Grekas
4ada4dca43 [Config] fix path exclusion during glob discovery 2018-11-30 23:21:14 +01:00
Maxime Steinhausser
1cf17c08e9 [FrameworkBundle][Messenger] Restore check for messenger serializer default id 2018-11-30 22:30:24 +01:00
Jérémy Derussé
3830a9e376
Fix wrapped loop of event listener 2018-11-30 19:07:24 +01:00
Nicolas Grekas
8bd2bbfb1c [DI] fix edge case in InlineServiceDefinitionsPass 2018-11-30 18:04:09 +01:00
Nicolas Grekas
5ba4997636 Merge branch '4.2'
* 4.2:
  [Routing] fix greediness of trailing slash
  bumped Symfony version to 4.2.1
  updated VERSION for 4.2.0
  updated CHANGELOG for 4.2.0
2018-11-30 17:32:40 +01:00
Nicolas Grekas
799ad2e57c Merge branch '4.1' into 4.2
* 4.1:
  [Routing] fix greediness of trailing slash
2018-11-30 17:30:51 +01:00
Nicolas Grekas
e955506d83 bug #29380 [Routing] fix greediness of trailing slash (nicolas-grekas)
This PR was merged into the 4.1 branch.

Discussion
----------

[Routing] fix greediness of trailing slash

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #29363
| License       | MIT
| Doc PR        | -

Commits
-------

eb6aee6e1a [Routing] fix greediness of trailing slash
2018-11-30 17:24:20 +01:00
Nicolas Grekas
eb6aee6e1a [Routing] fix greediness of trailing slash 2018-11-30 17:15:04 +01:00
Fabien Bourigault
09371ad6f1 undeprecate the single-colon notation for controllers 2018-11-30 13:06:13 +01:00
Fabien Potencier
0bf4225b24 bumped Symfony version to 4.2.1 2018-11-30 10:41:53 +01:00
Fabien Potencier
7bd9a1bae8
Merge pull request #29383 from fabpot/release-4.2.0
released v4.2.0
2018-11-30 10:32:16 +01:00
Fabien Potencier
887b0f13d7 updated VERSION for 4.2.0 2018-11-30 10:16:14 +01:00
Fabien Potencier
a1e683b7ce updated CHANGELOG for 4.2.0 2018-11-30 10:14:07 +01:00
Nicolas Grekas
6da7afc746 Merge branch '4.2'
* 4.2:
  typo
  [Messenger] Mention HandleTrait in UPGRADE-4.2.md file
  add a test case
  [Form] Handle all case variants of "nan" when parsing a number
2018-11-30 09:55:46 +01:00
Nicolas Grekas
5a4efeeebd Merge branch '4.1' into 4.2
* 4.1:
  typo
  add a test case
  [Form] Handle all case variants of "nan" when parsing a number
2018-11-30 09:55:31 +01:00
Nicolas Grekas
a4bc4ac0ce Merge branch '3.4' into 4.1
* 3.4:
  typo
  add a test case
  [Form] Handle all case variants of "nan" when parsing a number
2018-11-30 09:55:04 +01:00
Nicolas Grekas
6c3c47e550 bug #29343 [Form] Handle all case variants of "nan" when parsing a number (mwhudson, xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[Form] Handle all case variants of "nan" when parsing a number

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #29321
| License       | MIT
| Doc PR        | n/a

NumberToLocalizedStringTransformer::reverseTransform now special cases all case variants of "NaN", not just "NaN" specifically to insulate itself from changing behaviour in ICU.

Commits
-------

85af682834 add a test case
d903dcbac5 [Form] Handle all case variants of "nan" when parsing a number
2018-11-29 17:53:21 +01:00
Nicolas Grekas
f25575ecee minor #29370 typo (OskarStark)
This PR was merged into the 3.4 branch.

Discussion
----------

typo

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets |   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        |

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest 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 the master branch.
-->

Commits
-------

977a007e3a typo
2018-11-29 17:50:50 +01:00
Nicolas Grekas
4ea6f649dc minor #29366 [Messenger] Mention HandleTrait in UPGRADE-4.2.md file (ogizanagi)
This PR was merged into the 4.2 branch.

Discussion
----------

[Messenger] Mention HandleTrait in UPGRADE-4.2.md file

| Q             | A
| ------------- | ---
| Branch?       | 4.2 <!-- see below -->
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | N/A   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Mentions this trait as a solution to build query buses.
I've removed the callable suggestion, as I suspect this won't be the most useful one.

Commits
-------

3cd4477563 [Messenger] Mention HandleTrait in UPGRADE-4.2.md file
2018-11-29 17:47:47 +01:00
Nicolas Grekas
63c423ad0f Merge branch '4.2'
* 4.2:
  [Routing] fix trailing slash redirection
  calculate cache keys for property setters depending on the value
  updated VERSION for 2.8.48
  update CONTRIBUTORS for 2.8.48
  updated CHANGELOG for 2.8.48
2018-11-29 15:48:47 +01:00
Nicolas Grekas
cfc54b481a Merge branch '4.1' into 4.2
* 4.1:
  [Routing] fix trailing slash redirection
  calculate cache keys for property setters depending on the value
  updated VERSION for 2.8.48
  update CONTRIBUTORS for 2.8.48
  updated CHANGELOG for 2.8.48
2018-11-29 15:48:32 +01:00
Nicolas Grekas
bce7748a37 bug #29373 [Routing] fix trailing slash redirection (nicolas-grekas)
This PR was merged into the 4.1 branch.

Discussion
----------

[Routing] fix trailing slash redirection

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #29363
| License       | MIT
| Doc PR        | -

Commits
-------

fbaba23023 [Routing] fix trailing slash redirection
2018-11-29 15:24:55 +01:00
Nicolas Grekas
7ff53ac570 Merge branch '3.4' into 4.1
* 3.4:
  calculate cache keys for property setters depending on the value
  updated VERSION for 2.8.48
  update CONTRIBUTORS for 2.8.48
  updated CHANGELOG for 2.8.48
2018-11-29 15:23:48 +01:00