Commit Graph

22482 Commits

Author SHA1 Message Date
Nicolas Grekas
68b3d2d6a8 Merge branch '2.3' into 2.7
* 2.3:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms

Conflicts:
	.travis.yml
2015-12-22 14:04:37 +01:00
Nicolas Grekas
ef53d6d755 Clean EOL whitespace 2015-12-22 14:02:38 +01:00
Nicolas Grekas
6a23de79b1 minor #17106 [travis] Fix (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Fix

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

Commits
-------

19a14c5 [travis] Fix
2015-12-22 14:01:03 +01:00
Nicolas Grekas
19a14c5f4e [travis] Fix 2015-12-22 13:45:04 +01:00
Nicolas Grekas
337957ad26 minor #17073 [Security] skip bcrypt tests on incompatible platforms (Christian Flothmann, xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] skip bcrypt tests on incompatible platforms

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

Not all PHP versions before 5.3.7 have backported fixes that make it
possible to use `password_hash()` function. Therefore, we have to skip
tests on not supported platforms.

Commits
-------

2a6fa7b use requires annotation
65eb188 skip bcrypt tests on incompatible platforms
2015-12-22 12:51:12 +01:00
Nicolas Grekas
ff56eb2350 minor #17104 [Routing] Reduce memory usage of a high consuming test case (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Reduce memory usage of a high consuming test case

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

Tests fail transiently on hhvm because of the high memory usage of this test case.
This patch cuts it by two.

See this blackfire comparison graph on the Memory dimension:
https://blackfire.io/profiles/compare/fd72ee66-e4d0-4ac2-92bf-16dd3849ef4c/graph?settings%5Bdimension%5D=pmu

Commits
-------

478a031 [Routing] Reduce memory usage of a high consuming test case
2015-12-22 12:50:18 +01:00
Nicolas Grekas
478a0312fd [Routing] Reduce memory usage of a high consuming test case 2015-12-22 12:36:46 +01:00
Nicolas Grekas
6755f87476 Fix merge 2015-12-22 11:27:42 +01:00
Nicolas Grekas
b7f998f744 Merge branch '2.3' into 2.7
* 2.3:
  [SecurityBundle] Removing test insulations for a huge perf win
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
2015-12-22 11:07:22 +01:00
Christian Flothmann
2a6fa7bbab use requires annotation 2015-12-22 09:19:23 +01:00
Fabien Potencier
bbc53dd83f minor #16999 [SecurityBundle] Removing test insulations for a huge perf win (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] Removing test insulations for a huge perf win

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

Commits
-------

b8fa471 [SecurityBundle] Removing test insulations for a huge perf win
2015-12-21 19:31:12 +01:00
Tobias Schultze
73060e44de minor #17087 [Validator] Use the new interface in the README (Ener-Getick)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Use the new interface in the README

| Q             | A
| ------------- | ---
| Fixed tickets | #17064
| License       | MIT

Commits
-------

1fbbe84 [Validator] Use the new interface in the README
2015-12-21 18:46:54 +01:00
Nicolas Grekas
b8fa471f8a [SecurityBundle] Removing test insulations for a huge perf win 2015-12-21 17:08:45 +01:00
Ener-Getick
1fbbe84007 [Validator] Use the new interface in the README 2015-12-21 13:16:02 +01:00
Fabien Potencier
36a514181f minor #17071 [Filesystem] fix tests on 2.3 (Christian Flothmann)
This PR was merged into the 2.3 branch.

Discussion
----------

[Filesystem] fix tests on 2.3

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

The test introduced in #16797 used the `assertFilePermissions()` method
to test for the expected result. This worked quite well for the PR as it
was submitted for the `master` branch. However, the tests now fail on
2.3 as the `FilesystemTestCase` class which contains this method was
introduced with Symfony 2.4.

Commits
-------

9050f67 [Filesystem] fix tests on 2.3
2015-12-20 20:57:55 +01:00
Christian Flothmann
65eb18849a skip bcrypt tests on incompatible platforms
Not all PHP versions before 5.3.7 have backported fixes that make it
possible to use `password_hash()` function. Therefore, we have to skip
tests on not supported platforms.
2015-12-19 15:13:08 +01:00
Christian Flothmann
9050f676af [Filesystem] fix tests on 2.3
The test introduced in #16797 used the `assertFilePermissions()` method
to test for the expected result. This worked quite well for the PR as it
was submitted for the `master` branch. However, the tests now fail on
2.3 as the `FilesystemTestCase` class which contains this method was
introduced with Symfony 2.4.
2015-12-19 12:15:11 +01:00
Fabien Potencier
0c2f1d94de bug #16797 [Filesystem] Recursivly widen non-executable directories (Slamdunk)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16797).

Discussion
----------

