Commit Graph

29897 Commits

Author SHA1 Message Date
Christian Flothmann
c690256966 remove Security deps from the require section
These requirements have been moved in #20075 before and are still
present in the `require-dev` section.
2017-05-15 15:20:33 +02:00
Nicolas Grekas
5857e7c4e1 Merge branch '2.8' into 3.2
* 2.8:
  Fix errors not rethrown even if not handled by console.error listeners
  [VarDumper] Fix dumping of non-nested stubs
  [Security] Avoid unnecessary route lookup for empty logout path
2017-05-15 14:02:31 +02:00
Nicolas Grekas
6ef78ec553 Merge branch '2.7' into 2.8
* 2.7:
  Fix errors not rethrown even if not handled by console.error listeners
  [VarDumper] Fix dumping of non-nested stubs
  [Security] Avoid unnecessary route lookup for empty logout path
2017-05-15 13:59:37 +02:00
Fabien Potencier
1c2c3fc677 bug #22647 [VarDumper] Fix dumping of non-nested stubs (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix dumping of non-nested stubs

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

Commits
-------

dd5b7a632b [VarDumper] Fix dumping of non-nested stubs
2017-05-11 10:53:06 -07:00
Fabien Potencier
8f4eb92b64 bug #22409 [Yaml] respect inline level when dumping objects as maps (goetas, xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[Yaml] respect inline level when dumping objects as maps

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

Commits
-------

3cca48c715 respect inline level when dumping objects as maps
4f5c149798 Test case for not in-lined map-objects
2017-05-11 10:37:16 -07:00
Fabien Potencier
2a288dba78 bug #22584 [Security] Avoid unnecessary route lookup for empty logout path (ro0NL)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] Avoid unnecessary route lookup for empty logout path

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no-ish
| Deprecations? | no
| Tests pass?   | yes/no
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

i first included this with #22572 where having `logout: { path: ~ }` makes more sense for disabling logout path matching/generation. But currently it's already allowed and causes an unneeded route lookup and url generation.

Commits
-------

2967807b14 [Security] Avoid unnecessary route lookup for empty logout path
2017-05-11 10:27:33 -07:00
Fabien Potencier
05240ce60d bug #22690 [Console] Fix errors not rethrown even if not handled by console.error listeners (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fix errors not rethrown even if not handled by console.error listeners

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/22678
| License       | MIT
| Doc PR        | n/a

https://github.com/symfony/symfony/pull/22261 has been squashed while revisiting error handling, this fixes it again while keeping latest changes intact.

__code__
```php
public function execute(InputInterface $input, OutputInterface $output) {
    $this->barr();
}

public function bar() { }
```

