Commit Graph

15590 Commits

Author SHA1 Message Date
Fabien Potencier
cac4aaa4ee bug #9416 fixed issue with clone now the children of the original form are preserved and the clone form is given new children (yjv)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed issue with clone now the children of the original form are preserved and the clone form is given new children

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

Commits
-------

b952bcb fixed issue with clone now the children of the original form are preserved and the clone form is given new children
2013-10-31 16:59:00 +01:00
Fabien Potencier
81ceee5f9a minor #9425 [Form] fix and unify phpdoc (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fix and unify phpdoc

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

- Fixes FormTypeGuesserInterface that must return ValueGuess for guessRequired etc. instead of abstract Guess because its excepted for example by FormFactory.
- Unify array typehints that was not done consistently.

Commits
-------

7a754c3 [Form] fix and unify phpdoc
2013-10-31 16:57:44 +01:00
Fabien Potencier
143af6d626 minor #9370 [FrameworkBundle] add test for #5135 and simplify routing container parameter resolution (Tobion)
This PR was merged into the 2.2 branch.

Discussion
----------

[FrameworkBundle] add test for #5135 and simplify routing container parameter resolution

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixes   | #5135
| Tests pass?   | yes
| license?      | MIT

1. [FrameworkBundle] added working test case for issue #5135
2. [FrameworkBundle] fix routing container parameter exception message which did not really make sense and improve regex performance

Commits
-------

719e037 [FrameworkBundle] fix routing container parameter exception message
8513ac9 [Routing] added working test case for issue #5135
2013-10-31 16:51:38 +01:00
Tobias Schultze
719e0377bb [FrameworkBundle] fix routing container parameter exception message
also improve regex performance and fix implementation-specific written tests and typo
2013-10-31 16:19:00 +01:00
Tobias Schultze
7a754c36a4 [Form] fix and unify phpdoc 2013-10-31 15:15:49 +01:00
Joseph Deray
b952bcbf9a fixed issue with clone now the children of the original form are preserved and the clone form is given new children 2013-10-30 18:44:30 -04:00
Fabien Potencier
eac8e3a3b2 update CONTRIBUTORS 2013-10-30 19:11:43 +01:00
Fabien Potencier
ee0ffc5c61 bug #9412 [HttpFoundation] added content length header to BinaryFileResponse (kbond)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9412).

Discussion
----------

[HttpFoundation] added content length header to BinaryFileResponse

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

Commits
-------

