Commit Graph

17703 Commits

Author SHA1 Message Date
Fabien Potencier
890cd39371 Merge branch '2.5'
* 2.5:
  fixed typo
2014-07-15 16:22:51 +02:00
Fabien Potencier
ff4997fb39 Merge branch '2.4' into 2.5
* 2.4:
  fixed typo
2014-07-15 16:22:44 +02:00
Fabien Potencier
84334058b8 fixed typo 2014-07-15 16:22:28 +02:00
Fabien Potencier
05b2c4eec0 Merge branch '2.5'
* 2.5:
  Remove Spaceless Blocks From Twig Templates
  Validate locales sets intos translator
  [Console] Remove estimated field from debug_nomax
  Fix UserPassword validator translation
  Remove Spaceless Blocks from Twig Form Templates
  [Validator] remove wrong deprecation message
  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
  Added verbosity methods
2014-07-15 16:15:21 +02:00
Fabien Potencier
cd8927017f Merge branch '2.4' into 2.5
* 2.4:
  Remove Spaceless Blocks From Twig Templates
  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
  Added verbosity methods

Conflicts:
	src/Symfony/Component/Form/FormError.php
2014-07-15 16:15:12 +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
Christophe Coevoet
7e1b4f6e2d bug #11284 [Console] Remove estimated field from debug_nomax (bburnichon)
This PR was squashed before being merged into the 2.5 branch (closes #11284).

Discussion
----------

[Console] Remove estimated field from debug_nomax

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

Commits
-------

2ac1bb4 [Console] Remove estimated field from debug_nomax
2014-07-15 13:45:19 +02:00
Benoît Burnichon
2ac1bb45bc [Console] Remove estimated field from debug_nomax 2014-07-15 13:44:57 +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
Fabien Potencier
01efafec37 minor #11377 [Validator] remove wrong deprecation message (Tobion)
This PR was merged into the 2.5 branch.

Discussion
----------

[Validator] remove wrong deprecation message

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

Commits
-------

bde043d [Validator] remove wrong deprecation message
2014-07-12 08:09:39 +02:00
Fabien Potencier
d23320fa24 feature #11378 Allow xdebug.file_link_format from php ini to work when xdebug extension is not loaded (frickenate, ClementGautier)
This PR was merged into the 2.6-dev branch.

Discussion
----------

Allow xdebug.file_link_format from php ini to work when xdebug extension is not loaded

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

Complete the PR https://github.com/symfony/symfony/pull/11081

Commits
-------

8b2397c Applyied code review
97e07d5 Check for xdebug link format via both ini_get and get_cfg_var
2014-07-11 17:49:50 +02:00
Clément Gautier
8b2397c982 Applyied code review 2014-07-11 17:37:14 +02:00
Tobias Schultze
bde043d035 [Validator] remove wrong deprecation message 2014-07-11 15:26:12 +02:00
Nate Bessette
97e07d5c24 Check for xdebug link format via both ini_get and get_cfg_var 2014-07-11 15:23:20 +02:00
Fabien Potencier
1ee4a41783 feature #11371 [Translation:update][Xliff Dumper] added target-language. (aitboudad, ClementGautier)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Translation:update][Xliff Dumper] added target-language.

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

Complete this PR : https://github.com/symfony/symfony/pull/11252

Commits
-------

fdc3fb1 [Translation:update][Xliff Dumper] Reviewed code and replaced underscore by hyphen
1951412 [Translation:update][Xliff Dumper] added target-language.
2014-07-11 13:07:55 +02:00
Clément Gautier
fdc3fb132c [Translation:update][Xliff Dumper] Reviewed code and replaced underscore by hyphen 2014-07-11 11:42:41 +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
Fabien Potencier
e40e325cdc feature #10960 [Filesystem] Throw Exception on copying from an unreadable file or to an unwritable file (djotto)
This PR was squashed before being merged into the 2.6-dev branch (closes #10960).

Discussion
----------

[Filesystem] Throw Exception on copying from an unreadable file or to an unwritable file

| Q  | A |
| ------------- | ------------- |
| Bug fix?  | No  |
| New feature?  | No  |
| BC breaks? | No |
| Deprecations? | No |
| Tests pass? | Yes |
| Fixed tickets | |
| License | MIT |

In certain circumstances (overwrite set to true, target file not writable), Filesystem->copy() would return success even though the file was not successfully copied. Unit tests included.

Commits
-------

cd5da9b [Filesystem] Throw Exception on copying from an unreadable file or to an unwritable file
2014-07-09 16:44:54 +02:00
David Otton
cd5da9b3c8 [Filesystem] Throw Exception on copying from an unreadable file or to an unwritable file 2014-07-09 16:44:50 +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
01346f78e0 feature #11212 [HttpFoundation] Added a switch to delete file after the response is send (WybrenKoelmans)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[HttpFoundation] Added a switch to delete file after the response is send

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

I have not done any Unit Tests for this code as I suspect there may already be a way to solve my problem of deleting a file after the request was sent. Is it possible to use `sendContent` and delete the file after that? My attempts were unsuccessful.

If this code is desirable, please assist me in how I would write an unit test for this. Thanks.

TODO:
- [x] Add unit tests
- [x] Update documentation
- [x] Mention that using `X-Sendfile` will overwrite deleteFileAfterSend

Commits
-------

1fff158 [HttpFoundation] Added a switch to delete file after the response is send
2014-07-09 11:10:36 +02:00
Fabien Potencier
d941f80ef8 Merge branch '2.5'
* 2.5:
  added missing test
  fixed CS
  [HttpFoundation] Remove content-related headers if content is empty
  bumped Symfony version to 2.5.2
  bumped Symfony version to 2.4.8
  updated VERSION for 2.5.1
  updated CHANGELOG for 2.5.1
  removed defaults from PHPUnit configuration

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-09 11:06:26 +02:00
Fabien Potencier
17009c148b Merge branch '2.4' into 2.5
* 2.4:
  added missing test
  fixed CS
  [HttpFoundation] Remove content-related headers if content is empty
  bumped Symfony version to 2.4.8
  removed defaults from PHPUnit configuration

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-09 11:05:48 +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
229828da8a feature #11210 [FrameworkBundle] Improving bad bundle exception in _controller (weaverryan)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[FrameworkBundle] Improving bad bundle exception in _controller

...ntroller in a routeHi guys!

This improves the exception message when you use a bad bundle name in the `_controller` syntax in a routing file. Here is the before and after of the message with this mistake (real bundle is `KnpUniversityBundle`):

```yaml
some_route:
    pattern:  /
    defaults: { _controller: "Knp2UniversityBundle:Course:index" }
```

![screen shot 2014-06-23 at 9 27 55 pm](https://cloud.githubusercontent.com/assets/121003/3367065/448e8298-fb54-11e3-92ea-9bf04510cb6d.png)

![screen shot 2014-06-23 at 9 48 14 pm](https://cloud.githubusercontent.com/assets/121003/3367063/3c79cf36-fb54-11e3-87c4-29428248ee47.png)

Notice the before and after behavior is the same `InvalidArgumentException` (just a different message).

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

Catching the plain `InvalidArgumentException` from `Kernel::getBundles()` seems a bit "loose". Should we consider creating a new exception (e.g. `BundleDoesNotExistException`) that extends `InvalidArgumentException` and throw it from inside `Kernel::getBundles`? This would allow us to catch more precisely, and it seems like it would be BC.

Suggestions and thoughts warmly welcome!

Thanks!

Commits
-------

f9b88c6 Improving the exception message when the bundle name is wrong for the controller in a route
2014-07-08 21:33:54 +02:00
Fabien Potencier
adb78608c9 feature #11135 [FrameworkBundle] Use ProcessHelper for server:run command (romainneutron)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[FrameworkBundle] Use ProcessHelper for server:run command

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

Let's use our new process helper :)

Commits
-------

6ca1c90 [FrameworkBundle] Use ProcessHelper for server:run command
a5f36a8 [Console] Add threshold for ProcessHelper verbosity
2014-07-08 21:28:46 +02:00
Fabien Potencier
71286e1c2a feature #11318 [WIP][Form] Improve transformation failure message by providing property path (jubianchi)
This PR was squashed before being merged into the 2.6-dev branch (closes #11318).

Discussion
----------

[WIP][Form] Improve transformation failure message by providing property path

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

Commits
-------

d56b7be [WIP][Form] Improve transformation failure message by providing property path
2014-07-08 21:17:26 +02:00
jubianchi
d56b7be156 [WIP][Form] Improve transformation failure message by providing property path 2014-07-08 21:17:23 +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