Commit Graph

17298 Commits

Author SHA1 Message Date
Andreia Bohner
28424ee79d Add some tweaks to the pt_BR translations 2014-07-19 07:51:56 +02:00
Fabien Potencier
2797df89b8 Merge branch '2.3' into 2.4
* 2.3:
  [Process] Adjust PR #11264, make it Windows compatible and fix CS
  [Process] Fix unit tests on Windows platform
  bumped Symfony version to 2.3.19
  updated VERSION for 2.3.18
  update CONTRIBUTORS for 2.3.18
  updated CHANGELOG for 2.3.18
  [Process] Use correct test for empty string in UnixPipes

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2014-07-16 15:12:41 +02:00
Fabien Potencier
91e32f810b bug #11381 [2.3] [Process] Use correct test for empty string in UnixPipes (whs, romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Process] Use correct test for empty string in UnixPipes

| 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 PR supersedes #11264 : 2.3 compatibility + Windows compatibility + CS fix

Commits
-------

cec0a45 [Process] Adjust PR #11264, make it Windows compatible and fix CS
9e1ea4a [Process] Use correct test for empty string in UnixPipes
2014-07-16 15:02:06 +02:00
Fabien Potencier
45df2f314c minor #11397 [2.3][Process] Fix unit tests on Windows platform (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Fix unit tests on Windows platform

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

Commits
-------

d418935 [Process] Fix unit tests on Windows platform
2014-07-16 14:58:19 +02:00
Romain Neutron
cec0a45ff5 [Process] Adjust PR #11264, make it Windows compatible and fix CS 2014-07-16 14:40:06 +02:00
Romain Neutron
d4189350c0 [Process] Fix unit tests on Windows platform 2014-07-16 11:55:07 +02:00
Fabien Potencier
98142a0a35 bumped Symfony version to 2.4.9 2014-07-15 22:38:14 +02:00
Fabien Potencier
ace5a29867 bumped Symfony version to 2.3.19 2014-07-15 21:58:41 +02:00
Fabien Potencier
3da923989c updated VERSION for 2.4.8 2014-07-15 16:52:02 +02:00
Fabien Potencier
34620a7d99 updated CHANGELOG for 2.4.8 2014-07-15 16:51:55 +02:00
Fabien Potencier
84334058b8 fixed typo 2014-07-15 16:22:28 +02:00
Fabien Potencier
75e07e6bde updated VERSION for 2.3.18 2014-07-15 16:20:44 +02:00
Fabien Potencier
4a12f4d0f2 update CONTRIBUTORS for 2.3.18 2014-07-15 16:20:27 +02:00
Fabien Potencier
98b891d271 updated CHANGELOG for 2.3.18 2014-07-15 16:20:17 +02:00
Fabien Potencier
a05016099b bug #11278 Remove Spaceless Blocks From Twig Templates (chrisguitarguy)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #11278).

Discussion
----------

Remove Spaceless Blocks From Twig Templates

Leaving it in can only mangle values from data bound to the form.

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

The tests pass here, but it doesn't seem like any tests really cover the actual rendering.

Commits
-------

793a083 Remove Spaceless Blocks From Twig Templates
2014-07-15 16:13:00 +02:00
Christopher Davis
793a083fd7 Remove Spaceless Blocks From Twig Templates 2014-07-15 16:12:54 +02:00
Fabien Potencier
56b0139b0d Merge branch '2.3' into 2.4
* 2.3:
  Validate locales sets intos translator
  Fix UserPassword validator translation
  Remove Spaceless Blocks from Twig Form Templates
  fixed typo
  [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
  added regression test
  fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
  [HttpFoundation] Fix wrong assertion in Response test
  [Upgrade] Fixed markdown syntax
  [2.3][Form] Cleanup & fix phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
2014-07-15 16:07:10 +02:00
Jérémy Derussé
06a80fbdbe Validate locales sets intos translator 2014-07-15 15:44:49 +02:00
Fabien Potencier
06fc97ead8 feature #11367 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671) (Andrew Moore)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671)

| 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
| CVE Ticket   | [CVE-2014-4671](http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-4671)
| See Also | [Rosetta Flash](http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/)

\* Unless you are parsing the response string manually, which you really shouldn't do anyway

**THIS IS A SECURITY FIX AND SHOULD BE MERGED SHORTLY**

This fix prevents attacks vectors where third-party browser plugins depends on ASCII magic bytes in order to execute a plugin. This is currently exploited with Flash using a carefully crafted JSONP response, allowing the execution of random SWF data from a domain with a vulnerable JSONP endpoint.

This security issue is mitigated by adding an empty comment right before the callback parameter. This does not affect the execution of the JSONP callback.

Commits
-------

6af3d05 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
2014-07-15 15:35:51 +02:00
Fabien Potencier
3c54659baf minor #11387 [2.3] [Validator] Fix UserPassword validator translation (redstar504)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Validator] Fix UserPassword validator translation

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

Fixes the UserPassword translation message only for 2.3 as discussed in symfony/symfony#11383.

Commits
-------

73d50ed Fix UserPassword validator translation
2014-07-15 10:15:42 +02:00
redstar504
73d50edc17 Fix UserPassword validator translation 2014-07-13 22:59:18 -07:00
Fabien Potencier
93a970c17d bug #11386 Remove Spaceless Blocks from Twig Form Templates (chrisguitarguy)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove Spaceless Blocks from Twig Form Templates

In favor of using Twig's whitespace control operators. See #11277

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

Per @fabpot and @stof's requests in #11278, this is a PR for the 2.3 branch.

Commits
-------

8f9ed3e Remove Spaceless Blocks from Twig Form Templates
2014-07-14 07:07:18 +02:00
Christopher Davis
8f9ed3ebb9 Remove Spaceless Blocks from Twig Form Templates
In favor of using Twig's whitespace control operators. See #11277
2014-07-13 13:09:52 -04:00
Manatsawin Hanmongkolchai
9e1ea4aa4b [Process] Use correct test for empty string in UnixPipes 2014-07-12 16:25:05 +02:00
Fabien Potencier
ea45769aab fixed typo 2014-07-11 11:32:34 +02:00
Andrew Moore
6af3d05b85 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671) 2014-07-10 09:27:11 -04:00
Christophe Coevoet
ca69dbba43 minor #11362 [2.3][HttpFoundation] Fix wrong assertion in Response test (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][HttpFoundation] Fix wrong assertion in Response test

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

