Commit Graph

28383 Commits

Author SHA1 Message Date
Fabien Potencier
e4a7fd8eed bug #29271 [HttpFoundation] Fix trailing space for mime-type with parameters (Sascha Dens)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] Fix trailing space for mime-type with parameters

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| 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        | 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.
-->
This PR fixes a minor issue that we've discovered by exposing our API towards mobile applications which where sending the header as following `content-type: application/json ;charset=UTF-8`. Request is unable to determine the `getContentType -> getFormat` as **json** due to the whitespace at the end.

```php
$request = Request::createFromGlobals();
$request->headers->set('CONTENT_TYPE', 'application/json ;charset=UTF-8'); // Forcing header for test
if ($request->getContentType() !== 'json') {
    // Return 415 (Unsupported Media Type) status code..
}
```

When checking https://tools.ietf.org/html/rfc7231#section-3.1.1.1 it seems that a space is part of the RFC spec. (Where OWS is abbreviated for Optional WhiteSpace)
```
media-type = type "/" subtype *( OWS ";" OWS parameter )
```
Current the following cases are supported:
* application/json; charset=UTF-8
* application/json;charset=UTF-8

The following are failing:
* application/json ; charset=UTF-8
* application/json ;charset=UTF-8

Commits
-------

f4866bc371 [HttpFoundation] Fix trailing space for mime-type with parameters
2018-11-22 11:33:55 +01:00
Nicolas Grekas
0bb91f73a1 minor #29272 [Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php] Fix indentation error (ValentineBoineau)
This PR was merged into the 2.8 branch.

Discussion
----------

[Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php] Fix indentation error

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

Commits
-------

24264facaa Indentation error
2018-11-21 16:13:15 +01:00
ValentineBoineau
24264facaa
Indentation error 2018-11-21 15:20:20 +01:00
Sascha Dens
f4866bc371 [HttpFoundation] Fix trailing space for mime-type with parameters 2018-11-21 13:53:33 +01:00
Nicolas Grekas
303cae1fec minor #29266 [cs] correct invalid @param types (TomasVotruba)
This PR was merged into the 2.8 branch.

Discussion
----------

[cs] correct invalid @param types

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

That's #29255 on 2.8

Commits
-------

40f26235eb [cs] correct invalid @param types
2018-11-20 16:56:52 +01:00
Tomas Votruba
40f26235eb [cs] correct invalid @param types 2018-11-20 16:55:20 +01:00
Nicolas Grekas
b11ec05282 bug #29223 [Validator] Added the missing constraints instance checks (thomasbisignani)
This PR was merged into the 2.8 branch.

Discussion
----------

[Validator] Added the missing constraints instance checks

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

This PR adds the constraints instance checks missing to limit the validators use.

This behavior is already implemented in all built-in validators, but it was missed in two validators.

Commits
-------

0ecaead015 [Validator] Added the missing constraints instance checks
2018-11-15 13:27:27 +01:00
Nicolas Grekas
f975be24d4 bug #29182 [Form] Fixed empty data for compound date types (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fixed empty data for compound date types

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

Commits
-------

9bab1e8aba [Form] Fixed empty data for compound date types
2018-11-15 13:10:15 +01:00
Thomas Bisignani
0ecaead015 [Validator] Added the missing constraints instance checks 2018-11-14 15:06:48 +01:00
Robin Chalas
c513c18fdd minor #29201 Command::addOption should allow int in $default (hultberg)
This PR was merged into the 2.8 branch.

Discussion
----------

Command::addOption should allow int in $default

| Q             | A
| ------------- | ---
| Branch?       | all
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| 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.
-->

In #28714 the documentation for `$default` on `Command::addOption` was changed to specify more specifically than `mixed`. However, there is an inconsistency as `InputOption::__construct` allows int in its `$default`, but not `Command::addOption`. This PR makes fixes that inconsistency.

Commits
-------

5f8bd89 Command::addOption should allow int in $default
2018-11-14 10:59:29 +01:00
Nicolas Grekas
144a84a526 minor #29181 [Form] Minor fixes in docs and cs (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Minor fixes in docs and cs

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

Commits
-------

