Commit Graph

22739 Commits

Author SHA1 Message Date
Fabien Potencier
93d5bf7424 Merge branch '2.3' into 2.7
* 2.3:
  [SecurityBundle] Optimize dependency injection tests
  [HttpFoundation] Do not overwrite the Authorization header if it is already set
  tag for dumped PHP objects must be a local one
2016-01-24 12:05:56 +01:00
Fabien Potencier
c1b091702a bug #16511 [2.7][Asset] Ability to set empty version strategy in packages (ewgRa)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Asset] Ability to set empty version strategy in packages

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no, but not sure, as for me test was wrong
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14832
| License       | MIT
| Doc PR        |

Comment about '' thing. As you can see in xml test - we can't for attribute set null value. And for xml version '' empty string considered as null value, that affect all others formats and test is changed.

Commits
-------

646fc9c Ability to set empty version strategy in packages
2016-01-24 11:31:00 +01:00
Evgeniy Sokolov
646fc9caaa Ability to set empty version strategy in packages 2016-01-23 23:57:07 +01:00
Fabien Potencier
870b40cf59 minor #17495 [2.7] [FrameworkBundle] [DX] Sort bundles in config commands (kix)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [FrameworkBundle] [DX] Sort bundles in config commands

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

Reopened against `2.7` instead of #17490

This makes the behaviour of config commands a bit more user-friendly. Scanning through an ordered list should be a lot easier for the user, especially if she knows what's the exact bundle they're looking for. The sort is applied to the bundle name, as the extension alias might not always be present.

