Commit Graph

15748 Commits

Author SHA1 Message Date
bobdenotter
b6738b60e3 Set the font-weight for links to 'normal', to prevent ugly bold links. 2013-10-19 19:10:54 +02:00
Fabien Potencier
1206176fc4 Merge branch '2.3'
* 2.3:
  [DoctrineBridge] Added type check to prevent calling clear() on arrays
  [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
  Fix docblock typo
2013-10-18 17:01:47 +02:00
Fabien Potencier
f2c6211306 bug #9335 [2.4][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty (bschussek)
This PR was merged into the master branch.

Discussion
----------

[2.4][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty

#9333 merged into master.

Commits
-------

9a8ec64 Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4
baa2356 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
408769e bug #9328 [2.3][Form] Changed FormTypeCsrfExtension to use the form's name as default intention (bschussek)
2013-10-18 17:01:02 +02:00
Fabien Potencier
60a14f6ffe Merge branch '2.2' into 2.3
* 2.2:
  [DoctrineBridge] Added type check to prevent calling clear() on arrays
  [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
  Fix docblock typo

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
2013-10-18 17:00:23 +02:00
Fabien Potencier
14a904d401 bug #9334 [2.3][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty (bschussek)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty

#9333 merged into 2.3.

Commits
-------

baa2356 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
2013-10-18 16:59:32 +02:00
Fabien Potencier
2a637b12b4 bug #9333 [2.2][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Form] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty

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

ping @stof

follow-up PR to #9327

Commits
-------

219e44d [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
2013-10-18 16:57:55 +02:00
Fabien Potencier
4dbe623903 bug #9338 [DoctrineBridge] Added type check to prevent calling clear() on arrays (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[DoctrineBridge] Added type check to prevent calling clear() on arrays

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

Commits
-------

4ff59d7 [DoctrineBridge] Added type check to prevent calling clear() on arrays
2013-10-18 16:57:09 +02:00
Fabien Potencier
f6d4bc4e5b bug #9330 [2.4][Config] Fixed namespace when dumping reference (WouterJ)
This PR was merged into the master branch.

Discussion
----------

[2.4][Config] Fixed namespace when dumping reference

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

The namespace was given to the wrong function, resulting in wrong namespaes when dumping XML.

Commits
-------

2b0b355 Fixed XML dump
2013-10-18 16:54:07 +02:00
Bernhard Schussek
4ff59d77a8 [DoctrineBridge] Added type check to prevent calling clear() on arrays 2013-10-18 16:04:39 +02:00
Bernhard Schussek
9a8ec64338 Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4
Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
2013-10-18 13:14:20 +02:00
Bernhard Schussek
baa2356859 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty 2013-10-18 13:11:42 +02:00
Bernhard Schussek
219e44d610 [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty 2013-10-18 13:07:56 +02:00
Wouter J
2b0b355544 Fixed XML dump 2013-10-18 11:29:21 +02:00
Fabien Potencier
bae30242cb minor #9311 [Csrf] component fixes (Tobion)
This PR was squashed before being merged into the master branch (closes #9311).

Discussion
----------

[Csrf] component fixes

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

- [Csrf] fixed some phpdocs
- [Csrf] fixed return types (also https://github.com/symfony/symfony/pull/9216#discussion_r6797190 )
- [Csrf] fixed test class namespaces

Commits
-------

d7eb8ff [Csrf] component fixes
2013-10-17 23:29:17 +02:00
Tobias Schultze
d7eb8ff64a [Csrf] component fixes 2013-10-17 23:29:16 +02:00
Fabien Potencier
1b97ad44e9 minor #9312 [Security] Fix docblock typo (adrienbrault)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9312).

Discussion
----------

[Security] Fix docblock typo

Commits
-------

bff65b2 [Security] Fix docblock typo
2013-10-17 23:27:39 +02:00
Adrien Brault
fd869cf295 Fix docblock typo 2013-10-17 23:27:38 +02:00
Fabien Potencier
b1a401a75d bug #9329 [2.4][Form] Changed FormTypeCsrfExtension to use the form's name as default token ID (bschussek)
This PR was merged into the master branch.

Discussion
----------

[2.4][Form] Changed FormTypeCsrfExtension to use the form's name as default token ID

Equivalent of #9327, merged into master.

Commits
-------

6400bd1 Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4
c4abe83 Merge branch 'fix-csrf-default-2.2' into fix-csrf-default-2.3
b07c618 [Form] Changed FormTypeCsrfExtension to use the form's name as default intention
2013-10-17 23:25:37 +02:00
Fabien Potencier
408769ead1 bug #9328 [2.3][Form] Changed FormTypeCsrfExtension to use the form's name as default intention (bschussek)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Form] Changed FormTypeCsrfExtension to use the form's name as default intention

Equivalent of #9327, merged into 2.3.

Commits
-------

c4abe83 Merge branch 'fix-csrf-default-2.2' into fix-csrf-default-2.3
b07c618 [Form] Changed FormTypeCsrfExtension to use the form's name as default intention
2013-10-17 23:24:37 +02:00
Fabien Potencier
04c3f25e6a bug #9327 [2.2][Form] Changed FormTypeCsrfExtension to use the form's name as default intention (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Form] Changed FormTypeCsrfExtension to use the form's name as default intention

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

Before, every form used the same "intention"/"csrf_token_id" value by default, namely "unknown". This PR fixes the default value to the form's name, which is at least different for forms with (a) explicit names and (b) different types, where the implicit name equals the type's name.

Commits
-------

b07c618 [Form] Changed FormTypeCsrfExtension to use the form's name as default intention
2013-10-17 23:23:35 +02:00
Bernhard Schussek
6400bd1d0f Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4
Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
2013-10-17 18:05:02 +02:00
Bernhard Schussek
c4abe83e9b Merge branch 'fix-csrf-default-2.2' into fix-csrf-default-2.3
Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
2013-10-17 18:01:33 +02:00
Bernhard Schussek
b07c618bf4 [Form] Changed FormTypeCsrfExtension to use the form's name as default intention 2013-10-17 17:52:50 +02:00
Fabien Potencier
34103c1d7a Merge branch '2.3'
* 2.3:
  Improve documentation of X-Forwarded-For header handling
  [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays
  Removed unused use statements.
  Make usleep longer and simplify assertions
  Added japanese translation resource for security component.
  Replaced the @inheritdoc with an actual list of params since the original method has a different signature.
  fix typo : StdClass should be stdClass with little "s"
  Remove unnecessary continue from Request
  [Yaml] Fixed the escaping of strings starting with a dash when dumping
  Fix in ChainLoader.php
  fixed wrong started states
2013-10-17 13:48:11 +02:00
Fabien Potencier
8e21cac9e1 Merge branch '2.2' into 2.3
* 2.2:
  [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays
  Removed unused use statements.
  Make usleep longer and simplify assertions
  Added japanese translation resource for security component.
  [Yaml] Fixed the escaping of strings starting with a dash when dumping
  Fix in ChainLoader.php
  fixed wrong started states
2013-10-17 13:48:01 +02:00
Fabien Potencier
6e5adffe3b bug #9316 [WebProfilerBundle] Fixed invalid condition in form panel (bschussek)
This PR was merged into the master branch.

Discussion
----------

[WebProfilerBundle] Fixed invalid condition in form panel

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

Before, the children of a form with just one child were not shown. This is fixed now.

Commits
-------

f21de87 [WebProfilerBundle] Fixed invalid condition in form panel
2013-10-17 13:19:34 +02:00
Bernhard Schussek
f21de874fc [WebProfilerBundle] Fixed invalid condition in form panel 2013-10-17 13:05:00 +02:00
Fabien Potencier
4c164ca0ca Revert "minor #9269 [Console] make InputArgument::setDefault() chainable (pscheit)"
This reverts commit ab7bf648cc, reversing
changes made to 5b6ef23196.
2013-10-16 18:16:10 +02:00
Fabien Potencier
514fabd01d Revert "fixed CS"
This reverts commit 39c9c1266e.
2013-10-16 18:16:05 +02:00
Fabien Potencier
9329bfb218 minor #9247 [HttpKernel] Improve documentation of X-Forwarded-For header handling (samuelvogel)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9247).

Discussion
----------

[HttpKernel] Improve documentation of X-Forwarded-For header handling

After having problems with the handling of `X-Forwarded-For` headers and the configuration of trusted proxies, it was really hard to understand how the algorithm actually works. After looking into it, the PHPDoc of `IpUtils` did not really describe what the methods do. For `Request::getClientIps()` the PHPDoc actually explained how the `X-Forwarded-For` header works with multiple proxies, but it's really hard to understand, when it's not mentioned what the text is actually talking about. As one would expect a description of what the method does, I altered the description to describe the return value.

Feel free not to merge the inline comments in `Request::getClientIps()`, even though they greatly help understanding this method for somebody not deeply familiar with the internals of `HttpKernel` and HTTP proxy handling in general.

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

Commits
-------

1f786e0 [HttpKernel] Improve documentation of X-Forwarded-For header handling
2013-10-16 17:16:00 +02:00
Samuel Vogel
0d232ba2f2 Improve documentation of X-Forwarded-For header handling 2013-10-16 17:16:00 +02:00
Fabien Potencier
39c9c1266e fixed CS 2013-10-16 16:56:32 +02:00
Fabien Potencier
ab7bf648cc minor #9269 [Console] make InputArgument::setDefault() chainable (pscheit)
This PR was merged into the master branch.

Discussion
----------

[Console] make InputArgument::setDefault() chainable

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

To allow chaining of methods, setDefault should return the InputArgument. I'm not quite sure if you would tread this as a BC break?

best regards
Philipp

Commits
-------

7b7a4c1 [Console] make InputArgument::setDefault() chainable
2013-10-16 16:56:21 +02:00
Fabien Potencier
0080399b7d bug #9308 [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays

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

Previously, writing an association getter like this was impossible:

```php
public function addTag(Tag $tag) { ... }
public function removeTag(Tag $tag) { ... }

public function getTags()
{
    return $this->tags->toArray();
}
```

Using `toArray()` is a useful way to restrict modifications of the collection to the specified methods. But previously, CollectionToArrayTransformer failed in this case, because it did not accept arrays as input.

Commits
-------

55001ab [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays
2013-10-16 16:55:16 +02:00
Fabien Potencier
5b6ef23196 bug #9297 [Form] Add missing use in form renderer (egeloen)
This PR was merged into the master branch.

Discussion
----------

[Form] Add missing use in form renderer

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

Commits
-------

7686867 [Form] Add missing use in form renderer
2013-10-16 16:53:26 +02:00
Fabien Potencier
64b9381002 minor #9305 Removed dead code (unused use statements). (hhamon)
This PR was merged into the master branch.

Discussion
----------

Removed dead code (unused use statements).

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

Commits
-------

eced94b Removed dead code (unused use statements).
2013-10-16 16:52:55 +02:00
Fabien Potencier
3e684b4d4f minor #9304 Dead code v2.2 (hhamon)
This PR was merged into the 2.2 branch.

Discussion
----------

Dead code v2.2

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

Commits
-------

0946be6 Removed unused use statements.
2013-10-16 16:51:43 +02:00
Fabien Potencier
bf069e0fa8 bug #9309 [Routing] Fixed unresolved class (francoispluchino)
This PR was merged into the master branch.

Discussion
----------

[Routing] Fixed unresolved class

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

Commits
-------

d3079ee Fix unresolved class
2013-10-16 16:51:22 +02:00
François Pluchino
d3079ee559 Fix unresolved class 2013-10-16 16:40:12 +02:00
Bernhard Schussek
55001abd1a [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays 2013-10-16 16:40:09 +02:00
Hugo Hamon
0946be6c5b Removed unused use statements. 2013-10-16 14:19:20 +02:00
Hugo Hamon
eced94b7b9 Removed dead code (unused use statements). 2013-10-16 13:59:56 +02:00
Eric GELOEN
7686867b2c [Form] Add missing use in form renderer 2013-10-15 22:21:24 +02:00
Fabien Potencier
729b41f7af minor #9276 [Stopwatch] Fix tests on Travis (also vagrant) (brikou)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9276).

Discussion
----------

[Stopwatch] Fix tests on Travis (also vagrant)

Travis often fails to run tests related to the Stopwatch Component, check it yourself:

- https://travis-ci.org/symfony/symfony/jobs/12340378
- https://travis-ci.org/symfony/symfony/jobs/12365787
- https://travis-ci.org/symfony/symfony/jobs/12365790
- https://travis-ci.org/symfony/symfony/jobs/12367771
- https://travis-ci.org/symfony/symfony/jobs/12367844
- https://travis-ci.org/symfony/symfony/jobs/12368619
- https://travis-ci.org/symfony/symfony/jobs/12371316
- https://travis-ci.org/symfony/symfony/jobs/12375730

This is because Travis is just slow as hell. So I just multiply the used usleep by 10.

Commits
-------

bf65483 Make usleep longer and simplify assertions
2013-10-15 18:59:36 +02:00
Brikou Carré
beae3b1a8b Make usleep longer and simplify assertions 2013-10-15 18:59:35 +02:00
Fabien Potencier
879305e104 minor #9283 [Security] Added japanese translation resource for security component. (hidenorigoto)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9283).

Discussion
----------

[Security] Added japanese translation resource for security component.

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

Commits
-------

4176cf1 Added japanese translation resource for security component.
2013-10-15 18:57:17 +02:00
hidenorigoto
26e50fff97 Added japanese translation resource for security component. 2013-10-15 18:57:17 +02:00
Fabien Potencier
9ed5608abe minor #9293 [HttpFoundation] Docblock fix (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Docblock fix

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

`BinaryFileResponse::create()` has a different signature than `Response::create()` and cannot inherit its doc. I also fixed indentation in other blocks in this file.

Commits
-------

bb8930c Replaced the @inheritdoc with an actual list of params since the original method has a different signature.
2013-10-15 18:56:08 +02:00
Jakub Zalas
bb8930c4da Replaced the @inheritdoc with an actual list of params since the original method has a different signature.
Also, fixed indentation in other docblocks.
2013-10-15 11:16:18 +01:00
Fabien Potencier
90b483aa44 minor #9288 fix typo : StdClass should be stdClass with little "s" (samsonasik)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9288).

Discussion
----------

fix typo : StdClass should be stdClass with little "s"

Commits
-------

febd1d8 fix typo : StdClass should be stdClass with little "s"
2013-10-13 08:32:10 +02:00