[Filesystem] Recursivly widen non-executable directories

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none
The `\FilesystemIterator` throws an `UnexpectedValueException` if the directory is non-executable.

Commits
-------

fb75651 [Filesystem] Recursivly widen non-executable directories
2015-12-18 18:05:30 +01:00
Filippo Tessarotto
fb75651a81 [Filesystem] Recursivly widen non-executable directories 2015-12-18 18:05:29 +01:00
Fabien Potencier
6a92f4e03f Merge branch '2.3' into 2.7
* 2.3:
  [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too
  updated validators.bg.xlf
  [Security] Enable bcrypt validation and result length tests on all PHP versions
  [Security] Verify if a password encoded with bcrypt is no longer than 72 characters
  [Console] Avoid extra blank lines when rendering exceptions
  [Yaml] do not remove "comments" in scalar blocks
2015-12-18 17:59:46 +01:00
Fabien Potencier
f371445eff bug #17040 [Console] Avoid extra blank lines when rendering exceptions (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Avoid extra blank lines when rendering exceptions

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

Don't know if it can be considered as a bug fix as it is the behavior since a while (https://github.com/symfony/symfony/pull/9055), but I let you see by yourself the old vs new rendering:

![Console exception rendering](https://cloud.githubusercontent.com/assets/2211145/11857447/92cebfbe-a458-11e5-9d3d-6147b0338080.PNG)

Commits
-------

2e158df [Console] Avoid extra blank lines when rendering exceptions
2015-12-18 17:54:05 +01:00
Fabien Potencier
68bd2c19a1 bug #17055 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Verify if a password encoded with bcrypt is no longer than 72 characters

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

From the [password_hash() docs](http://php.net/password_hash):

> Caution Using the PASSWORD_BCRYPT as the algorithm, will result in the password parameter being truncated to a maximum length of 72 characters.

Commits
-------

0a496e7 [Security] Enable bcrypt validation and result length tests on all PHP versions
5c30266 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters
2015-12-18 17:49:25 +01:00
Fabien Potencier
baa5b7db29 bug #16959 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too (HeahDude)
This PR was squashed before being merged into the 2.3 branch (closes #16959).

Discussion
----------

[Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too

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

Commits
-------

b4b5d63 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too
2015-12-18 17:43:49 +01:00
Jules Pietri
b4b5d63660 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too 2015-12-18 17:43:43 +01:00
Fabien Potencier
8d010230ef bug #16860 [Yaml] do not remove "comments" in scalar blocks (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] do not remove "comments" in scalar blocks

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

Inside scalar blocks, lines starting with a `#` character must be
treated like every other strings and must not be ignored as comments.

Commits
-------

3c72fcc [Yaml] do not remove "comments" in scalar blocks
2015-12-18 17:24:33 +01:00
Fabien Potencier
dae4267216 bug #17002 [Console][Table] fixed render row that contains multiple cells. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console][Table] fixed render row that contains multiple cells.

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

Commits
-------

3790ac7 [Console][Table] fixed render row with multiple cells.
2015-12-18 17:14:15 +01:00
Fabien Potencier
bfd522ff16 minor #16966 [Validator] Updated Bulgarian translation (RoumenDamianoff)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16966).

Discussion
----------

[Validator] Updated Bulgarian translation

Updated Bulgarian translation.

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

Commits
-------

862b872 updated validators.bg.xlf
2015-12-18 17:08:10 +01:00
Roumen Damianoff
862b8722b3 updated validators.bg.xlf 2015-12-18 17:08:09 +01:00
Nicolas Grekas
85814de44c Merge branch '2.3' into 2.7
* 2.3:
  prefer phpunit 5.x on hhvm
  [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
  [travis] Auto-conf deps=high matrix line
  Fix the logout path when not using the router
  [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
  [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
2015-12-18 16:35:58 +01:00
Nicolas Grekas
f76595662c minor #17024 prefer phpunit 5.x on hhvm (eventhorizonpl)
This PR was submitted for the 3.0 branch but it was merged into the 2.3 branch instead (closes #17024).

Discussion
----------

prefer phpunit 5.x on hhvm

Hi,

HHVM is identified as PHP 5.6 compiler. There are some unsolved problems with tests on hhvm, but using a recent phpunit should be a good start point. How about using 5.1?

Best regards,
Michal

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

Commits
-------

7a06d92 prefer phpunit 5.x on hhvm
2015-12-18 16:27:37 +01:00
Michal Piotrowski
7a06d92925 prefer phpunit 5.x on hhvm 2015-12-18 16:27:37 +01:00
Nicolas Grekas
6b13708ab6 bug #16971 [HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers (jakzal, Sander-Toonen)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers

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

Commits
-------

1da3d61 [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
dd129b7 [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers
2015-12-18 11:44:19 +01:00
Nicolas Grekas
c2b7ccb36c bug #17048 Fix the logout path when not using the router (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix the logout path when not using the router

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

This needs to use the base url, not the base path, so that it goes through the front controller when not using url rewriting.

Commits
-------

1a2567e Fix the logout path when not using the router
2015-12-18 10:38:22 +01:00
Nicolas Grekas
6499a2c4d5 bug #17049 Fix the logout path when not using the router (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix the logout path when not using the router

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

This needs to use the base url, not the base path, so that it goes through the front controller when not using url rewriting.

Similar to #17048, but in the new code location

Commits
-------

542b877 Fix the logout path when not using the router
2015-12-18 10:31:06 +01:00
Nicolas Grekas
e69491c819 bug #17057 [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands (xabbuh)
This PR was squashed before being merged into the 2.3 branch (closes #17057).

Discussion
----------

[FrameworkBundle][HttpKernel] the finder is required to discover bundle commands

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

Commits
-------

17fcef5 [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
2015-12-18 10:21:37 +01:00
Christian Flothmann
17fcef5aff [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands 2015-12-18 10:21:31 +01:00
Nicolas Grekas
1dff640f1b minor #16974 [travis] Auto-conf deps=high matrix line (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Auto-conf deps=high matrix line

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

Commits
-------

eb9f98e [travis] Auto-conf deps=high matrix line
2015-12-18 09:56:03 +01:00
Nicolas Grekas
eb9f98e81f [travis] Auto-conf deps=high matrix line 2015-12-18 09:19:35 +01:00
Jakub Zalas
0a496e7011 [Security] Enable bcrypt validation and result length tests on all PHP versions 2015-12-17 18:05:04 +00:00
Jakub Zalas
5c302669eb [Security] Verify if a password encoded with bcrypt is no longer than 72 characters 2015-12-17 18:04:54 +00:00
Christophe Coevoet
542b877424 Fix the logout path when not using the router
This needs to use the base url, not the base path, so that it goes
through the front controller when not using url rewriting.
2015-12-17 14:04:43 +01:00
Christophe Coevoet
1a2567e19e Fix the logout path when not using the router
This needs to use the base url, not the base path, so that it goes
through the front controller when not using url rewriting.
2015-12-17 13:54:40 +01:00
Maxime Steinhausser
2e158df2c7 [Console] Avoid extra blank lines when rendering exceptions 2015-12-17 00:47:15 +01:00
Tobias Schultze
2d48af7745 bug #17006 [Form] Fix casting regression in DoctrineChoiceLoader (bendavies)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix casting regression in DoctrineChoiceLoader

| 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

In symfony 2.7, the [DoctrineChoiceLoader](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php) and [IdReader](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php) were introduce to replace the deprecated [EntityChoiceList](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php)

There appears to have been a change in behaviour in the refactor, as the old `EntityChoiceList` [casts ID to strings](9543b36a34/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php (L248)), whereas the new `DoctrineChoiceLoader` [does not](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php#L159). The casting behavior was [maintained elsewhere](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php#L122), however.

Since the new `DoctrineChoiceLoader` deprecated `EntityChoiceList`, i'm calling this a regression.

Commits
-------

54bbade [Form] cast IDs to match deprecated behaviour of EntityChoiceList
2015-12-15 20:21:59 +01:00
Ben Davies
54bbade3e6 [Form] cast IDs to match deprecated behaviour of EntityChoiceList 2015-12-15 11:02:11 +00:00
Tobias Schultze
88d586b447 Merge branch '2.3' into 2.7 2015-12-15 02:31:17 +01:00
Tobias Schultze
b178e6804b minor #16698 [PropertyAccessor] A little refactor (aivus)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #16698).

Discussion
----------

[PropertyAccessor] A little refactor

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

 - Remove obsolete code
 - Remove excessive actions
 - Fix phpdoc & comments

Commits
-------

457b3f0 [PropertyAccessor] A little refactor  - Remove obsolete code  - Remove excessive actions  - Fix phpdoc & comments
2015-12-15 02:27:15 +01:00
Ilya Antipenko
457b3f0047 [PropertyAccessor] A little refactor
- Remove obsolete code
 - Remove excessive actions
 - Fix phpdoc & comments
2015-12-15 02:27:13 +01:00
Tobias Schultze
b23c9a3b5b minor #16839 [PropertyAccess] minor: constants as internal and removed unused var (dunglas)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16839).

Discussion
----------

[PropertyAccess] minor: constants as internal and removed unused var

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

Commits
-------

6c9bb86 [PropertyAccess] minor: constants as internal and removed unused var
2015-12-15 02:21:41 +01:00
Kévin Dunglas
6c9bb86b47 [PropertyAccess] minor: constants as internal and removed unused var 2015-12-15 02:21:26 +01:00