Commit Graph

23205 Commits

Author SHA1 Message Date
Fabien Potencier
d6a189b405 bug #16886 [Form] [ChoiceType] Prefer placeholder to empty_value (boite)
This PR was squashed before being merged into the 2.7 branch (closes #16886).

Discussion
----------

[Form] [ChoiceType] Prefer placeholder to empty_value

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

Prefer an explicitly set `placeholder` option (i.e. `false` or a non-empty
string) to an `empty_value` option when both are set.

The fix is to change the behaviour in the placeholder normalizer in
ChoiceType::configureOptions so that the value of the `empty_value` option is
used for placeholder only when the value of `placeholder` is null or an empty
string.

Commits
-------

a4d4c8a [Form] [ChoiceType] Prefer placeholder to empty_value
2016-03-02 10:54:50 +01:00
boite
a4d4c8aa0f [Form] [ChoiceType] Prefer placeholder to empty_value 2016-03-02 10:54:49 +01:00
Fabien Potencier
b5a3a56da5 minor #17982 [HttpFoundation] Add missing RFC comment (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Add missing RFC comment

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

See https://tools.ietf.org/html/rfc7725

Commits
-------

7901307 Add missing RFC comment
2016-03-02 01:38:34 +01:00
Diego Saint Esteben
79013072f3 Add missing RFC comment 2016-03-01 21:02:26 -03:00
Christian Flothmann
3464282bd1 ensure dump indentation to be greather than zero 2016-03-01 21:23:51 +01:00
Fabien Potencier
7c3e4cf181 minor #17973 [From] minor fix tests added by #17798 for bootstrap theme (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[From] minor fix tests added by #17798 for bootstrap theme

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

Commits
-------

ee5b119 [From] minor fix tests added by #17798 for bootstrap theme
2016-03-01 18:36:56 +01:00
Fabien Potencier
c6b68924a0 Merge branch '2.3' into 2.7
* 2.3:
  fix debug toolbar rendering by removing inadvertently added links
  simplified code
  Allow variadic controller parameters to be resolved.
2016-03-01 18:34:38 +01:00
Fabien Potencier
17e8780750 bug #17976 [2.3][WebProfilerBundle] fix debug toolbar rendering by removing inadvertently added links (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][WebProfilerBundle] fix debug toolbar rendering by removing inadvertently added links

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

The debug toolbar was broken by #17527...

**before**
![debug-toolbar-link-a](https://cloud.githubusercontent.com/assets/800119/13433728/7c48c382-dfd3-11e5-8432-299bfa143647.png)

**and after**
![debug-toolbar-link-b](https://cloud.githubusercontent.com/assets/800119/13433732/7fd97dc0-dfd3-11e5-80c6-62c009447a2e.png)

**explanation**
If `false` is explicitly passed for `link` then `link | default(true)` would evaluate to `true`, which is not what we want. The correct expression `link is not defined or link` was suggested originally in #16653.

Commits
-------

a0ddfc4 fix debug toolbar rendering by removing inadvertently added links
2016-03-01 18:34:19 +01:00
Fabien Potencier
94a8736b73 bug #17971 Variadic controller params (NiR-, fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Variadic controller params

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

Commits
-------

bedcb15 simplified code
f39afc8 Allow variadic controller parameters to be resolved.
2016-03-01 18:32:21 +01:00
Christian Raue
a0ddfc4246 fix debug toolbar rendering by removing inadvertently added links 2016-03-01 17:26:04 +01:00
Javier Eguiluz
0134d76785 Simplified everything 2016-03-01 15:47:09 +01:00
Jules Pietri
ee5b119ac6 [From] minor fix tests added by #17798 for bootstrap theme 2016-03-01 14:36:27 +01:00
Fabien Potencier
bedcb151b8 simplified code 2016-03-01 12:09:54 +01:00
Albin Kerouaton
f39afc85db Allow variadic controller parameters to be resolved. 2016-03-01 12:09:54 +01:00
Fabien Potencier
41112c9ee9 Merge branch '2.3' into 2.7
* 2.3:
  fixed issue with PHP 5.3
  The WebProcessor now forwards the client IP
  bumped Symfony version to 2.3.39
  updated VERSION for 2.3.38
  update CONTRIBUTORS for 2.3.38
  updated CHANGELOG for 2.3.38
2016-03-01 12:09:07 +01:00
Fabien Potencier
2a811427c0 fixed issue with PHP 5.3 2016-03-01 12:08:40 +01:00
Fabien Potencier
df4cc40082 bug #17568 Improved Bootstrap form theme for hidden fields (javiereguiluz)
This PR was squashed before being merged into the 2.7 branch (closes #17568).

Discussion
----------

Improved Bootstrap form theme for hidden fields

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

Commits
-------

ba5d7f9 Improved Bootstrap form theme for hidden fields
2016-03-01 08:14:37 +01:00
Javier Eguiluz
ba5d7f99e9 Improved Bootstrap form theme for hidden fields 2016-03-01 08:14:36 +01:00
Fabien Potencier
afa4d524c2 bug #17925 [Bridge] The WebProcessor now forwards the client IP (magnetik)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17925).

Discussion
----------

[Bridge] The WebProcessor now forwards the client IP

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

Commits
-------

e740852 The WebProcessor now forwards the client IP
2016-02-29 17:22:24 +01:00
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