de40f5d07b [Form] Minor fixes in docs and cs
2018-11-13 22:12:31 +01:00
Nicolas Grekas
32c01724cd bug #29185 [Form] Fixed keeping hash of equal \DateTimeInterface on submit (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fixed keeping hash of equal \DateTimeInterface on submit

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

Commits
-------

bc2e2cb5ad [Form] Fixed keeping hash of equal \DateTimeInterface on submit
2018-11-13 17:38:43 +01:00
Edvin Hultberg
5f8bd898b4 Command::addOption should allow int in $default
The constructor for InputOption allows int on the $default parameter, but not Command::addOption $default parameter

fixup: apply coding standards patch
2018-11-13 15:21:37 +01:00
Fabien Potencier
19b018989a minor #29192 [PhpUnitBridge] Fix typo (ro0NL)
This PR was merged into the 2.8 branch.

Discussion
----------

[PhpUnitBridge] Fix typo

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| 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 -->

<!--
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
-------

78e386e87f [PhpUnitBridge] Fix typo
2018-11-13 13:16:55 +01:00
Jules Pietri
bc2e2cb5ad [Form] Fixed keeping hash of equal \DateTimeInterface on submit 2018-11-12 21:06:28 +01:00
Roland Franssen
78e386e87f
[PhpUnitBridge] Fix typo 2018-11-12 19:05:42 +01:00
Jules Pietri
de40f5d07b [Form] Minor fixes in docs and cs 2018-11-12 11:47:20 +01:00
Fabien Potencier
893237d58f bug #28731 [Form] invalidate forms on transformation failures (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] invalidate forms on transformation failures

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #20916, #21242, #28584
| License       | MIT
| Doc PR        |

Commits
-------

385d9df29c invalidate forms on transformation failures
2018-11-12 08:14:53 +01:00
Fabien Potencier
26f321cb01 bug #29152 [Config] Unset key during normalization (ro0NL)
This PR was squashed before being merged into the 2.8 branch (closes #29152).

Discussion
----------

[Config] Unset key during normalization

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

2.8 vs. 4.x :) let me know.

Commits
-------

e1402d495e [Config] Unset key during normalization
2018-11-12 08:03:10 +01:00
Roland Franssen
e1402d495e [Config] Unset key during normalization 2018-11-12 08:03:04 +01:00
Jules Pietri
9bab1e8aba [Form] Fixed empty data for compound date types 2018-11-11 23:32:26 +01:00
Nicolas Grekas
131a42b38a minor #29174 Add required key attribute (greg0ire)
This PR was merged into the 2.8 branch.

Discussion
----------

Add required key attribute

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

I am getting warnings when running tests with recent phpunit versions (since 7.2.0) :

> `- Element 'element': The attribute 'key' is required but missing.`

This requirement is far from being new, what is recent is phpunit
validating its configuration file against the XSD schema.

See d4484be1a9

This is pedantic (not a bugfix), and might be a bit painful to merge upstream, so if you feel like I should target a more recent instead and let the old branches go on with their lives, please tell me.

Commits
-------

c0733c22cb Add required key attribute
2018-11-11 20:41:05 +01:00
Nicolas Grekas
c88755899e minor #29175 Bump phpunit XSD version to 5.2 (greg0ire)
This PR was merged into the 2.8 branch.

Discussion
----------

Bump phpunit XSD version to 5.2

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

Some attributes being used in the phpunit configuration files, namely
`failOnRisky` and `failOnWarning` were introduced in phpunit 5.2.0. The
Composer configuration shows that tests should run with old versions of
phpunit, but phpunit only validates the configuration against the XSD
since phpunit 7.2.0
These changes can be tested as follows:

```
wget http://schema.phpunit.de/5.2/phpunit.xsd
xargs xmllint --schema phpunit.xsd  1>/dev/null
find src -name phpunit.xml.dist| xargs xmllint --schema phpunit.xsd  1>/dev/null
```

See 7e06a82806
See 46e3745a03/composer.json (L98)

Commits
-------

4dce4b7c30 Bump phpunit XSD version to 5.2
2018-11-11 20:39:52 +01:00
Nicolas Grekas
fa1cd6b4fb minor #29179 [Form] Hardened test suite for empty data (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Hardened test suite for empty data

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

Finally the continuation of #21877, giving some more love to 2.8 before it is not maintained anymore <3.

Commits
-------

