* 2.3:
bumped Symfony version to 2.3.25
updated VERSION for 2.3.24
update CONTRIBUTORS for 2.3.24
updated CHANGELOG for 2.3.24
fixed tests
[Security] Don't destroy the session on buggy php releases.
Conflicts:
src/Symfony/Component/Console/Tests/Fixtures/application_2.json
src/Symfony/Component/HttpKernel/Kernel.php
This PR was merged into the 2.5 branch.
Discussion
----------
Removed unneeded version requirements
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? |
| Fixed tickets | -
| License | MIT
| Related | #12891
As @stof has requested.
Commits
-------
3716f4c Removed unneeded version requirements
This PR was squashed before being merged into the 2.3 branch (closes#13286).
Discussion
----------
[Security] Don't destroy the session on buggy php releases.
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #13269, #13283
| License | MIT
| Doc PR | none
See #13269 for the discussion. This workaround avoids destroying the old session after login on the migrate strategy when running under a php version that we know to be broken.
Corresponding php bug: https://bugs.php.net/bug.php?id=63379
Commits
-------
5d0b527 [Security] Don't destroy the session on buggy php releases.
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5] Made help information of commands more consistent
Follow up of https://github.com/symfony/symfony/pull/13231 for commands added in 2.4 and 2.5
Commits
-------
a450d66 Made help information consistent
* 2.3:
[WIP] Made help information of commands more consistent
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Console/Tests/Fixtures/application_1.json
src/Symfony/Component/Console/Tests/Fixtures/application_2.json
This PR was squashed before being merged into the 2.3 branch (closes#13231).
Discussion
----------
[WIP] Made help information of commands more consistent
| Q | A
| --- | ---
| Test pass | Not yet
| License | MIT
| Fixed tickets | -
Commits
-------
602d687 [WIP] Made help information of commands more consistent
* 2.3:
[2.3] fix failing test
fixed typo
Escape annotations in comments, refs #13089.
[2.3] missing cleanup for legacy test
add missing param names to @param annotation
Improve the composer root version setting on Travis
This PR was merged into the 2.3 branch.
Discussion
----------
[2.3] fix failing test
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Fix failing tests on 2.3 with components=high
Commits
-------
064799a [2.3] fix failing test
This PR was merged into the 2.5 branch.
Discussion
----------
[FrameworkBundle] use Table instead of the deprecated TableHelper
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Commits
-------
c5ad74d use Table instead of the deprecated TableHelper
This PR was merged into the 2.3 branch.
Discussion
----------
CS: add missing param names to @param annotation
| Q | A
| ------------- | ---
| Fixed tickets |
| License | MIT
as stated by @stof [here](https://github.com/symfony/symfony/pull/12886#issuecomment-68626732)
Commits
-------
665825b add missing param names to @param annotation
This PR was merged into the 2.3 branch.
Discussion
----------
Improve the composer root version setting on Travis
The previous implementation was setting dev-master in all branches. This was working fine only because the dev-master branch alias was never updated in maintenance branches, and so dev-master was aliased as 2.3.x-dev in the 2.3 branch.
Commits
-------
01f7a3a Improve the composer root version setting on Travis
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5] [Validator] marks TraversalStrategy::STOP_RECURSION constant internal
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | ~
| License | MIT
| Doc PR | ~
This constant has been introduced for the BC layer and will be removed in 3.0.
Commits
-------
583fee4 [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5] cleanup deprecated uses
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
I wish deprecation authors could do this job.
Commits
-------
237c315 [2.5] cleanup deprecated uses
This PR was merged into the 2.3 branch.
Discussion
----------
[2.3] missing cleanup for legacy test
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
7e929ab [2.3] missing cleanup for legacy test
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5] Use $this->iniSet() in tests
| 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
Conversion for 2.3 was done in #13195.
Only one test in 2.5 where replacing `ini_set()` with `$this->iniSet()` was needed. Other uses were class wide and in isolated tests.
Commits
-------
6309ffd Use $this->iniSet() in tests
* 2.3:
[Filesystem] enforce umask while testing
[TwigBridge] moved fixtures into their own directory
Conflicts:
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
This PR was merged into the 2.3 branch.
Discussion
----------
[Filesystem] enforce umask while testing
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Having a predictable umask (but not the usual one) should help (TDD for #13222).
When merging in 2.5, the patch should be moved to the new `FilesystemTestCase`
Commits
-------
1e547be [Filesystem] enforce umask while testing
This PR was merged into the 2.3 branch.
Discussion
----------
[TwigBridge] moved fixtures into their own directory
Commits
-------
0b775cd [TwigBridge] moved fixtures into their own directory
This PR was merged into the 2.3 branch.
Discussion
----------
[TwigBundle] added missing @deprecated tags
The `Symfony\Bundle\TwigBundle\Extension\ActionsExtension` class has been deprecated in Symfony 2.2 but we forgot to deprecate the related classes.
Commits
-------
82f8a79 [TwigBundle] added missing @deprecated tags