Before:
![before](https://cloud.githubusercontent.com/assets/345754/12498061/8e0ff30a-c0c1-11e5-9c96-561065eedc79.png)
After:
![after](https://cloud.githubusercontent.com/assets/345754/12498064/93019bde-c0c1-11e5-8bbc-c85a74b3f5e8.png)

Commits
-------

80d51e0 Sort bundles in config commands
2016-01-23 11:38:31 +01:00
Fabien Potencier
7afb784e9e bug #17503 [Asset] CLI: use request context to generate absolute URLs (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Asset] CLI: use request context to generate absolute URLs

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

Commits
-------

766a648 CLI: use request context to generate absolute URLs
2016-01-23 11:36:09 +01:00
Christian Flothmann
766a648ded CLI: use request context to generate absolute URLs 2016-01-23 11:02:39 +01:00
Fabien Potencier
93b831b395 minor #17497 [SecurityBundle] Optimize dependency injection tests (paradajozsef)
This PR was squashed before being merged into the 2.3 branch (closes #17497).

Discussion
----------

[SecurityBundle] Optimize dependency injection tests

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

Tests building the same container multiple times. The same solution can be applied as here: #17399. This time I ran comparison tests only on 2.3. (my laptop is really slow)

**2.3 before**

```go
Time: 14.79 seconds, Memory: 48.25Mb
OK (77 tests, 227 assertions)
OK src/Symfony/Bundle/SecurityBundle/
```
**2.3 after**

```go
Time: 9.78 seconds, Memory: 48.75Mb
OK (77 tests, 227 assertions)
OK src/Symfony/Bundle/SecurityBundle/
```

Commits
-------

bf56d2f [SecurityBundle] Optimize dependency injection tests
2016-01-23 10:46:31 +01:00
Paráda József
bf56d2fc17 [SecurityBundle] Optimize dependency injection tests 2016-01-23 10:46:30 +01:00
Stepan Anchugov
80d51e0d18 Sort bundles in config commands 2016-01-22 18:33:13 +05:00
Fabien Potencier
9a90cde4ed bug #17478 [HttpFoundation] Do not overwrite the Authorization header if it is already set (jakzal)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17478).

Discussion
----------

[HttpFoundation] Do not overwrite the Authorization header if it is already set

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

Commits
-------

53ebfda [HttpFoundation] Do not overwrite the Authorization header if it is already set
2016-01-22 07:46:45 +01:00
Jakub Zalas
53ebfda33e [HttpFoundation] Do not overwrite the Authorization header if it is already set 2016-01-22 07:46:45 +01:00
Fabien Potencier
385f23e238 bug #17461 [Yaml] tag for dumped PHP objects must be a local one (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] tag for dumped PHP objects must be a local one

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

Commits
-------

9d03478 tag for dumped PHP objects must be a local one
2016-01-22 07:35:55 +01:00
Fabien Potencier
15c37c2442 minor #17471 fixed CS (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

fixed CS

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

06b958a fixed CS
2016-01-21 10:04:27 +01:00
Fabien Potencier
06b958a17e fixed CS 2016-01-21 09:40:25 +01:00
Fabien Potencier
9afd7e02e0 Merge branch '2.3' into 2.7
* 2.3:
  fixed test
2016-01-21 09:40:12 +01:00
Fabien Potencier
6eda9ad834 fixed test 2016-01-21 09:40:05 +01:00
Fabien Potencier
ddc668d1cb Merge branch '2.3' into 2.7
* 2.3:
  fixed CS
2016-01-21 07:59:09 +01:00
Fabien Potencier
b81cac880e minor #17467 fixed CS (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed CS

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

42862c4 fixed CS
2016-01-21 07:57:24 +01:00
Fabien Potencier
42862c4668 fixed CS 2016-01-21 07:28:40 +01:00
Fabien Potencier
00c31922e2 bug #17456 [DX] Remove default match from AbstractConfigCommand::findExtension (kix)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17456).

Discussion
----------

[DX] Remove default match from AbstractConfigCommand::findExtension

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

Previously, `findExtension` would return the first extension that might not even match the `$name` parameter, which would quite confuse the user:

```
$ app/console config:debug TotallyNonExistentBundle
# Current configuration for "TotallyNonExistentBundle"
knp_paginator:
    default_options:
        sort_field_name: sort
        sort_direction_name: direction
        filter_field_name: filterField
        filter_value_name: filterValue
        page_name: page
        distinct: true
    template:
        pagination: 'KnpPaginatorBundle:Pagination:sliding.html.twig'
        filtration: 'KnpPaginatorBundle:Pagination:filtration.html.twig'
        sortable: 'KnpPaginatorBundle:Pagination:sortable_link.html.twig'
    page_range: 5
```

Same problem goes for the `config:dump` command. When you dumped the config for a bundle you thought you've registered, but, for example, you'd use a name that's not exactly matching, you'd get confusing output for a different bundle's configuration.

The problem was, an `Extension` [was always fetched in the finder method](https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php#L51), and name/alias misses were ignored.

Commits
-------

b85059a Remove default match from AbstractConfigCommand::findExtension
2016-01-21 07:10:38 +01:00
Stepan Anchugov
b85059a672 Remove default match from AbstractConfigCommand::findExtension
Previously, findExtension would return the first extension that might
not even match the $name parameter.
2016-01-21 07:10:38 +01:00
Christian Flothmann
9d034787fe tag for dumped PHP objects must be a local one 2016-01-20 20:16:59 +01:00
Fabien Potencier
a4f7fbfa04 bug #17424 [2.7][Process] Update in 2.7 for stream-based output storage (romainneutron)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Process] Update in 2.7 for stream-based output storage

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

This PR should be rebased once #17423 has been merged. It contains fixes related to methode `Process::getErrorOutput` and `Process::getOutput` that do not exist in branch 2.3

Commits
-------

2d931f4 [Process] Use stream based storage to avoid memory issues
2016-01-20 12:53:41 +01:00
Romain Neutron
2d931f43e0 [Process] Use stream based storage to avoid memory issues 2016-01-20 10:24:45 +01:00
Fabien Potencier
6ec5537aed Merge branch '2.3' into 2.7
* 2.3:
  [Process] Remove a misleading comment
  Improve the phpdoc of SplFileInfo methods
  [Process] Use stream based storage to avoid memory issues
  Fixed the documentation of VoterInterface::supportsAttribute
  Remove useless duplicated tests
  [FrameworkBundle] Optimize framework extension tests
  Use is_subclass_of instead of Reflection when possible
2016-01-20 07:45:12 +01:00
Fabien Potencier
6d8078febf bug #17423 [2.3][Process] Use stream based storage to avoid memory issues (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Use stream based storage to avoid memory issues

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

Commits
-------

da73125 [Process] Use stream based storage to avoid memory issues
2016-01-20 07:43:36 +01:00
Fabien Potencier
1941add676 minor #17419 Fixed the documentation of VoterInterface::supportsAttribute (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the documentation of VoterInterface::supportsAttribute

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

Commits
-------

d662c2a Fixed the documentation of VoterInterface::supportsAttribute
2016-01-19 22:34:18 +01:00
Fabien Potencier
20f0d60226 minor #17450 [FrameworkBundle] Fix upgrade guides concerning erroneous removal of assets helper (regularjack)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Fix upgrade guides concerning erroneous removal of assets helper

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

As mentioned in #17041, the upgrade guides for 2.7 and 3.0 erroneously mention that the `templating.helper.assets` service is removed in 3.0.  #17041 cannot fix these issues since it targets 3.0.

This PR should only be merged after #17041 since it depends on it.

Commits
-------

5abac56 Fix upgrade guides concerning erroneous removal of assets helper
2016-01-19 22:29:05 +01:00
Paulo Rodrigues Pinto
5abac565d3 Fix upgrade guides concerning erroneous removal of assets helper 2016-01-19 17:59:48 +00:00
Fabien Potencier
90ce9bc35e minor #17378 [Asset] ChooseBaseUrl should return an offset (bburnichon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Asset] ChooseBaseUrl should return an offset

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

Enforce chooseBaseUrl to return an integer offset to the baseUrls member.

Commits
-------

0d041c3 ChooseBaseUrl should return an index
2016-01-19 17:56:49 +01:00
Tobias Schultze
4224b1b55f minor #17448 [Process] Remove a misleading comment (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Remove a misleading comment

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

The described behaviour was never implemented as part of #3681.

Commits
-------

71f4a32 [Process] Remove a misleading comment
2016-01-19 17:52:05 +01:00
Tobias Schultze
1974eafcdc minor #17442 Fix markdown typo (welcoMattic)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix markdown typo

There was too much backticks before Config paragraph

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

Commits
-------

bd70f24 Fix markdown typo
2016-01-19 17:50:02 +01:00
Jakub Zalas
71f4a3200e [Process] Remove a misleading comment
The described behaviour was never implemented.
2016-01-19 16:31:40 +00:00
Mathieu Santo Stefano--Féron
bd70f2443d Fix markdown typo 2016-01-19 14:59:47 +01:00
Benoît Burnichon
0d041c3f8a ChooseBaseUrl should return an index
Enforce chooseBaseUrl to return an integer index to the baseUrls member.
2016-01-19 13:47:30 +01:00
Fabien Potencier
414ddf7c2c bug #17406 [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced (paradajozsef)
This PR was squashed before being merged into the 2.7 branch (closes #17406).

Discussion
----------

[Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced

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

As @gseidel [mentioned](https://github.com/symfony/symfony/issues/17270#issuecomment-169115049), the notice only occurs, when a custom choice field added after a choice field **and** the custom type is expanded, **and** the ```'choices'``` normalizer is replaced. The problem is that when ```'choices'``` option is replaced, the [default choiceNormalizer](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php#L262) is not invoked. This normalizer would [clear](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php#L264) the labels from previous invocation, but it's been replaced in the custom choice type. As a result [$choiceLabel](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php#L279) normalizer will get the wrong labels because it shares the same scope with [$choiceNormalizer](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php#L262). Resetting the label values after copy solves this problem.

Commits
-------

be056fd [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced
2016-01-19 13:18:15 +01:00
Paráda József
be056fd0bf [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced 2016-01-19 13:18:13 +01:00
Fabien Potencier
d55f73fb12 minor #17422 [Serializer] Introduce constants for context keys (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Introduce constants for context keys

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

Introduces constants for keys. Follow up @xabbuh's https://github.com/symfony/symfony/pull/17113/files#r48598904

Commits
-------

c56c7bf [Serializer] Introduce constants for context keys
2016-01-19 13:16:25 +01:00
Fabien Potencier
3a19369e61 minor #17431 [Serializer] Remove useless is_object condition (paradajozsef)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Remove useless is_object condition

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

[This condition](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Serializer/Serializer.php#L185) is useless, because ```$class``` is not used in ```getNormalizer()```.

Commits
-------

f6fd5e4 Remove useless is_object condition
2016-01-19 13:13:55 +01:00
Fabien Potencier
63cb9a90e2 bug #17433 [FrameworkBundle] Don't log twice with the error handler (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Don't log twice with the error handler

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16980, #17202
| License       | MIT
| Doc PR        |

Commits
-------

90d493e [FrameworkBundle] Don't log twice with the error handler
2016-01-19 13:12:05 +01:00
Fabien Potencier
c2333e6a26 minor #17437 [Finder] Improve the phpdoc of SplFileInfo methods (mnapoli)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17437).

Discussion
----------

[Finder] Improve the phpdoc of SplFileInfo methods

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

I **always** get confused when I need to use the finder (getFilename, getPath, getPathname, getRelativePath, getRelativePathname, …). This is only addressing the last two methods but hopefully it will help.

Commits
-------

1b170d7 Improve the phpdoc of SplFileInfo methods
2016-01-19 13:10:24 +01:00
Matthieu Napoli
1b170d7a85 Improve the phpdoc of SplFileInfo methods 2016-01-19 13:10:23 +01:00
Romain Neutron
da73125a9c [Process] Use stream based storage to avoid memory issues 2016-01-19 11:50:56 +01:00
Kévin Dunglas
85fd8754ec minor #17286 [Serializer] Refactor serializer normalize method (jvasseur)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Refactor serializer normalize method

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

The serializer normalize method contains some dead or duplicate code. This PR refactor the method to make it simpler.

I tried to keep the same Exceptions in the same situations but they could probably be simplified too. (The last case only append if you pass a ressource to the serializer.)

Commits
-------

2bb5f45 Refactor serializer normalize method
2016-01-19 09:01:47 +01:00
Fabien Potencier
02f66e2ff5 bug #17418 Fixed Bootstrap form theme form "reset" buttons (javiereguiluz)
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed Bootstrap form theme form "reset" buttons

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

All the credit for this solution goes to @AntonioAmore, who reported the error originally and provided a solution. I only confirmed the bug and verified the proposed solution.

Commits
-------

67c7f05 Fixed Bootstrap form theme form "reset" buttons
2016-01-19 08:38:18 +01:00
Fabien Potencier
18604e25f3 minor #17426 [2.7][Process] Fix typo, no arguments needed anymore (romainneutron)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Process] Fix typo, no arguments needed anymore

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

Commits
-------

7f89158 [Process] Fix typo, no arguments needed anymore
2016-01-19 08:29:04 +01:00
Nicolas Grekas
90d493ea97 [FrameworkBundle] Don't log twice with the error handler 2016-01-19 00:13:42 +01:00
Paráda József
f6fd5e47ed Remove useless is_object condition 2016-01-18 23:07:25 +01:00
Romain Neutron
7f89158a0d [Process] Fix typo, no arguments needed anymore 2016-01-18 19:47:39 +01:00
Kévin Dunglas
c56c7bf869 [Serializer] Introduce constants for context keys 2016-01-18 17:42:55 +01:00