b0dab6257b [Form] Hardened test suite for empty data
2018-11-11 20:38:43 +01:00
Jules Pietri
b0dab6257b [Form] Hardened test suite for empty data 2018-11-11 19:20:21 +01:00
Grégoire Paris
4dce4b7c30
Bump phpunit XSD version to 5.2
Some attributes being used in the phpunit configuration files, namely
failOnRisky and failOnWarning were introduced in phpunit 5.2.0. The
Composer configuration shows that tests should run with old versions of
phpunit, but phpunit only validates the configuration against the XSD
since phpunit 7.2.0.
These changes can be tested as follows:

wget http://schema.phpunit.de/5.2/phpunit.xsd
xargs xmllint --schema phpunit.xsd  1>/dev/null
find src -name phpunit.xml.dist| xargs xmllint --schema phpunit.xsd  1>/dev/null

See 7e06a82806
See 46e3745a03/composer.json (L98)
2018-11-11 12:18:13 +01:00
Grégoire Paris
c0733c22cb
Add required key attribute
I am getting warnings when running tests with recent phpunit versions:

> - Element 'element': The attribute 'key' is required but missing.

This requirement is far from being new, what is recent is phpunit
validating its configuration file against the XSD schema.

See d4484be1a9
2018-11-11 11:17:31 +01:00
Christian Flothmann
385d9df29c invalidate forms on transformation failures 2018-11-11 09:39:27 +01:00
Nicolas Grekas
46e3745a03 bug #29057 [HttpFoundation] replace any preexisting Content-Type headers (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] replace any preexisting Content-Type headers

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

Commits
-------

de2ce58a4f [HttpFoundation] replace any preexisting Content-Type headers
2018-11-08 22:38:31 +01:00
Nicolas Grekas
def89e26d0 minor #29111 [HttpFoundation] Fixed PHP doc of ParameterBag::getBoolean (lyrixx)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] Fixed PHP doc of ParameterBag::getBoolean

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

---

Since the method should return a bool, then the default value should be
a bool too

Commits
-------

