Commit Graph

15401 Commits

Author SHA1 Message Date
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
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
Abdul Malik Ikhsan
6892779d0b fix typo : StdClass should be stdClass with little "s" 2013-10-13 08:32:10 +02:00
Fabien Potencier
e219481579 minor #9278 [HttpFoundation] Remove unnecessary continue from Request (tgabi333)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9278).

Discussion
----------

[HttpFoundation] Remove unnecessary continue from Request

Commits
-------

067f561 [HttpFoundation] Remove unnecessary continue from Request
2013-10-11 13:59:44 +02:00
Gábor Tóth
304c7b6f87 Remove unnecessary continue from Request 2013-10-11 13:59:44 +02:00
Fabien Potencier
b599598bb3 bug #9274 [Yaml] Fixed the escaping of strings starting with a dash when dumping (stof)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] Fixed the escaping of strings starting with a dash when dumping

Dashes need to be escaped in character sets in regexes as they are used to specify a range otherwise.
It fixes the dumper bug reported in #9039 (the parsing issue is not fix here)

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

Commits
-------

af369ae [Yaml] Fixed the escaping of strings starting with a dash when dumping
2013-10-11 06:56:07 +02:00
Christophe Coevoet
af369aee64 [Yaml] Fixed the escaping of strings starting with a dash when dumping
Dashes need to be escaped in character sets in regexes as they are used to
specify a range otherwise.
Refs #9039
2013-10-11 00:23:27 +02:00
Fabien Potencier
9f8867376f bug #9270 [Templating] Fix in ChainLoader.php (janschoenherr)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9270).

Discussion
----------

[Templating] Fix in ChainLoader.php

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

The LoaderInterface requires the _time_ parameter to be passed.

Commits
-------

2631eb3 [Templating] Fix in ChainLoader.php
2013-10-10 17:51:38 +02:00
janschoenherr
e2ecc0fd23 Fix in ChainLoader.php
The LoaderInterface requires the time to be passed.
2013-10-10 17:51:38 +02:00
Fabien Potencier
1028c219b7 bug #9246 [Session] fixed wrong started state (tecbot)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9246).

Discussion
----------

[Session] fixed wrong started state

Currently the session stays in the started mode after the call of  ```save()``` which will close the session. We found the issue in our custom SAPI which keeps the symfony stack initialized over multiple requests.

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

Commits
-------

d641cd6 [Session] fixed wrong started states
2013-10-10 17:50:53 +02:00
Thomas Adam
e8d3ab22b4 fixed wrong started states 2013-10-10 17:50:52 +02:00
Fabien Potencier
f3bd125aed bumped Symfony version to 2.3.7 2013-10-10 16:16:40 +02:00
Fabien Potencier
d0597156c4 updated VERSION for 2.3.6 2013-10-10 15:24:22 +02:00
Fabien Potencier
003644ce35 updated CHANGELOG for 2.3.6 2013-10-10 15:23:56 +02:00
Fabien Potencier
e7df974ab8 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.10
  updated VERSION for 2.2.9
  update CONTRIBUTORS for 2.2.9
  updated CHANGELOG for 2.2.9
  [Security] limited the password length passed to encoders
  assets:install command should mirror .dotfiles (.htaccess)
  PoFileDumper - PO headers
  removed whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
2013-10-10 15:12:30 +02:00
Fabien Potencier
2996c6b4c6 bumped Symfony version to 2.2.10 2013-10-10 15:10:05 +02:00
Fabien Potencier
6a5c6c0d76 updated VERSION for 2.2.9 2013-10-10 14:15:43 +02:00
Fabien Potencier
cce717011e update CONTRIBUTORS for 2.2.9 2013-10-10 14:15:32 +02:00
Fabien Potencier
9488c489c3 updated CHANGELOG for 2.2.9 2013-10-10 14:07:53 +02:00
Fabien Potencier
67d4a8f8af [Security] limited the password length passed to encoders 2013-10-10 14:05:52 +02:00
Jakub Zalas
e01461df62 [HttpKernel] Fixed a test (compiler pass class name has been changed). 2013-10-10 08:15:46 +02:00
Fabien Potencier
71b1baf3f4 bug #9259 [Process] Fix latest merge from 2.2 in 2.3 (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix latest merge from 2.2 in 2.3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes (Process tests are okay)
| License       | MIT

Fix latest merge from 2.2 in 2.3, see #9182

Process tests are okay, an error in HttpKernel seems to occur

Commits
-------

b5e3576 [Process] Fix latest merge from 2.2 in 2.3
2013-10-10 07:53:02 +02:00
Romain Neutron
b5e3576ea0 [Process] Fix latest merge from 2.2 in 2.3 2013-10-09 23:17:57 +02:00
Fabien Potencier
0375dc8f9f bug #9237 [FrameworkBundle] assets:install command should mirror .dotfiles (.htaccess) (FineWolf)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9237).

