Commit Graph

24114 Commits

Author SHA1 Message Date
Nicolas Grekas
eb51f79fe0 Merge branch '2.8' into 3.0
* 2.8:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms
2015-12-22 14:05:22 +01:00
Nicolas Grekas
352049c505 Merge branch '2.7' into 2.8
* 2.7:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms
2015-12-22 14:04:57 +01:00
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
d1fa59d486 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [SecurityBundle] Removing test insulations for a huge perf win
  [Validator] Use the new interface in the README
  [Validator] Add missing pt_BR translation
  Fix doctrine bridge tests on older PHP versions
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
  [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition
  [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
  [Console][Table] fixed render row with multiple cells.
  [Yaml] do not remove "comments" in scalar blocks

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
	src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
2015-12-22 11:39:06 +01:00
Nicolas Grekas
6fa4d5b8f1 Merge branch '2.7' into 2.8
* 2.7:
  Fix merge
2015-12-22 11:27:54 +01:00
Nicolas Grekas
6755f87476 Fix merge 2015-12-22 11:27:42 +01:00
Nicolas Grekas
d70ff0abd4 Merge branch '2.7' into 2.8
* 2.7:
  [SecurityBundle] Removing test insulations for a huge perf win
  [Validator] Use the new interface in the README
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
  [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
  [Console][Table] fixed render row with multiple cells.
  [Yaml] do not remove "comments" in scalar blocks

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
	src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
2015-12-22 11:25:57 +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
1bc9aaa6f9 minor #17080 Fix doctrine bridge tests on older PHP versions (jakzal)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix doctrine bridge tests on older PHP versions

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

`Foo::class` constant was introduced in PHP 5.5.

Commits
-------

6c68946 Fix doctrine bridge tests on older PHP versions
2015-12-21 09:04:51 +01:00
Fabien Potencier
fb7640a679 minor #17082 [Validator] Add missing pt_BR translation (andreia)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #17082).

Discussion
----------

[Validator] Add missing pt_BR translation

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

Commits
-------

b59ea7d [Validator] Add missing pt_BR translation
2015-12-21 09:04:00 +01:00
Andreia Bohner
b59ea7da96 [Validator] Add missing pt_BR translation 2015-12-21 09:04:00 +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
Jakub Zalas
6c68946a06 Fix doctrine bridge tests on older PHP versions 2015-12-20 14:24:37 +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
422430e282 bug #16926 [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition (wahler)
This PR was squashed before being merged into the 2.8 branch (closes #16926).

Discussion
----------

[DependencyInjection] fixed definition loosing property shared when decorated by a parent definition

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

While upgrading my applications from 2.7 and 2.8 I found out that the attribute "shared" gets lost when a parent is configured. I wrote a Test to confirm my assumption and added a bugfix

Commits
-------

d3a4a77 [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition
2015-12-18 18:02:10 +01:00
Christian Wahler
d3a4a770a6 [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition 2015-12-18 18:02:00 +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
Nicolas Grekas
f9ba2cdf89 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [Form] fix BC break introduced with prototype_data option
  [Ldap] Escape carriage returns in LDAP DNs.
  Upgrade for 2.8: ContainerAware was deprecated in favour of ContainerAwareTrait [ci skip]
  Fix wrong method name mapping in UPGRADE-3.0.md
  Use correct height for clearer
  [Validator] fixed raising violations to a maximum of one

Conflicts:
	UPGRADE-2.8.md
2015-12-18 17:56:45 +01:00
Nicolas Grekas
f176156eb4 Fix merge 2015-12-18 17:54:49 +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
4c7c5ff489 bug #17044 [Form] fix BC break introduced with prototype_data option (memphys)
This PR was squashed before being merged into the 2.8 branch (closes #17044).

Discussion
----------

[Form] fix BC break introduced with prototype_data option

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

This fixes the BC break introduced with prototype_data option in collection type. At the moment whether option is set or not it overwrites prototype data but it has different behaviour before and prototype data was taken from the mapped form data/entity.

- [x] make the test work (can't figure yet how to test that prototype without prototype_data option has default values)

Commits
-------

d73485a [Form] fix BC break introduced with prototype_data option
2015-12-18 17:52:32 +01:00
Roma Lapin
d73485a821 [Form] fix BC break introduced with prototype_data option 2015-12-18 17:52:31 +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
eae9e1cedc minor #17061 Upgrade for 2.8: ContainerAware was deprecated in favour of ContainerAwareTrait (pamil)
This PR was merged into the 2.8 branch.

Discussion
----------

Upgrade for 2.8: ContainerAware was deprecated in favour of ContainerAwareTrait

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

Commits
-------

825409e Upgrade for 2.8: ContainerAware was deprecated in favour of ContainerAwareTrait [ci skip]
2015-12-18 17:39:44 +01:00
Fabien Potencier
3f8e218431 bug #16806 [Validator] BicValidator - fixed raising violations to a maximum of one (mvhirsch)
This PR was merged into the 2.8 branch.

Discussion
----------

[Validator] BicValidator - fixed raising violations to a maximum of one

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

I just found a bug while using the constraint. For example my value "a" will raise three violations at one time. I just expected to get a maximum number of one.
This PR will fix that behavior.

I do not know how I can easily add Unit-Tests for that, can someone please help me?

Commits
-------

7860bb4 [Validator] fixed raising violations to a maximum of one
2015-12-18 17:33:18 +01:00
Fabien Potencier
d4fff991e0 bug #16842 [Ldap] Escape carriage returns in LDAP DNs. (ChadSikorra)
This PR was squashed before being merged into the 2.8 branch (closes #16842).

Discussion
----------

[Ldap] Escape carriage returns in LDAP DNs.

Depends upon this commit in polyfill: https://github.com/symfony/polyfill/pull/14

| 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

Carriage returns are supposed to be escaped in a LDAP DN. Leading and trailing spaces should be encoded as well. The spaces were taken care of in the polyfill implementation of `ldap_escape`, but the actual PHP function doesn't do the same. So I moved that logic within the component function and removed it from the polyfill function.

Commits
-------

2243db4 [Ldap] Escape carriage returns in LDAP DNs.
2015-12-18 17:29:00 +01:00
Chad Sikorra
2243db49b8 [Ldap] Escape carriage returns in LDAP DNs. 2015-12-18 17:28:57 +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
1ccdf663e6 minor #16916 [Debug] simplify error_reporting levels given php version > 5.3 (Tobion)
This PR was merged into the 3.0 branch.

Discussion
----------

[Debug] simplify error_reporting levels given php version > 5.3

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

Since PHP 5.4 `E_ALL` contains `E_STRICT`. This allows us to simplify and clean up some code.

Commits
-------

b1c774f simplify debug error_reporting levels given php version > 5.3
2015-12-18 17:22:11 +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
ff7cd633e9 minor #16892 [2.8] Use correct height for toolbar clearer (WouterJ)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] Use correct height for toolbar clearer

The toolbar is 36px heigh, while the clearer is set at 38px. This means that there is 2px between the end of the page and the toolbar. This is especially not nice when the footer has a dark color (it renders a 2px white line between toolbar and footer).

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

Commits
-------

1a9c0bc Use correct height for clearer
2015-12-18 17:11:40 +01:00
Fabien Potencier
5529dfc31a minor #16903 Fix wrong method name mapping in UPGRADE-3.0.md (mheki)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix wrong method name mapping in UPGRADE-3.0.md

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

Commits
-------

2765088 Fix wrong method name mapping in UPGRADE-3.0.md
2015-12-18 17:09:34 +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