Commit Graph

36030 Commits

Author SHA1 Message Date
Nicolas Grekas 85df96a41d Merge branch '2.8' into 3.4
* 2.8:
  Add framework asset changes to upgrade 3.0 guide
  [Travis] Bump ext-mongodb to 1.5.2 on Travis
  bumped Symfony version to 2.8.48
  updated VERSION for 2.8.47
  update CONTRIBUTORS for 2.8.47
  updated CHANGELOG for 2.8.47
2018-11-06 17:04:36 +01:00
Nicolas Grekas 69ae468351 bug #29102 [DI] fix GraphvizDumper ignoring inline definitions (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] fix GraphvizDumper ignoring inline definitions

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

Since SF3, inline definitions are first class citizen. I noticed that the GraphvizDumper does not inspect them. Here is the fix.

Commits
-------

ebe6265504 [DI] fix GraphvizDumper ignoring inline definitions
2018-11-06 17:03:43 +01:00
Nicolas Grekas 6cfd3de7bf minor #29041 Fix ini_get() for boolean values (deguif)
This PR was merged into the 3.4 branch.

Discussion
----------

Fix ini_get() for boolean values

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

This follows #29020 for branch 3.4

Commits
-------

65b34cb53c Fix ini_get() for boolean values
2018-11-06 17:00:34 +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 f898332fb5 bug #29107 [DI] dont track classes/interfaces used to compute autowiring error messages (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] dont track classes/interfaces used to compute autowiring error messages

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

This will also improve DX since tracking these files is not needed at all.

Commits
-------

09a0c23668 [DI] dont track classes/interfaces used to compute autowiring error messages
2018-11-06 16:54:19 +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
Nicolas Grekas 09a0c23668 [DI] dont track classes/interfaces used to compute autowiring error messages 2018-11-06 14:23:35 +01:00
Nicolas Grekas ebe6265504 [DI] fix GraphvizDumper ignoring inline definitions 2018-11-06 10:26:47 +01:00
Fabien Potencier 3ed98de837 bumped Symfony version to 3.4.19 2018-11-03 12:10:01 +01:00
Fabien Potencier ee054aa62e
Merge pull request #29070 from fabpot/release-3.4.18
released v3.4.18
2018-11-03 11:03:29 +01:00
Fabien Potencier b22cad3743 updated VERSION for 3.4.18 2018-11-03 11:03:02 +01:00
Fabien Potencier 188481df60 updated CHANGELOG for 3.4.18 2018-11-03 11:02:53 +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
François-Xavier de Guillebon 65b34cb53c
Fix ini_get() for boolean values 2018-10-31 14:11:30 +01:00
Nicolas Grekas 5d1120593c bug #28820 [DependencyInjection] Fix tags on multiple decorated service (Soner Sayakci)
This PR was merged into the 3.4 branch.

Discussion
----------

[DependencyInjection] Fix tags on multiple decorated service

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

After the first run in the loop with the same decorated service it goes only in the hasAlias condition. The tags will be not set here, so the `ResolveTaggedIteratorArgumentPass` will handle only the first decoration.

Commits
-------

90f8df2830 [DependencyInjection] Fix tags on multiple decorated service
2018-10-31 11:49:51 +01:00
Soner Sayakci 90f8df2830 [DependencyInjection] Fix tags on multiple decorated service 2018-10-31 11:41:01 +01:00
Nicolas Grekas bcc4454079 fix merge 2018-10-31 10:26:14 +01:00
Nicolas Grekas 63c74f7c29 Merge branch '2.8' into 3.4
* 2.8:
  Fixed typo
  Fix ini_get() for boolean values
2018-10-31 10:06:03 +01:00
Nicolas Grekas 555f2d922e minor #28994 SCA: minor code tweaks (vladimir.reznichenko, kalessil)
This PR was merged into the 3.4 branch.

Discussion
----------

SCA: minor code tweaks

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

Following tweaks included:
- repetitive method calls
- greedy regex
- unnecessary function calls (simplifications)

Commits
-------

b12c89d481 SCA: fixed broken tests
42e96ff7a2 SCA: applied code style as per guidelines
8dbd927a33 SCA: minor code tweaks
2018-10-31 09:57:11 +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 faec03105f Merge branch '2.8' into 3.4
* 2.8:
  Remove duplicate condition
  fix useless space in docblock
  remove unneeded tearDown method
  [FrameworkBundle] Fix broken exception message
  Revert "fixed CS"
  Skip empty proxy code
  [Security] Fix "exclude-from-classmap"
  add missing double-quotes to extra_fields output message
  Convert InsufficientAuthenticationException to HttpException