Discussion
----------

[FrameworkBundle] assets:install command should mirror .dotfiles (.htaccess)

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

The `assets:install` command currently ignores all *.dotfiles* when mirroring the `Resources\public` folders of bundles. This can lead to issues when *.htaccess* files are required for some public assets (ie.: CORS headers for font files to be served via Cloudfront).

Since the assets being installed are clearly in a folder called `public`, we can safely assume that those files are in fact supposed to be accessible and copy them over with the normal files.

Commits
-------

9c884a0 [FrameworkBundle] assets:install command should mirror .dotfiles (.htaccess)
2013-10-09 23:05:14 +02:00
Andrew Moore
6f48f8e231 assets:install command should mirror .dotfiles (.htaccess) 2013-10-09 23:05:14 +02:00
Fabien Potencier
2ae07b5fb1 bug #9223 [Translator] PoFileDumper - PO headers (Padam87)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9223).

Discussion
----------

[Translator] PoFileDumper - PO headers

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

Po files should not be dumped without a header. It causes a lot of problems, including charset issues.

See #6765 / 1 for more info

Commits
-------

e93bc50 [Translator] PoFileDumper - PO headers
2013-10-09 22:59:37 +02:00
Adam Prager
a8bc8fff74 PoFileDumper - PO headers 2013-10-09 22:59:37 +02:00
Fabien Potencier
773932b64b removed whitespaces 2013-10-09 22:52:58 +02:00
Fabien Potencier
77a961d040 Merge branch '2.2' into 2.3
* 2.2:
  [Process] Fix #9182 : random failure on pipes tests
  Fixed propel guessed relations
  [FramworkBundle][HttpKernel] Check event listener services are not abstract
  fixed CS
  Check for lock existence before unlinking
  [FrameworkBundle] fixed path replacement on Windows

Conflicts:
	src/Symfony/Component/Process/Process.php
2013-10-09 22:51:36 +02:00
Fabien Potencier
46e70ea6e8 bug #9257 [Process][2.2] Fix 9182 : random failure on pipes tests (romainneutron)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Fix 9182 : random failure on pipes tests

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

I'm not a big fan of this fix, but - at least - it works.

With this code, finally, Process does not behave the same at all on Windows and Linux.
This patch does not smells very good but it solves the random failing test issue (that produced at runtime too).

Actually, calling `proc_get_status` within the waiting loop introduced the bug.
So this PR reverts to the previous behavior (consider a process running as long as pipes give data). On Windows, this is not the same behavior as we're not using streams but file handles. Whereas the feof of a stream is detected when the other side closes, the feof of a file handle can be reached at any time. So, on Windows, `proc_get_status` is called (checking the feof of the file handle might be positive until the executable outputs something), and we consider a process running as long as the information returned says it's running.

We could think of decouple windows and linux logic in two separated objects, using the interfaces I introduced in #8753. This could bring much more readability and make the code more easy to understand.

Commits
-------

64a0b40 [Process] Fix #9182 : random failure on pipes tests
2013-10-09 22:48:03 +02:00
Romain Neutron
64a0b40e6f [Process] Fix #9182 : random failure on pipes tests 2013-10-09 18:53:02 +02:00
Fabien Potencier
6659d7d9df bug #9222 [Bridge] [Propel1] Fixed guessed relations (ClementGautier)
This PR was merged into the 2.2 branch.

Discussion
----------

[Bridge] [Propel1] Fixed guessed relations

<table>
  <tr><th>Q</th><th>A</th></tr>
  <tr><td>Bug fix</td><td>yes</td></tr>
  <tr><td>Feature addition</td><td>no</td></tr>
  <tr><td>Backwards compatibility break</td><td>no</td></tr>
  <tr><td>Symfony2 tests pass</td><td>yes</td></tr>
  <tr><td>Fixes the following tickets</td><td>N/A</td></tr>
  <tr><td>Todo</td><td>N/A</td></tr>
  <tr><td>License of the code</td><td>MIT</td></tr>
  <tr><td>Documentation PR</td><td>N/A</td></tr>
</table>

The `PropelTypeGuesser` did not match OneToMany relations properly. For example if you have a `Author` class with `Comments` attributes the guesser would guess "Comment" instead of "Comments".

I added some tests to ensure the non regression.

Commits
-------

0b1e95f Fixed propel guessed relations
2013-10-07 11:38:21 +02:00
Clément Gautier
0b1e95f84c Fixed propel guessed relations 2013-10-06 13:10:32 +02:00
Fabien Potencier
e410b1f311 bug #9214 [FramworkBundle] Check event listener services are not abstract (lyrixx)
This PR was merged into the 2.2 branch.

Discussion
----------

[FramworkBundle] Check event listener services are not abstract

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

Commits
-------

6744ead [FramworkBundle][HttpKernel] Check event listener services are not abstract
2013-10-04 16:07:27 +02:00