__before__
![before](http://image.prntscr.com/image/38aa3b46fed6439ead693908ab104fb3.png)

__after__
![after](http://image.prntscr.com/image/071322bfa52247c6a02eac6ef9d8284a.png)

Commits
-------

75f098fcb8 Fix errors not rethrown even if not handled by console.error listeners
2017-05-11 10:13:33 -07:00
Fabien Potencier
329e96c583 Merge branch '2.8' into 3.2
* 2.8:
  [Console] Do not duplicate Helper::strlen() code
  [FrameworkBundle] Adding the extension XML
  [Form] Minor: Fix comment in ChoiceType
  [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice
2017-05-11 09:41:44 -07:00
Fabien Potencier
433dfd42a1 Merge branch '2.7' into 2.8
* 2.7:
  [Console] Do not duplicate Helper::strlen() code
  [FrameworkBundle] Adding the extension XML
  [Form] Minor: Fix comment in ChoiceType
  [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice
2017-05-11 09:41:12 -07:00
Fabien Potencier
0ad2f2ef9f bug #22669 [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/recipes/issues/46
| License       | MIT
| Doc PR        | N/A

As spotted in https://github.com/symfony/recipes/issues/46, there is no reason to call `registerBundles` on the kernel instance, as it's already booted. So we just have to use `getBundles` instead and `registerBundles` can be implemented in a non-rewindable way, as done with flex.

Commits
-------

040edfec4a [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice
2017-05-11 09:38:53 -07:00
Robin Chalas
75f098fcb8 Fix errors not rethrown even if not handled by console.error listeners 2017-05-11 16:06:19 +02:00
Fabien Potencier
2f1c28bbbc minor #22683 [Console] Do not duplicate Helper::strlen() code (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Do not duplicate Helper::strlen() code

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

Commits
-------

01c2c099a4 [Console] Do not duplicate Helper::strlen() code
2017-05-10 11:24:43 -07:00
Maxime Steinhausser
01c2c099a4 [Console] Do not duplicate Helper::strlen() code 2017-05-09 20:54:25 +02:00
Fabien Potencier
2d72b0b8ce minor #22673 [Form] Minor: Fix comment in ChoiceType (issei-m)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Minor: Fix comment in ChoiceType

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | n/a
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Forgotten to be updated in: #21957

Commits
-------

a49d79c856 [Form] Minor: Fix comment in ChoiceType
2017-05-09 07:57:36 -07:00
Fabien Potencier
71efe3f3de bug #22676 [FrameworkBundle] Adding the extension XML (flug)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #22676).

Discussion
----------

[FrameworkBundle] Adding the extension XML

| Q             | A
| ------------- | ---
| Branch?       | <3.3
| Bug fix?      | yes
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->

![XmlUtils](https://cloud.githubusercontent.com/assets/1810304/25841740/9b655036-34a1-11e7-9d1e-a23928b8ed17.png)

This pull request is referenced on ![symfony/skeleton](https://github.com/symfony/skeleton/pull/7)
<!--
- 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.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Commits
-------

6fe2ad0558 [FrameworkBundle] Adding the extension XML
2017-05-09 07:44:44 -07:00
Flug
6fe2ad0558 [FrameworkBundle] Adding the extension XML
required by XmlUtils and not installed by default
2017-05-09 07:43:21 -07:00
Issei.M
a49d79c856 [Form] Minor: Fix comment in ChoiceType 2017-05-09 13:05:50 +09:00
Fabien Potencier
f389fa3a56 bug #22652 [Workflow] Move twig extension registration to twig bundle (ogizanagi)
This PR was merged into the 3.2 branch.

Discussion
----------

[Workflow] Move twig extension registration to twig bundle

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

It's probably very late, but I think the twig extension registration is supposed to be done from the `TwigBundle` rather than the `FrameworkBundle`. Fortunately, it doesn't cause any issue currently when using the framework bundle and the workflow component without twig, because it only creates a `workflow.twig_extension` service you'll probably never call, and the `twig.extension` tag is never processed. But still, creates a useless service that cannot be called (and is not removed because it's public).

So this PR aims for consistency over other twig extensions registration, and removing this service when not using twig.
It isn't a BC break to me, as you usually already use the `TwigBundle` for other extensions.

Commits
-------

3fc80d10ef [Workflow] Move twig extension registration to twig bundle
2017-05-08 09:35:15 -07:00
Maxime Steinhausser
040edfec4a [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice 2017-05-08 10:50:08 +02:00
Fabien Potencier
ec92b68bad minor #22653 [Workflow] fix use directives (ogizanagi)
This PR was merged into the 3.2 branch.

Discussion
----------

[Workflow] fix use directives

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

Spotted while creating https://github.com/symfony/symfony/pull/22652

Commits
-------

08f4ad2275 [Workflow] fix use directives
2017-05-07 20:43:20 -07:00
Fabien Potencier
f832a4c7eb minor #22666 CS fixes (fabpot)
This PR was merged into the 3.2 branch.

Discussion
----------

CS fixes

| Q             | A
| ------------- | ---
| Branch?       | 3.2
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

33d6f5c327 fixed CS
2017-05-07 20:42:20 -07:00
Fabien Potencier
33d6f5c327 fixed CS 2017-05-07 19:28:57 -07:00
Fabien Potencier
b81a6629ee Merge branch '2.8' into 3.2
* 2.8:
  fixed CS
  [DI] Fix PhpDumper blank lines around namespace
  fixed CS
  Filesystem: annotate the one network test with a "network" group.
  [DependencyInjection] Don't store default deprecation template in every service definition instance
2017-05-07 18:51:21 -07:00
Fabien Potencier
5e8412b65f minor #22660 fixed CS (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

fixed CS

| 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

Commits
-------

a23330bf1e fixed CS
2017-05-07 18:49:14 -07:00
Fabien Potencier
a23330bf1e fixed CS 2017-05-07 18:19:21 -07:00
Fabien Potencier
ae3d88c215 Merge branch '2.7' into 2.8
* 2.7:
  [DI] Fix PhpDumper blank lines around namespace
2017-05-07 18:18:23 -07:00
Fabien Potencier
62cb443770 minor #22663 [DI] Fix PhpDumper blank lines around namespace (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Fix PhpDumper blank lines around namespace

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

219bce9916 tries to fix CS in an expected PhpDumper output, which actually shows the PhpDumper does not create proper blank lines around the namespace.
That's why tests are failing on https://github.com/symfony/symfony/pull/22660.

Commits
-------

c9f6c1680f [DI] Fix PhpDumper blank lines around namespace
2017-05-07 18:18:06 -07:00
Maxime Steinhausser
c9f6c1680f [DI] Fix PhpDumper blank lines around namespace 2017-05-07 19:29:35 +02:00
Fabien Potencier
57129de78c Merge branch '2.7' into 2.8
* 2.7:
  fixed CS
  Filesystem: annotate the one network test with a "network" group.
2017-05-07 09:04:05 -07:00
Fabien Potencier
219bce9916 fixed CS 2017-05-07 09:03:57 -07:00
Maxime Steinhausser
08f4ad2275 [Workflow] fix use directives 2017-05-06 11:04:08 +02:00
Maxime Steinhausser
3fc80d10ef [Workflow] Move twig extension registration to twig bundle 2017-05-06 10:33:49 +02:00
Nicolas Grekas
dd5b7a632b [VarDumper] Fix dumping of non-nested stubs 2017-05-05 13:16:12 +02:00
Fabien Potencier
fd9459cdfd minor #22630 Filesystem: annotate the one network test with a "network" group. (orlitzky)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #22630).

Discussion
----------

Filesystem: annotate the one network test with a "network" group.

This is one tiny commit that lets us avoid hitting the network while running the test suite. We've packaged symfony-filesystem in Gentoo, and our users can run the test suite when they install it. However, network access is forbidden during the test phase (it causes spurious failures, privacy issues, etc.). By marking the one network test with `@group network`, we are able to skip it with `--exclude-group network`.

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

Commits
-------

fd0dd57e74 Filesystem: annotate the one network test with a "network" group.
2017-05-04 11:16:16 -07:00
Michael Orlitzky
fd0dd57e74 Filesystem: annotate the one network test with a "network" group.
Tests that require network access can be problematic, because they
depend on some external state not under your control. That can lead to
"random" failures when the code in question actually works fine. The
Filesystem component has one such test, and this commit adds it to the
"network" group (for PHPUnit).

Doing so lets the user skip that particular test, by running phpunit
with the --exclude-group flag. We take advantage of this in Gentoo,
where every user has the ability to run the test suite but network
access is forbidden.
2017-05-04 11:16:15 -07:00
Fabien Potencier
0602fb53ab minor #22628 [DependencyInjection] Don't store default deprecation template in every service definition instance (fortis)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Don't store default deprecation template in every service definition instance

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

While debugging I noticed that each service definition contains a default deprecation template, even if it was not marked as deprecated

Commits
-------

388ee467c5 [DependencyInjection] Don't store default deprecation template in every service definition instance
2017-05-04 11:12:20 -07:00
Alan Bondarchuk
388ee467c5 [DependencyInjection] Don't store default deprecation template in every service definition instance 2017-05-04 20:21:54 +03:00
Nicolas Grekas
b8714d34a1 Merge branch '2.8' into 3.2
* 2.8:
  [appveyor] Run the test suite on PHP 7.1
  bumped Symfony version to 2.8.21
  updated VERSION for 2.8.20
  updated CHANGELOG for 2.8.20
  bumped Symfony version to 2.7.28
  updated VERSION for 2.7.27
  update CONTRIBUTORS for 2.7.27
  updated CHANGELOG for 2.7.27
2017-05-04 14:22:25 +02:00
Nicolas Grekas
dfae2ab6be Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] Run the test suite on PHP 7.1
  bumped Symfony version to 2.7.28
  updated VERSION for 2.7.27
  update CONTRIBUTORS for 2.7.27
  updated CHANGELOG for 2.7.27
2017-05-04 14:19:31 +02:00
Jakub Zalas
00acb37205
[Intl] Update ICU data to 59.1 2017-05-03 19:20:02 +01:00
Nicolas Grekas
0c704cf76a minor #22602 [EventDispatcher] fix merge of #22541 from 2.8 (dmaicher)
This PR was merged into the 3.2 branch.

Discussion
----------

[EventDispatcher] fix merge of #22541 from 2.8

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

This cleans up a test case that was merged from 2.8 into 3.2 here: 824dc8ba5f

@fabpot due to different implementations I created 2 PR's:

2.8: https://github.com/symfony/symfony/pull/22541
3.2: https://github.com/symfony/symfony/pull/22568

So the 2.8 merge into 3.2 of my change-set introduced some unused variable `$isWrapped` here: 824dc8ba5f (diff-af3c4fbca8bb77957c00087543ae5a4dR113)

This PR just cleans it up and also removes the data provider 😉

Commits
-------

f67eba8 [EventDispatcher] fix merge of #22541 from 2.8
2017-05-02 11:20:19 +02:00
Nicolas Grekas
0c4e549fa1 minor #22560 [appveyor] Run the test suite on PHP 7.1 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[appveyor] Run the test suite on PHP 7.1

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

Commits
-------

a537d6c [appveyor] Run the test suite on PHP 7.1
2017-05-02 11:17:38 +02:00
Nicolas Grekas
8342cd7c1c minor #22562 [appveyor][3.x] Run the test suite on PHP 7.1 (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[appveyor][3.x] Run the test suite on PHP 7.1

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | let's see
| Fixed tickets | #22556
| License       | MIT
| Doc PR        | -

Commits
-------

51b82f5 [appveyor][3.x] Run the test suite on PHP 7.1
2017-05-02 11:16:43 +02:00
Nicolas Grekas
a537d6c11e [appveyor] Run the test suite on PHP 7.1 2017-05-02 10:48:05 +02:00
Nicolas Grekas
51b82f5469 [appveyor][3.x] Run the test suite on PHP 7.1 2017-05-02 10:05:20 +02:00
David Maicher
f67eba863c [EventDispatcher] fix merge of #22541 from 2.8 2017-05-01 20:34:19 +02:00
Fabien Potencier
da26b3f32f bumped Symfony version to 3.2.9 2017-05-01 11:00:12 -07:00
Fabien Potencier
85959c2abb Merge pull request #22601 from fabpot/release-3.2.8
released v3.2.8
2017-05-01 10:47:03 -07:00
Fabien Potencier
e3133489bc updated VERSION for 3.2.8 2017-05-01 10:46:48 -07:00
Fabien Potencier
4bb25dc938 updated CHANGELOG for 3.2.8 2017-05-01 10:46:41 -07:00