2018-10-30 17:50:50 +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
Robin Chalas 5b4d7e20f9 minor #29003 Remove unneeded tearDown method (darrylhein)
This PR was merged into the 2.8 branch.

Discussion
----------

Remove unneeded tearDown method

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

Revamped version of #28998

Commits
-------

feba381 remove unneeded tearDown method
2018-10-27 23:46:19 +02:00
Darryl Hein feba3816dc
remove unneeded tearDown method 2018-10-27 15:32:49 -06:00
Fabien Potencier c2478d4500 minor #28977 [Intl] Update the ICU data to 63.1 (jakzal)
This PR was squashed before being merged into the 3.4 branch (closes #28977).

Discussion
----------

[Intl] Update the ICU data to 63.1

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| 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
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

http://site.icu-project.org/download/63

All tests are passing on the CI. I additionally run intl related tests (Form,Intl,Translation,Validator components) with ICU `63.1` on PHP `5.5`, `5.6`, `7.1`, `7.2`, `7.3-rc`.

Confirmed `@group intl-data` tests are passing with ICU `63.1` on PHP `5.5` and `7.2`.

Commits
-------

76bc6f0f28 [Intl] Update the ICU data to 63.1
2018-10-27 17:56:31 +02:00
Jakub Zalas 76bc6f0f28 [Intl] Update the ICU data to 63.1 2018-10-27 17:56:20 +02:00
Fabien Potencier 5c3d826e9b minor #28996 [FrameworkBundle] Fix broken exception message (chalasr)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Fix broken exception message

| 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

![](https://i.imgur.com/GmBhlqv.png)

Commits
-------

8e9860ca8b [FrameworkBundle] Fix broken exception message
2018-10-27 06:07:42 +02:00
Robin Chalas 8e9860ca8b [FrameworkBundle] Fix broken exception message 2018-10-26 23:18:28 +02:00
Vladimir Reznichenko b12c89d481 SCA: fixed broken tests 2018-10-26 17:01:50 +02:00
vladimir.reznichenko 42e96ff7a2 SCA: applied code style as per guidelines 2018-10-26 15:43:57 +02:00
vladimir.reznichenko 8dbd927a33 SCA: minor code tweaks 2018-10-26 15:40:38 +02:00
Fabien Potencier 4877d60a74 feature #28893 [TwigBundle] Fix usage of TwigBundle without FrameworkBundle (tgalopin)
This PR was squashed before being merged into the 3.4 branch (closes #28893).

Discussion
----------

[TwigBundle] Fix usage of TwigBundle without FrameworkBundle

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

According to the composer.json (https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/TwigBundle/composer.json), the FrameworkBundle shouldn't be required to use the bundle (which can be useful in tests of other bundles for instance). However, it is not the case, mainly due to issues with direct references to unavailable services.

I target 3.4 because 812fbb444f is the main reason for the issue. We may have added additional problems in 4.0 and 4.1.

Commits
-------

246a905f93 [TwigBundle] Fix usage of TwigBundle without FrameworkBundle
2018-10-21 08:50:28 +02:00
Titouan Galopin 246a905f93 [TwigBundle] Fix usage of TwigBundle without FrameworkBundle 2018-10-21 08:50:17 +02:00
Dariusz Ruminski 6f83d9f9a3 Revert "fixed CS"
This reverts commit d48a3776fe.
2018-10-21 01:16:31 +02:00
Nicolas Grekas 060751d4e1 bug #28861 [DependencyInjection] Skip empty proxy code (olvlvl)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Skip empty proxy code

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

Fix https://github.com/symfony/symfony/issues/28852

@nicolas-grekas I'm not sure which branch this should be applied to, please let me know.

Commits
-------

baf6f8cc34 Skip empty proxy code
2018-10-20 22:22:40 +02:00
Olivier Laviale baf6f8cc34 Skip empty proxy code 2018-10-20 22:20:36 +02:00
Fabien Potencier 6a50405483 minor #28930 [Security] Fix "exclude-from-classmap" (acasademont)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Fix "exclude-from-classmap"

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

The "/Tests/" directory doesn't exist in the Security Component, tests are located within the Security components folders and none of the tests were being excluded in an --classmap-authoritative dump of the autoload.

Commits
-------

7b256a985d [Security] Fix "exclude-from-classmap"
2018-10-20 08:57:09 +02:00