* 3.0:
Clean EOL whitespace
[travis] Fix
[Routing] Reduce memory usage of a high consuming test case
use requires annotation
skip bcrypt tests on incompatible platforms
* 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
* 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
* 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
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
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
* 3.0:
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
* 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
* 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
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
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
This PR was merged into the 3.1-dev branch.
Discussion
----------
Fix typo in changelog
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #17084
| License | MIT
| Doc PR | -
Create separate PR as requested in [OptionsResolver PR](https://github.com/symfony/symfony/pull/17032)
Commits
-------
6508b3d Fix typo in changelog
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
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
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.
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.
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
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
* 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
* 3.0:
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]
simplify debug error_reporting levels given php version > 5.3
Fix wrong method name mapping in UPGRADE-3.0.md
Use correct height for clearer
[Validator] fixed raising violations to a maximum of one
* 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
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:
Commits
-------
2e158df [Console] Avoid extra blank lines when rendering exceptions
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
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
