Commit Graph

23236 Commits

Author SHA1 Message Date
Baptiste Lafontaine e740852937 The WebProcessor now forwards the client IP 2016-02-29 17:22:23 +01:00
Fabien Potencier cc198dfff1 bumped Symfony version to 2.7.11 2016-02-28 22:00:57 +01:00
Fabien Potencier 9a3b6bf6eb Merge pull request #17951 from fabpot/release-2.7.10
released v2.7.10
2016-02-28 21:37:19 +01:00
Fabien Potencier e23be1c90c updated VERSION for 2.7.10 2016-02-28 21:37:08 +01:00
Fabien Potencier 170492dd5e updated CHANGELOG for 2.7.10 2016-02-28 21:36:59 +01:00
Fabien Potencier baf35cf3c0 bumped Symfony version to 2.3.39 2016-02-28 20:26:02 +01:00
Fabien Potencier c51503db3f Merge pull request #17950 from fabpot/release-2.3.38
released v2.3.38
2016-02-28 19:24:22 +01:00
Fabien Potencier 84203be720 updated VERSION for 2.3.38 2016-02-28 19:24:04 +01:00
Fabien Potencier 478c49a8aa update CONTRIBUTORS for 2.3.38 2016-02-28 19:23:38 +01:00
Fabien Potencier 78f4e00140 updated CHANGELOG for 2.3.38 2016-02-28 19:23:16 +01:00
Fabien Potencier 2fc80cce12 fixed tests 2016-02-28 17:34:40 +01:00
Fabien Potencier 51a71ab74a Merge branch '2.3' into 2.7
* 2.3:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header
2016-02-28 17:19:47 +01:00
Fabien Potencier fe4362cf39 bug #17947 Fix - #17676 (backport #17919 to 2.3) (Ocramius)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix - #17676 (backport #17919 to 2.3)

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

This is a backport of #17919

Commits
-------

0c6400a  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
2016-02-28 17:10:13 +01:00
Marco Pivetta 0c6400a428 #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features 2016-02-28 10:53:30 -05:00
Fabien Potencier 85c4b06211 bug #17942 Fix bug when using an private aliased factory service (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #17942).

Discussion
----------

Fix bug when using an private aliased factory service

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

/cc @xabbuh

Commits
-------

de406c0 Fix bug when using an private aliased factory service
2016-02-28 16:06:54 +01:00
WouterJ de406c0e38 Fix bug when using an private aliased factory service 2016-02-28 16:06:53 +01:00
Fabien Potencier b630ac733b bug #17798 [2.7] [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType

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

- [x] Make tests pass
- [x] Adress a doc PR
- [x] Replace alias by FQCN in tests for 2.8, see #17890
- [x] Remove `choices_as_values` in tests for 3.0, see #17891

Commits
-------

017e1d9 bug #17798 [Form] allow `choice_label` option to be `false`
2016-02-28 15:58:25 +01:00
Fabien Potencier 0ca4ec2b2f minor #17916 Update contributing docs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Update contributing docs

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

I propose adding the branch to the pull request template so that submitters have some hint about the branch selection workflow, and so that we can edit it for mergers.

I'd also like to add a link to the "running tests" doc, which made me rewrite the full contributing file, with links to the sections of the contributing documentation.

Commits
-------

852f999 Update contributing docs
2016-02-28 11:04:35 +01:00
Jules Pietri 017e1d9e6e bug #17798 [Form] allow `choice_label` option to be `false`
When `ChoiceType`is expanded, `choice_label` option can be `false`
or return `false` for one or more choices by a callable.
2016-02-26 16:42:52 +01:00
Fabien Potencier 22383987e0 minor #17929 [Security] added some tests (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] added some 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
-------

7aec568 [Security] added some tests
2016-02-26 07:04:58 +01:00
Fabien Potencier 7aec568c05 [Security] added some tests 2016-02-26 07:03:43 +01:00
Fabien Potencier d0cac39932 bug #17542 ChoiceFormField of type "select" could be "disabled" (bouland)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17542).

Discussion
----------

ChoiceFormField of type "select" could be "disabled"

Hi,

New PR to add tests from the closed PR #15952

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

Commits
-------

576c4b9 ChoiceFormField of type "select" could be "disabled"
2016-02-26 06:48:23 +01:00
Simon Bouland 576c4b9b42 ChoiceFormField of type "select" could be "disabled" 2016-02-26 06:48:23 +01:00
Fabien Potencier be30748bc9 bug #17602 [HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header (bburnichon)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header

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

Commits
-------

aaad5bd Add check on If-Range header
2016-02-26 06:44:02 +01:00
Fabien Potencier 8ae5dc35f5 minor #17889 [ci] clone with depth=1 to kill push-forced PRs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] clone with depth=1 to kill push-forced PRs

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

As documented in https://github.com/travis-ci/travis-ci/issues/4575#issuecomment-125200308, setting a clone depth of 1 will make push-forced PRs to fail quickly so that our CI won't spend too much time on them.

Commits
-------

562d4d6 [ci] clone with depth=1 to kill push-forced PRs
2016-02-26 06:14:49 +01:00
Fabien Potencier a7f98315f3 bug #17760 [2.7] [Form] fix choice value "false" in ChoiceType (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [Form] fix choice value "false" in ChoiceType

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