e75a556 added content length header to BinaryFileResponse
2013-10-30 17:57:35 +01:00
Kevin Bond
2b8029e469 added content length header to BinaryFileResponse 2013-10-30 17:57:35 +01:00
Fabien Potencier
61dd06ea27 fixed CS 2013-10-30 09:30:20 +01:00
Fabien Potencier
43f749e507 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  Fixed the error handling when decoding invalid XML to avoid a Warning
  [Form] Fixed: The "data" option is taken into account even if it is NULL
  [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FormType.php
2013-10-30 09:28:22 +01:00
Fabien Potencier
0211c387d3 fixed CS 2013-10-30 09:27:36 +01:00
Fabien Potencier
b4e69e8707 bug #9395 [HttpKernel] fixed memory limit display in MemoryDataCollector (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] fixed memory limit display in MemoryDataCollector

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

Commits
-------

644f78d [HttpKernel] fixed memory limit display in MemoryDataCollector
2013-10-28 16:22:12 +01:00
Hugo Hamon
644f78d806 [HttpKernel] fixed memory limit display in MemoryDataCollector 2013-10-28 15:46:04 +01:00
Fabien Potencier
4bff07956a bug #9388 [Form] Fixed: The "data" option is taken into account even if it is NULL (bschussek)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fixed: The "data" option is taken into account even if it is NULL

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

Commits
-------

c1a3eb3 [Form] Fixed: The "data" option is taken into account even if it is NULL
2013-10-28 14:27:57 +01:00
Fabien Potencier
ef695655f5 bug #9391 [Serializer] Fixed the error handling when decoding invalid XML to avoid a Warning (stof)
This PR was merged into the 2.2 branch.

Discussion
----------

[Serializer] Fixed the error handling when decoding invalid XML to avoid a Warning

| 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

Without the exception being thrown here, the call to ``simplexml_import_dom`` throws a warning saying ``Invalid Nodetype to import``.
This has been reported by @Tobion after we refactored FOSRestBundle to use this XmlEncoder instead of a duplication of a previous version of the class: https://github.com/FriendsOfSymfony/FOSRestBundle/pull/583/files#r7221045

Commits
-------

b2550b9 Fixed the error handling when decoding invalid XML to avoid a Warning
2013-10-28 14:03:08 +01:00
Christophe Coevoet
b2550b90ae Fixed the error handling when decoding invalid XML to avoid a Warning 2013-10-28 13:20:44 +01:00
Bernhard Schussek
c1a3eb3f2e [Form] Fixed: The "data" option is taken into account even if it is NULL 2013-10-28 10:50:26 +01:00
Fabien Potencier
6fcb06034a bug #9378 [DomCrawler] [HttpFoundation] Make Content-Type attributes identification case-insensitive (matthieuprat)
This PR was merged into the 2.2 branch.

Discussion
----------

[DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive

According to [section 3.7 of RFC 2616][], media-type attribute names in the `Content-Type` header are case-insensitive.
Therefore, identification of the `text` type and the `charset` parameter in the `Content-Type` header should be case-insensitive.

[section 3.7 of RFC 2616]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7

Commits
-------

17a2d66 [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive
2013-10-26 10:02:56 +02:00
Fabien Potencier
c1247a2054 Merge branch '2.2' into 2.3
* 2.2:
  Fixed English usage for existing users.
  [Process] Fix #9343 : revert file handle usage on Windows platform
2013-10-26 09:52:48 +02:00
Fabien Potencier
ed799c96af bug #9354 [2.2][Process] Fix #9343 : revert file handle usage on Windows platform (romainneutron)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Process] Fix #9343 : revert file handle usage on Windows platform

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

Hello,

I propose to revert the use of file handles only for `STDOUT` on Windows platform (see implementation in 2.2.6 [here](4059720232/src/Symfony/Component/Process/Process.php (L231-L242))).

When I decoupled pipes management from `Process` in #8924, I used file handles for both `STDOUT` and `STDERR`. This was an error as it introduced random failure in reading the handles (reported as [PHP#65650](https://bugs.php.net/bug.php?id=65650)).

Reverting to the previous implementation solves the issue. My apologies for the issues it introduced.

Versions that have been affected by the bug are 2.2.7, 2.2.8, 2.2.9, 2.3.4, 2.3.5 and 2.3.6.

Side note : I thought about testing the file handles implementation on *nix, but it fails most of the time where as Windows is okay. Unit testing on windows is okay (AbstractProcessTest::testProcessPipes tests it), but I don't provide a travis compatible test.

Commits
-------

e9dd408 [Process] Fix #9343 : revert file handle usage on Windows platform
2013-10-26 09:51:51 +02:00
Matthieu Prat
17a2d66456 [DomCrawler] [HttpFoundation] Make Content-Type attributes identification case-insensitive 2013-10-25 15:49:57 +00:00
Fabien Potencier
6ef251392f git push #9372 Fixed English usage for existing users. (mgenereu)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9372).

Discussion
----------

Fixed English usage for existing users.

Commits
-------

b674e44 Fixed English usage for existing users.
2013-10-24 21:28:54 +02:00
Michael Genereux
95bca6cbf0 Fixed English usage for existing users. 2013-10-24 21:28:54 +02:00
Fabien Potencier
729faa8d4f minor #9359 Clean up of WebProfiler Controller classes (caponica)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9359).

Discussion
----------

Clean up of WebProfiler Controller classes

 - Added missing "@throws" PHPdoc comments in controllers
 - Updated deprecated reference to Symfony\Component\HttpKernel\Debug\ExceptionHandler to use Symfony\Component\Debug\ExceptionHandler instead

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no

Commits
-------

592b831 Clean up of WebProfiler Controller classes:
2013-10-24 18:01:17 +02:00
caponica
9f4ca0818b Clean up of WebProfiler Controller classes:
Added missing "@throws" PHPdoc comments in controllers
Updated deprecated reference to Symfony\Component\HttpKernel\Debug\ExceptionHandler to use Symfony\Component\Debug\ExceptionHandler instead
2013-10-24 18:01:17 +02:00
Tobias Schultze
8513ac9a10 [Routing] added working test case for issue #5135 2013-10-24 15:23:46 +02:00
Romain Neutron
e9dd408881 [Process] Fix #9343 : revert file handle usage on Windows platform 2013-10-21 13:56:16 +02:00
Douglas Greenshields
edc287bc5b [Intl] make currency bundle merge fallback locales when accessing data, allowing use of country-specific locales 2013-10-20 17:06:39 +01:00
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
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
Bernhard Schussek
4ff59d77a8 [DoctrineBridge] Added type check to prevent calling clear() on arrays 2013-10-18 16:04:39 +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
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
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
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
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
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
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
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
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