Commit Graph

24553 Commits

Author SHA1 Message Date
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
96aaf4f42e Merge branch '2.7' into 2.8
* 2.7:
  [From] minor fix tests added by #17798 for bootstrap theme
2016-03-01 18:37:11 +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
70bb9bb27f Merge branch '2.7' into 2.8
* 2.7:
  fix debug toolbar rendering by removing inadvertently added links
  simplified code
  Allow variadic controller parameters to be resolved.
2016-03-01 18:35:28 +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
75e0509408 minor #17974 [Form] minor fix tests of Bootstrap layout (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] minor fix tests of Bootstrap layout

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

Commits
-------

fb233e2 [Form] minor fix tests of Bootstrap layout
2016-03-01 18:33:28 +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
fb233e2513 [Form] minor fix tests of Bootstrap layout 2016-03-01 14:56:55 +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
80d26a5b50 Merge branch '2.7' into 2.8
* 2.7:
  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:14 +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
eab5d30b1e bug #17876 [DependencyInjection] Fixing autowiring bug when some args are set (weaverryan)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Fixing autowiring bug when some args are set

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

This fixes #17724 & #17878.

**#17724**

I've set this against the 2.8 branch because imo it's a bug fix. The [test](https://github.com/symfony/symfony/compare/2.8...weaverryan:auto-wiring-individuals?expand=1#diff-d124c3d39cd5f7c732fb3d3be7a8cb42R298) illustrates the bug - having *some* arguments set beforehand caused auto-wired arguments to be set on the wrong index.

**#17878**

I've also included this fix just to get all the weird ordering problems taken care of at once. I don't think this is a behavior change - autowiring with scalars only worked previously if the argument was optional (still works now) or if you specified that argument explicitly (still works). Otherwise, your argument ordering would have gotten messed up.

Commits
-------

260731b minor changes
865f202 [#17878] Fixing a bug where scalar values caused invalid ordering
cf692a6 [#17724] Fixing autowiring bug where if some args are set, new ones are put in the wrong spot
2016-03-01 11:17:55 +01:00
Fabien Potencier
1a77a44d8f Merge branch '2.7' into 2.8
* 2.7:
  Improved Bootstrap form theme for hidden fields
  bumped Symfony version to 2.7.11
  updated VERSION for 2.7.10
  updated CHANGELOG for 2.7.10
2016-03-01 08:29:35 +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
bd588a3928 bug #17561 [WebProfilerBundle] Fix design issue in profiler when having errors in forms (Pierstoval)
This PR was squashed before being merged into the 2.8 branch (closes #17561).

Discussion
----------

[WebProfilerBundle] Fix design issue in profiler when having errors in forms

| 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

This error occurs mostly when having long form field names or types,

**Before:**
![before](https://cloud.githubusercontent.com/assets/3369266/12610913/89bddfd8-c4ea-11e5-9372-2b7740d8c4b3.png)

**After:**
![after](https://cloud.githubusercontent.com/assets/3369266/12610915/8ae22a4a-c4ea-11e5-94ce-9257a9409b4a.png)

That said, I don't know what to do about z-index, whether the error count prevails on the type or *vice-versa* 😕

@javiereguiluz, an idea ?

Commits
-------

76e1c0a [WebProfilerBundle] Fix design issue in profiler when having errors in forms
2016-03-01 07:14:52 +01:00
Alex Rock Ancelet
76e1c0aefb [WebProfilerBundle] Fix design issue in profiler when having errors in forms 2016-03-01 07:14:44 +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
Ryan Weaver
260731b806 minor changes 2016-02-28 19:33:45 -05:00
Ryan Weaver
865f2029fd [#17878] Fixing a bug where scalar values caused invalid ordering 2016-02-28 19:31:09 -05:00
Ryan Weaver
cf692a6bd8 [#17724] Fixing autowiring bug where if some args are set, new ones are put in the wrong spot 2016-02-28 19:31:09 -05:00
Fabien Potencier
aadaeecb47 bumped Symfony version to 2.8.4 2016-02-28 22:27:55 +01:00
Fabien Potencier
7a9a5fce7c Merge pull request #17952 from fabpot/release-2.8.3
released v2.8.3
2016-02-28 22:06:29 +01:00
Fabien Potencier
9f5c8ea99d updated VERSION for 2.8.3 2016-02-28 22:06:17 +01:00
Fabien Potencier
6ba629e9ed updated CHANGELOG for 2.8.3 2016-02-28 22:06:13 +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
4b3a534f3e Merge branch '2.7' into 2.8
* 2.7:
  fixed tests
2016-02-28 17:34:46 +01:00
Fabien Potencier
2fc80cce12 fixed tests 2016-02-28 17:34:40 +01:00
Fabien Potencier
caf2871b87 Merge branch '2.7' into 2.8
* 2.7:
  #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:20:50 +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