Commit Graph

21509 Commits

Author SHA1 Message Date
Fabien Potencier 99f3475a2a Merge branch '2.6' into 2.7
* 2.6:
  [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
  bumped Symfony version to 2.6.11
  updated VERSION for 2.6.10
  updated CHANGELOG for 2.6.10
  [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
2015-07-16 14:21:55 +02:00
Fabien Potencier dcb0255b35 bug #15291 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3

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

Commits
-------

1adb065 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
2015-07-16 14:05:57 +02:00
Nicolas Grekas 1adb065d70 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 2015-07-16 10:44:13 +02:00
Fabien Potencier caba8f4cf1 minor #15280 [Console] Set QuestionHelper max attempts in tests (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Set QuestionHelper max attempts in tests

Otherwise the process will block if a test fails.

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

QuestionHelper tests will block the phpunit process if any of tests fails. This is what's currently happening on 2.8 branch. As soon as this is merged to 2.7 and 2.8, I can work on fixing 2.8 tests.

re #14638

Commits
-------

23bc264 [Console] Set QuestionHelper max attempts in tests
2015-07-16 01:18:05 +02:00
Fabien Potencier be4f2d5b24 bug #15277 [Form] Fix a BC break in the entity (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix a BC break in the entity

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

@webmozart this brings back the old behaviour. Attached test case passes on 2.3 with no code modifications.

Code [here](73bbaa6cc7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php (L199-L206)) promises any integer number can be handled with `createChoiceName()`:

```php
            // If the object has a single-column, numeric ID, use that ID as
            // field name. We can only use numeric IDs as names, as we cannot
            // guarantee that a non-numeric ID contains a valid form name
            if ($idReader->isIntId()) {
                return array(__CLASS__, 'createChoiceName');
            }
            // Otherwise, an incrementing integer is used as name automatically
```

While `createChoiceName()` can only handle natural numbers.

Commits
-------

03642b8 [Form] Fix a BC break in the entity
2015-07-16 01:16:36 +02:00
Jakub Zalas 23bc2649ba [Console] Set QuestionHelper max attempts in tests
Otherwise the process will block if a test fails.
2015-07-15 08:34:36 +01:00
Jakub Zalas 03642b8ffe [Form] Fix a BC break in the entity 2015-07-14 19:21:52 +01:00
Fabien Potencier bb54d8ce33 bug #15271 fix broken ChoiceQuestion (sstok)
This PR was merged into the 2.7 branch.

Discussion
----------

fix broken ChoiceQuestion

|Q            |A  |
|---          |---|
|Bug Fix?     |yes|
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |yes|
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |

Commit 175af7f3ac (diff-e1d5cef4b49c9c530f50aae153f6a541) seems to have introduced an unnoticed bug. QuestionHelperTest hangs the tests (due to throwing an undefined index exception internally).

Its a bit strange why this happend but it seems somehow Git messed-up the patch somewhere during the process. The broken commit only exists in the commit and not in any downstream branches.

Commits
-------

3fcf61e fix broken ChoiceQuestion
2015-07-14 17:28:36 +02:00
Sebastiaan Stok 3fcf61e664 fix broken ChoiceQuestion 2015-07-14 11:47:38 +02:00
Fabien Potencier 7783573d16 bug #15250 [PropertyAccess] BC Break since 2.6.5 (Nicolas Macherey)
This PR was merged into the 2.6 branch.

Discussion
----------

[PropertyAccess] BC Break since 2.6.5

setValue & isWratable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)

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

This merge request fixes the following cases taht was working with version previous to 2.6.5:

A class with a property myArray which can be a multi dimensional array can now be accesed using myArray[foo][bar][baz]
Previously only myArray[foo] was working the break is since commit e3e4695

Commits
-------

1dcca1a [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
2015-07-14 08:51:41 +02:00
Fabien Potencier 095bfd61ca bumped Symfony version to 2.7.3 2015-07-13 22:39:19 +02:00
Fabien Potencier 969d709ad4 updated VERSION for 2.7.2 2015-07-13 21:27:49 +02:00
Fabien Potencier e816d28a06 updated CHANGELOG for 2.7.2 2015-07-13 20:24:43 +02:00
Fabien Potencier 1e668dd805 bumped Symfony version to 2.6.11 2015-07-13 11:49:29 +02:00
Fabien Potencier e246af5f3b updated VERSION for 2.6.10 2015-07-13 11:34:32 +02:00
Fabien Potencier 524ccac97c updated CHANGELOG for 2.6.10 2015-07-13 11:34:21 +02:00
Fabien Potencier 0165636c89 Merge branch '2.6' into 2.7
* 2.6:
  fixed tests
  fixed some tests
  Remove excess whitespace
2015-07-13 11:09:54 +02:00
Fabien Potencier c57c3f5479 fixed tests 2015-07-13 11:09:47 +02:00
Fabien Potencier 0a2ac57b08 Merge branch '2.3' into 2.6
* 2.3:
  fixed some tests
  Remove excess whitespace
2015-07-13 11:09:24 +02:00
Fabien Potencier 88a2b562fe fixed some tests 2015-07-13 11:08:56 +02:00
Fabien Potencier b4e5fbe9e3 minor #15252 [Form] Remove excess whitespace (aivus)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Remove excess whitespace

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

Commits
-------

b1b52ad Remove excess whitespace
2015-07-13 10:58:34 +02:00
Nicolas Macherey 1dcca1a8df [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This merge request fixes the following cases taht was working with version previous to 2.6.5:

A class with a property myArray which can be a multi dimensional array can now be accesed using myArray[foo][bar][baz]
Previously only myArray[foo] was working. The break is since commit e3e4695

This commit adds additionnal testing, and is rebased from 2.6 upstream
2015-07-10 06:45:33 +02:00
Ilya Antipenko b1b52ada41 Remove excess whitespace 2015-07-09 21:38:49 +03:00
Fabien Potencier c104bc291a fixed merge 2015-07-09 18:32:09 +02:00
Fabien Potencier 175af7f3ac Merge branch '2.6' into 2.7
* 2.6:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [2.6] Static Code Analysis for Components and Bundles
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  Remove duplicate example
  Remove var not used due to returning early (introduced in 8982c32)
  Enhance hhvm test skip message
2015-07-09 18:07:40 +02:00
Fabien Potencier e6cc4918bf Merge branch '2.3' into 2.6
* 2.3:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  Remove var not used due to returning early (introduced in 8982c32)
  Enhance hhvm test skip message
2015-07-09 18:02:48 +02:00
Fabien Potencier 86c6128f45 bug #15248 Added 'default' color (jaytaph)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #15248).

Discussion
----------

Added 'default' color

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

Adding a "default" ansi color which corresponds to 39 and 49.

Commits
-------

c4bf2e6 Added 'default' color
2015-07-09 17:58:59 +02:00
Joshua Thijssen c4bf2e637c Added 'default' color 2015-07-09 17:58:42 +02:00
Fabien Potencier 5ec123fc60 bug #15243 Reload the session after regenerating its id (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

Reload the session after regenerating its id

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

This is a fix preventing [a PHP bug](https://bugs.php.net/bug.php?id=70013), which I'm not sure when or IF is going to be fixed.

Commits
-------

99b9c78 [HttpFoundation] Reload the session after regenerating its id
eda5cb1 [HttpFoundation] Add a test case to confirm a bug in session migration
2015-07-09 09:11:26 +02:00
Jakub Zalas 99b9c78b00 [HttpFoundation] Reload the session after regenerating its id 2015-07-08 20:32:24 +01:00
Jakub Zalas eda5cb1c27 [HttpFoundation] Add a test case to confirm a bug in session migration 2015-07-08 20:31:33 +01:00
Fabien Potencier b2fddecde9 bug #15176 [Serializer] Fix ClassMetadata::sleep() (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #15176).

Discussion
----------

[Serializer] Fix ClassMetadata::sleep()

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

Fix a bug with the `sleep()` method. It is blocking under when using the APC metadata cache.

Commits
-------

2f42801 [Serializer] Fix ClassMetadata::sleep()
2015-07-08 08:12:51 +02:00
Kévin Dunglas 2f4280110d [Serializer] Fix ClassMetadata::sleep() 2015-07-08 08:12:45 +02:00
Fabien Potencier 6f8a37cbae bug #15202 [Security] allow to use `method` in XML configs (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] allow to use `method` in XML configs

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

Before this change, you always had to use the `methods` key which is
inconsistent compared to other options like `roles` and `ips` for which
it was possible to use their singular versions.

Commits
-------

9b0dfd4 [Security] allow to use `method` in XML configs
2015-07-08 08:08:04 +02:00
Fabien Potencier ecd8bd9add bug #15218 [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig (MatTheCat)
This PR was merged into the 2.6 branch.

Discussion
----------

[Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig

| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT

The fact `bootstrap_3_horizontal_layout.html.twig` **extends** `bootstrap_3_layout.html.twig` prevent to `use` it while using `{% form_theme form _self %}`.

As form templates don't have any code outside blocks this PR shouldn't induce any BC break.

Commits
-------

15886b6 [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
2015-07-08 08:01:46 +02:00
Fabien Potencier 69fcfa6e6e minor #15226 [2.6] Static Code Analysis for Components and Bundles (kalessil)
This PR was squashed before being merged into the 2.6 branch (closes #15226).

Discussion
----------

[2.6] Static Code Analysis for Components and Bundles

| 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

Static Code Analysis with Php Inspections (EA Extended):
    - all rules accepted into 2.3

Commits
-------

1dac127 [2.6] Static Code Analysis for Components and Bundles
2015-07-08 07:59:50 +02:00
Vladimir Reznichenko 1dac1277a3 [2.6] Static Code Analysis for Components and Bundles 2015-07-08 07:59:48 +02:00
Fabien Potencier 63e02b87af bug #15223 [Finder] Command::addAtIndex() fails with Command instance argument (thunderer)
This PR was squashed before being merged into the 2.3 branch (closes #15223).

Discussion
----------

[Finder] Command::addAtIndex() fails with Command instance argument

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

Fixed reported bug #14384 and added test case for it. This is a second PR as previous #14385 went bad after I failed to rebase 2.3 branch properly.

Commits
-------

2aff566 [Finder] Command::addAtIndex() fails with Command instance argument
2015-07-08 07:54:33 +02:00
Tomasz Kowalczyk 2aff5660b2 [Finder] Command::addAtIndex() fails with Command instance argument 2015-07-08 07:54:32 +02:00
Fabien Potencier e67249e4d5 bug #15220 [DependencyInjection] Freeze also FrozenParameterBag::remove (lyrixx)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Freeze also FrozenParameterBag::remove

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

Commits
-------

4a72c44 [DependencyInjection] Freeze also FrozenParameterBag::remove
2015-07-07 20:27:32 +02:00
Grégoire Pineau 4a72c441d5 [DependencyInjection] Freeze also FrozenParameterBag::remove 2015-07-07 14:38:28 +02:00
MatTheCat 15886b618e [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig 2015-07-07 14:03:46 +02:00
Fabien Potencier 4706a90e9d minor #15204 CS fixes for 2.3 (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS fixes for 2.3

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

To keep fabbot.io happy ;)

Commits
-------

464b67e fix CS
2015-07-07 09:31:08 +02:00
Dariusz Ruminski 464b67ed09 fix CS 2015-07-05 16:01:47 +02:00
Fabien Potencier e3b225f4ba fixed CS 2015-07-05 15:20:07 +02:00
Fabien Potencier 9608bf508a bug #15110 Add a way to reset the singleton (dawehner)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15110).

Discussion
----------

Add a way to reset the singleton

## Problem
The mime type guesser is a singleton, which as we know, causes all kind of problems.
One problem Drupal ran into is the problem that for tests we continuesly registered more and more mimetype guessers,
once everytime we rebuild the container as part of your testing.

Once that we had that, with enough test functions + made one of the mimetype guessers as proxy, we ran into a memory leak
of storing the container as part of the mime type singleton.

See https://www.drupal.org/node/2408371

## Solution
Allow to reset the singleton.

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

Commits
-------

0096266 Add a way to reset the singleton
2015-07-05 15:17:51 +02:00
Daniel Wehner 0096266009 Add a way to reset the singleton 2015-07-05 15:17:51 +02:00
Christian Flothmann 9b0dfd4267 [Security] allow to use `method` in XML configs
Before this change, you always had to use the `methods` key which is
inconsistent compared to other options like `roles` and `ips` for which
it was possible to use their singular versions.
2015-07-05 10:40:49 +02:00
Fabien Potencier 5d2cc19fcc bug #15183 [TwigBridge] fix for legacy asset() with EmptyVersionStrategy (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] fix for legacy asset() with EmptyVersionStrategy

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

Commits
-------

cf86a03 fix for legacy asset() with EmptyVersionStrategy
2015-07-04 13:07:22 +02:00
Fabien Potencier aea7f98107 minor #15193 [Serializer] Fix Groups tests. (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix Groups tests.

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

2bd8fb8 [Serializer] Fix Groups tests.
2015-07-04 12:13:01 +02:00