Commit Graph

17744 Commits

Author SHA1 Message Date
Jan Decavele
fec9a4a0e6 removed some more spaces 2014-07-24 09:53:27 +02:00
Jan Decavele
16134d9e6f Merge remote-tracking branch 'upstream/master' 2014-07-24 09:51:26 +02:00
Fabien Potencier
b3b41d5d8d feature #11314 [FrameworkBundle] Improved controller class error (jskvara)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[FrameworkBundle] Improved controller class error

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/11304
| License       | MIT
| Doc PR        |

Commits
-------

da41eb1 [FrameworkBundle] improved controller name parse error message
2014-07-24 07:24:16 +02:00
jskvara
da41eb1fb1 [FrameworkBundle] improved controller name parse error message 2014-07-23 22:48:56 +01:00
Jan Decavele
b0999368e2 - Removed spaces around the concation dots to be more consitent
- adjusted some formatting
2014-07-23 18:49:56 +02:00
Fabien Potencier
ee0a0740f8 feature #11317 remove the scope from the output of the container:debug command (xabbuh)
This PR was merged into the 2.6-dev branch.

Discussion
----------

remove the scope from the output of the container:debug command

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

Commits
-------

f56b731 remove the scope from the output of the container:debug command
2014-07-23 16:39:58 +02:00
Fabien Potencier
cbfcc779c5 minor #11430 [Console] Fix test on windows (Seldaek)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Console] Fix test on windows

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

Commits
-------

8be4c92 [Console] Fix test on windows
2014-07-23 11:17:23 +02:00
Fabien Potencier
1fdd3dfcd3 minor #11383 [Validator] Improve UserPassword message (redstar504)
This PR was squashed before being merged into the 2.6-dev branch (closes #11383).

Discussion
----------

[Validator] Improve UserPassword message

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

This validator message is not proper English.

Commits
-------

d57471e [Validator] Improve UserPassword message
2014-07-23 10:41:37 +02:00
redstar504
d57471ee63 [Validator] Improve UserPassword message 2014-07-23 10:41:34 +02:00
Jan Decavele
0459d89905 Addition of the symfony license text 2014-07-22 14:43:43 +02:00
Jordi Boggiano
8be4c92316 [Console] Fix test on windows 2014-07-20 21:24:23 +02:00
Fabien Potencier
397687f345 minor #11416 [CssSelector] Rename Specificity->compare() to compareTo() (barryvdh)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[CssSelector] Rename Specificity->compare() to compareTo()

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

Update for #11404 as proposed in the comments. `compareTo` was suggested as a better name then `compare`.

Commits
-------

98873b8 Rename Specificity->compare() to compareTo()
2014-07-18 11:03:26 +02:00
Barry vd. Heuvel
98873b8e59 Rename Specificity->compare() to compareTo()
Update for #11404 as proposed in the comments
2014-07-18 09:44:18 +02:00
Fabien Potencier
e797659fb5 fixed CS 2014-07-17 12:19:44 +02:00
Fabien Potencier
b8f212d05b feature #11404 [CssSelector] Add compare method to Specificity (barryvdh)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[CssSelector] Add compare method to Specificity

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

TODO:
- [x] Add some tests

Add compare method to Specificity class, so we can compare the specificity without using the value, so it doesn't matter if the base isn't high enough (for example, 1,0,0 should be higher then 0,11,0. Currently with using values, this wouldn't be possible (100 vs 110).
As discussed in #11400, the getValue() isn't completely correct for every case, see the spec http://www.w3.org/TR/selectors/#specificity

Use case would, for example, be sorting an array of multiple properties.

Commits
-------

afbaf19 Add compare method to Specificity
2014-07-17 12:19:02 +02:00
Barry vd. Heuvel
afbaf1929a Add compare method to Specificity
So we can compare the specificity without using the value, so it doesn't matter if the base isn't high enough (for example, 1,0,0 should be higher then 0,11,0. Currently with using values, this wouldn't be possible (100 vs 110).
2014-07-17 10:32:45 +02:00
Fabien Potencier
732c9e2e44 Merge branch '2.5'
* 2.5:
  [Process] Adjust PR #11264, make it Windows compatible and fix CS
  [Process] Fix unit tests on Windows platform
  bumped Symfony version to 2.5.3
  bumped Symfony version to 2.4.9
  bumped Symfony version to 2.3.19
  updated VERSION for 2.5.2
  updated CHANGELOG for 2.5.2
  updated VERSION for 2.4.8
  updated CHANGELOG for 2.4.8
  [2.5][Form] solved dependency to ValidatorInterface, fix #11036
  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/ProcessPipes.php
2014-07-16 15:48:12 +02:00
Fabien Potencier
a9af6be54e Merge branch '2.4' into 2.5
* 2.4:
  [Process] Adjust PR #11264, make it Windows compatible and fix CS
  [Process] Fix unit tests on Windows platform
  bumped Symfony version to 2.4.9
  bumped Symfony version to 2.3.19
  updated VERSION for 2.4.8
  updated CHANGELOG for 2.4.8
  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
2014-07-16 15:13:02 +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
28defa8741 bumped Symfony version to 2.5.3 2014-07-15 22:52:32 +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
e66ee96757 updated VERSION for 2.5.2 2014-07-15 17:39:46 +02:00
Fabien Potencier
8805ee1604 updated CHANGELOG for 2.5.2 2014-07-15 17:39:39 +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
f11da64cb9 bug #11350 [2.5][Form] solved dependency to ValidatorInterface, fix #11036 (Sebastian Blum)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11350).

Discussion
----------

[2.5][Form] solved dependency to ValidatorInterface, fix #11036

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | #11036, #11345
| License       | MIT
| Doc PR        |

Since Symfony 2.5

The problem was that the form component has a hardcoded depencency to the deprecated validator component (api Version 2.4)
The pull request fixes the dependency to the validator component and supports now both implementations, apiVersion 2.5 and apiVersion 2.4 of the validator component.

@Symfony Core Members
please review the changes 0a1e9c208f/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
I'm not sure if it was the right solution

Commits
-------

705d67b [2.5][Form] solved dependency to ValidatorInterface, fix #11036
2014-07-15 16:46:59 +02:00
Sebastian Blum
705d67b563 [2.5][Form] solved dependency to ValidatorInterface, fix #11036 2014-07-15 16:46:59 +02:00
Fabien Potencier
a32e8198e1 bug #11350 [2.5][Form] solved dependency to ValidatorInterface, fix #11036 (Sebastian Blum)
This PR was squashed before being merged into the 2.6-dev branch (closes #11350).

Discussion
----------

[2.5][Form] solved dependency to ValidatorInterface, fix #11036

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | #11036, #11345
| License       | MIT
| Doc PR        |

Since Symfony 2.5

The problem was that the form component has a hardcoded depencency to the deprecated validator component (api Version 2.4)
The pull request fixes the dependency to the validator component and supports now both implementations, apiVersion 2.5 and apiVersion 2.4 of the validator component.

@Symfony Core Members
please review the changes 0a1e9c208f/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
I'm not sure if it was the right solution

Commits
-------

ab765c9 [2.5][Form] solved dependency to ValidatorInterface, fix #11036
2014-07-15 16:29:30 +02:00
Sebastian Blum
ab765c90b6 [2.5][Form] solved dependency to ValidatorInterface, fix #11036 2014-07-15 16:29:26 +02:00
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
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
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