- [x] Add tests for choices with `boolean` and `null` values, and with a placeholder
- [x] Fix FQCN in 2.8 tests, see #17759
- [x] Remove `choices_as_values` in 3.0 tests, see #17886

Commits
-------

8f918e5 [Form] refactor `RadioListMapper::mapDataToForm()`
3eac469 [Form] fix choice value "false" in ChoiceType
2016-02-26 06:04:56 +01:00
Fabien Potencier 3961412310 bug #17914 [Console] Fix escaping of trailing backslashes (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fix escaping of trailing backslashes

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

Commits
-------

44ae785 [Console] Fix escaping of trailing backslashes
2016-02-26 05:56:43 +01:00
Nicolas Grekas 852f9994ad Update contributing docs 2016-02-24 15:36:06 +01:00
Nicolas Grekas 44ae785064 [Console] Fix escaping of trailing backslashes 2016-02-24 15:09:34 +01:00
Fabien Potencier a7fee1244e bug #17074 Fix constraint validator alias being required (Triiistan)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17074).

Discussion
----------

Fix constraint validator alias being required

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

This is my first contribution, so everything might not be in perfect order.

Follow-up of #16841 on the right branch.

Commits
-------

5136c30 Fix constraint validator alias being required
2016-02-23 21:06:57 +01:00
Tristan Roussel 5136c308f2 Fix constraint validator alias being required 2016-02-23 21:06:57 +01:00
Fabien Potencier 40e5f78acc minor #17909 [DependencyInjection] fix tests (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] fix tests

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

Commits
-------

0de2107 [DependencyInjection] fix tests
2016-02-23 21:05:53 +01:00
Christian Flothmann 0de21071c3 [DependencyInjection] fix tests 2016-02-23 20:37:29 +01:00
Fabien Potencier 6190058d5b bug #17866 [DependencyInjection] replace alias in factories (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] replace alias in factories

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

Commits
-------

b43b79b [DependencyInjection] replace alias in factories
2016-02-23 19:20:19 +01:00
Fabien Potencier 6bb1c6d737 Merge branch '2.3' into 2.7
* 2.3:
  Validate XLIFF translation files
  replace alias in factory services
2016-02-23 19:18:09 +01:00
Fabien Potencier 4b33fd3d45 bug #17867 [DependencyInjection] replace alias in factory services (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] replace alias in factory services

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

Commits
-------

56f8798 replace alias in factory services
2016-02-23 19:17:24 +01:00
Fabien Potencier 0807ff77d0 minor #17903 Validate XLIFF translation files (javiereguiluz)
This PR was squashed before being merged into the 2.3 branch (closes #17903).

Discussion
----------

Validate XLIFF translation files

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

In #17902 @stof proposed to add a simple test to validate `.xlf` files (to avoid issues like #17893).

This is a proposal for that test. My questions:

**1)** Do you agree displaying detailed error messages when the XML is not valid. Example output for the #17893 error:

![error_log](https://cloud.githubusercontent.com/assets/73419/13250664/932d2f14-da2b-11e5-8ea0-ecb43f58feea.png)

Or is it enough displaying just the PHPUnit error message and let the user figure out the details?

![simple_error](https://cloud.githubusercontent.com/assets/73419/13250671/a3b4bfd2-da2b-11e5-9277-454d0dd160b2.png)

**2)** How do I validate the translation files of the Security and Form components? Do I just copy+paste this test in those components?

Commits
-------

db03055 Validate XLIFF translation files
2016-02-23 19:12:36 +01:00
Javier Eguiluz db0305569d Validate XLIFF translation files 2016-02-23 19:12:35 +01:00
Fabien Potencier b537bf1ced fixed typo 2016-02-23 16:11:23 +01:00
Fabien Potencier a91a9e5886 Merge branch '2.3' into 2.7
* 2.3:
  fixed typo
2016-02-23 16:11:10 +01:00
Fabien Potencier 5f08b45430 fixed typo 2016-02-23 16:09:32 +01:00
Nicolas Grekas 4b41b079f0 Merge branch '2.3' into 2.7
* 2.3:
  Fixed a minor XML issue in a translation file
2016-02-23 13:13:02 +01:00
Nicolas Grekas 4c304218b2 minor #17902 Fixed a minor XML issue in a translation file (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed a minor XML issue in a translation file

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

Commits
-------

3135742 Fixed a minor XML issue in a translation file
2016-02-23 13:12:09 +01:00
Javier Eguiluz 3135742c94 Fixed a minor XML issue in a translation file 2016-02-23 11:57:32 +01:00
Nicolas Grekas b58b3a83e5 Fix merge 2016-02-23 08:38:51 +01:00
Christian Flothmann b43b79bd71 [DependencyInjection] replace alias in factories 2016-02-22 18:00:41 +01:00
Nicolas Grekas fd827b3366 Fix merge 2016-02-22 17:41:31 +01:00
Nicolas Grekas ba35f3d7bb Merge branch '2.3' into 2.7
* 2.3:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
	src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
2016-02-22 17:12:29 +01:00
Nicolas Grekas 562d4d6ce0 [ci] clone with depth=1 to kill push-forced PRs 2016-02-22 17:04:21 +01:00
Jules Pietri 8f918e5f84 [Form] refactor `RadioListMapper::mapDataToForm()`
This fixes "false" choice pre selection when `ChoiceType`
is `expanded` and not `multiple`
2016-02-22 16:33:26 +01:00