Commits
-------

3d63f80 [HttpFoundation] Fix wrong assertion in Response test
2014-07-10 11:13:00 +02:00
Christophe Coevoet
819bb2901f bug #9719 [TwigBundle] fix configuration tree for paths (mdavis1982, cordoval)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9719).

Discussion
----------

[TwigBundle] fix configuration tree for paths

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

This is a joint effort with @mdavis1982 and @cordoval 👶 pairing up and warming for hacking day in Warsaw

Commits
-------

9aa88e4 added regression test
4201d41 fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
2014-07-10 10:55:42 +02:00
Luis Cordova
9aa88e4494 added regression test 2014-07-10 10:55:37 +02:00
Matthew Davis
4201d419a2 fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval 2014-07-10 10:55:33 +02:00
Fabien Potencier
d15fe34c0b minor #11358 [2.3][Form] Cleanup & fix phpdocs (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Form] Cleanup & fix phpdocs

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

This PR was done mostly cause of reports about invalid/not supported types/variables in phpstorm/scrutinizer-ci, and after I started fixing I noticed more problems in those phpdocs so I have cleanedup them a bit.

Commits
-------

a67bc76 [2.3][Form] Cleanup & fix phpdocs
2014-07-10 10:03:34 +02:00
Joseph Bielawski
3d63f801ff [HttpFoundation] Fix wrong assertion in Response test 2014-07-10 09:54:15 +02:00
Fabien Potencier
162a025c5d minor #11359 [Upgrade] Fixed markdown syntax (lyrixx)
This PR was merged into the 2.3 branch.

Discussion
----------

[Upgrade] Fixed markdown syntax

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

Commits
-------

deb70c7 [Upgrade] Fixed markdown syntax
2014-07-09 19:02:56 +02:00
Grégoire Pineau
deb70c7eea [Upgrade] Fixed markdown syntax 2014-07-09 17:19:57 +02:00
Christophe Coevoet
d976118844 minor #11274 Added verbosity methods to NullOutput (WouterJ)
This PR was merged into the 2.4 branch.

Discussion
----------

Added verbosity methods to NullOutput

These 4 methods were not added to the OutputInterface because of BC, but they should still be implemented in all classes which implement that interface. Otherwise we have to do nasty tricks...

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

Commits
-------

0459249 Added verbosity methods
2014-07-09 14:44:38 +02:00
Joseph Bielawski
a67bc7612e [2.3][Form] Cleanup & fix phpdocs 2014-07-09 12:39:32 +02:00
Fabien Potencier
1edd1c7147 added missing test 2014-07-09 11:05:16 +02:00
Fabien Potencier
dd5a14b831 Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
  [HttpFoundation] Remove content-related headers if content is empty
  removed defaults from PHPUnit configuration
2014-07-09 11:04:55 +02:00
Fabien Potencier
5955f8edfe fixed CS 2014-07-09 11:04:31 +02:00
Fabien Potencier
75abd1a451 bug #11244 [HttpFoundation] Remove body-related headers when sending the response, if body is empty (SimonSimCity)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11244).

Discussion
----------

[HttpFoundation] Remove body-related headers when sending the response, if body is empty

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

I've updated the implementation for informational and 204 or 304 responses. They will now, as they have no content, not return headers like `content-type` or `content-length`.

I'm unsure about `content-length` - we could also set it hardcoded to zero ... but I thought, that (because the specs say that it just can't have a response-body) the system should not return anything here.

Commits
-------

9dbe89d [HttpFoundation] Remove content-related headers if content is empty
2014-07-09 11:03:38 +02:00
Simon Schick
9dbe89dba6 [HttpFoundation] Remove content-related headers if content is empty 2014-07-09 11:03:31 +02:00
Fabien Potencier
cc84d95787 minor #11344 remove defaults from PHPUnit configuration (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

remove defaults from PHPUnit configuration

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

Follow-up to #11329.

Commits
-------

afc4930 removed defaults from PHPUnit configuration
2014-07-08 21:12:37 +02:00
Fabien Potencier
1fb3ccb3be bumped Symfony version to 2.4.8 2014-07-08 16:47:36 +02:00
Fabien Potencier
e72f9ebfdf updated VERSION for 2.4.7 2014-07-08 13:54:27 +02:00
Fabien Potencier
2b6f1169d7 updated CHANGELOG for 2.4.7 2014-07-08 13:53:35 +02:00
Fabien Potencier
8185106a8d Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-08 13:46:35 +02:00
Fabien Potencier
bf72e871f6 bumped Symfony version to 2.3.18 2014-07-08 13:19:32 +02:00
Fabien Potencier
c02f56f794 updated VERSION for 2.3.17 2014-07-07 14:59:36 +02:00
Fabien Potencier
c09ff16cbc update CONTRIBUTORS for 2.3.17 2014-07-07 14:58:57 +02:00
Fabien Potencier
d393ddd11a updated CHANGELOG for 2.3.17 2014-07-07 14:57:59 +02:00