1fa5a9a0bd [HttpFoundation] Fixed PHP doc of ParameterBag::getBoolean
2018-11-06 19:44:49 +01:00
Grégoire Pineau
1fa5a9a0bd [HttpFoundation] Fixed PHP doc of ParameterBag::getBoolean
Since the method should return a bool, then the default value should be
a bool too
2018-11-06 18:42:22 +01:00
Nicolas Grekas
613ace6874 minor #29077 Add framework asset changes to upgrade 3.0 guide (KatharinaSt)
This PR was squashed before being merged into the 2.8 branch (closes #29077).

Discussion
----------

Add framework asset changes to upgrade 3.0 guide

| Q             | A
| ------------- | ---
| Branch?       | 2.8 up to 4.1 <!-- see below -->
| Bug fix?      | no (upgrade guide improvement)
| 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 | #29050   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | - <!-- required for new features -->

further reading:
https://symfony.com/blog/new-in-symfony-2-7-the-new-asset-component
<!--
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
-------

7de10880a4 Add framework asset changes to upgrade 3.0 guide
2018-11-06 16:58:21 +01:00
KatharinaSt
7de10880a4 Add framework asset changes to upgrade 3.0 guide 2018-11-06 16:58:15 +01:00
Nicolas Grekas
96894947cd minor #29099 [Travis] Bump ext-mongodb to 1.5.2 on Travis (ogizanagi)
This PR was submitted for the 2.7 branch but it was merged into the 2.8 branch instead (closes #29099).

Discussion
----------

[Travis] Bump ext-mongodb to 1.5.2 on Travis

| Q             | A
| ------------- | ---
| Branch?       | 2.7 <!-- 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 | https://travis-ci.org/symfony/symfony/jobs/451058906#L2679   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Should fix Travis builds after ba0b611acb being merged (but not released yet).

And/or use `composer require --dev --no-update mongodb/mongodb:@stable`?

Commits
-------

6e4af32284 [Travis] Bump ext-mongodb to 1.5.2 on Travis
2018-11-06 16:30:29 +01:00
Maxime Steinhausser
6e4af32284 [Travis] Bump ext-mongodb to 1.5.2 on Travis 2018-11-06 16:30:18 +01:00
Fabien Potencier
d1ca2ac4af bumped Symfony version to 2.8.48 2018-11-03 11:02:24 +01:00
Fabien Potencier
0a7bd0db86
Merge pull request #29069 from fabpot/release-2.8.47
released v2.8.47
2018-11-03 10:54:14 +01:00
Fabien Potencier
6f9c358e5d updated VERSION for 2.8.47 2018-11-03 10:53:57 +01:00
Fabien Potencier
cefedf9da1 update CONTRIBUTORS for 2.8.47 2018-11-03 10:53:55 +01:00
Fabien Potencier
75558bf219 updated CHANGELOG for 2.8.47 2018-11-03 10:53:41 +01:00
Nicolas Grekas
de2ce58a4f [HttpFoundation] replace any preexisting Content-Type headers 2018-11-01 18:15:47 +01:00
Fabien Potencier
5a2969cf68 bug #29020 Fix ini_get() for boolean values (deguif)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix ini_get() for boolean values

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

Currently setting `false` or `off`, ... value to configure some PHP ini directives will make this evaluated to `true` as this is equal to a non empty string.

Commits
-------

a1538696c3 Fix ini_get() for boolean values
2018-10-31 06:52:40 +01:00
Nicolas Grekas
2dfb0398b8 minor #29033 Fixed typo (KatharinaSt)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #29033).

Discussion
----------

Fixed typo

| Q             | A
| ------------- | ---
| Branch?       | 2.8 up to 4.1 for bug fixes <!-- 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 | #...   <!-- #-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
-------

5bdcda9778 Fixed typo
2018-10-30 22:31:16 +01:00
KatharinaSt
5bdcda9778 Fixed typo 2018-10-30 22:31:09 +01:00
Nicolas Grekas
0c6f671e8c minor #28938 Revert "fixed CS" (keradus)
This PR was merged into the 2.8 branch.

Discussion
----------

Revert "fixed CS"

This reverts commit d48a3776fe.

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

This PR reverts #28814 , that was caused as a bug of PHP CS Fixer fixed in https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/4027

After fix on PHP CS Fixer side, the rule is passing now at Symfony's codebase.

This PR only reverts wrong chances done by PHP CS Fixer,
it does not apply new rule requested in #28817 ( https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4045 )

Commits
-------

6f83d9f9a3 Revert "fixed CS"
2018-10-30 17:42:45 +01:00
François-Xavier de Guillebon
a1538696c3
Fix ini_get() for boolean values 2018-10-30 17:24:01 +01:00
Nicolas Grekas
36e2983445 minor #29023 [Console] Remove duplicate condition (xuanquynh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] Remove duplicate condition

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

Inside the Command::mergeApplicationDefinition() method, the condition of $mergeArgs is checked twice now. Let's remove the second duplicate one.

See the capture below to review quickly!

```php
public function mergeApplicationDefinition($mergeArgs = true)
{
    if (null === $this->application || (true === $this->applicationDefinitionMerged && ($this->applicationDefinitionMergedWithArgs || !$mergeArgs))) {
        return;
    }

    $this->definition->addOptions($this->application->getDefinition()->getOptions());

    if ($mergeArgs) {
        $currentArguments = $this->definition->getArguments();
        $this->definition->setArguments($this->application->getDefinition()->getArguments());
        $this->definition->addArguments($currentArguments);
    }

    $this->applicationDefinitionMerged = true;
    if ($mergeArgs) {
        $this->applicationDefinitionMergedWithArgs = true;
    }
}
```

Commits
-------

925842af60 Remove duplicate condition
2018-10-30 15:34:03 +01:00
Nguyen Xuan Quynh
925842af60 Remove duplicate condition 2018-10-30 15:26:34 +01:00
Nicolas Grekas
9075d2e64e minor #29013 [HTTP Foundtation] Fix useless space in docblock (ismail1432)
This PR was merged into the 2.8 branch.

Discussion
----------

[HTTP Foundtation] Fix useless space in docblock

I Just removed a useless space in PHP Doc, I don't know if target the 2.8 branch is enough to others SF versions

Commits
-------

6ba75734d6 fix useless space in docblock
2018-10-29 12:11:57 +01:00
Smaine Milianni
6ba75734d6 fix useless space in docblock 2018-10-29 08:56:04 +01:00