Commit Graph

19487 Commits

Author SHA1 Message Date
Peter Rehm
3716f4c138 Removed unneeded version requirements 2015-01-07 11:23:40 +01:00
Fabien Potencier
154e442f47 updated CHANGELOG for 2.3.24 2015-01-07 11:21:38 +01:00
Fabien Potencier
21b27c6be9 fixed tests 2015-01-07 11:18:33 +01:00
Fabien Potencier
c076ba8a9a bug #13286 [Security] Don't destroy the session on buggy php releases. (derrabus)
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.
2015-01-07 09:13:08 +01:00
Alexander M. Turek
5d0b527dea [Security] Don't destroy the session on buggy php releases. 2015-01-07 09:13:06 +01:00
Mikael Pajunen
4e941e3d2d [Process] Fix input reset in WindowsPipes
Unsetting the input property causes an E_NOTICE error when the
property is checked on line 249 (and is likely unintentional anyway).
2015-01-07 00:47:52 +02:00
Fabien Potencier
eabc9b8901 Merge branch '2.5' into 2.6
* 2.5:
  [WIP] Made help information of commands more consistent
  Made help information consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
2015-01-06 18:50:02 +01:00
Fabien Potencier
a9fd4022e7 minor #13238 [2.6] Made help information of commands more consistent (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Made help information of commands more consistent

Just like https://github.com/symfony/symfony/pull/13231, but then for commands added in 2.6

Commits
-------

57b08e4 Made CLI help consistent
2015-01-06 18:42:55 +01:00
Fabien Potencier
111a88c042 minor #13239 [2.5] Made help information of commands more consistent (WouterJ)
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
2015-01-06 18:42:03 +01:00
Fabien Potencier
cbcd0f42d7 Merge branch '2.3' into 2.5
* 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
2015-01-06 18:40:45 +01:00
Fabien Potencier
515a3ed07e minor #13231 [WIP] Made help information of commands more consistent (WouterJ)
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
2015-01-06 18:30:00 +01:00
WouterJ
602d687a46 [WIP] Made help information of commands more consistent 2015-01-06 18:29:58 +01:00
Peter Thompson
afe827ae9c Merge pull request #2 from larowlan/patch-2
Add comment as requested - see comment for stof
2015-01-06 14:34:58 +01:00
Lee Rowlands
a0ec0fe402 Add comment as requested 2015-01-06 19:37:09 +10:00
Peter Thompson
1e0633edfc Merge pull request #1 from larowlan/patch-1
Remove duplicate 'require' for symfony/symfony PR
2015-01-06 10:10:41 +01:00
Fabien Potencier
ed2e6b70d1 minor #13274 [2.6] Added internal annotation on Descriptor classes (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Added internal annotation on Descriptor classes

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

Commits
-------

6776ab3 [2.6] Added internal annotation on Descriptor classes
2015-01-06 07:49:44 +01:00
Lee Rowlands
81a8090dde Remove duplicate 'require' 2015-01-06 14:18:13 +10:00
Saro0h
6776ab36e3 [2.6] Added internal annotation on Descriptor classes 2015-01-05 22:39:05 +01:00
Fabien Potencier
a7fd55a7d3 Merge branch '2.5' into 2.6
* 2.5:
  [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
  use Table instead of the deprecated TableHelper

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
2015-01-05 21:59:13 +01:00
Fabien Potencier
e3ca5165c6 Merge branch '2.3' into 2.5
* 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
2015-01-05 21:58:03 +01:00
Fabien Potencier
f77bfaa38c minor #13273 [2.6][FrameworkBundle] use Table instead of the deprecated TableHelper (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][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        |

Changes on top of #12970 for the `2.6` branch.

Commits
-------

0bcb594 use Table instead of the deprecated TableHelper
2015-01-05 21:57:25 +01:00
Fabien Potencier
1201853b55 minor #13272 [2.3] fix failing test (nicolas-grekas)
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
2015-01-05 21:55:16 +01:00
Christian Flothmann
0bcb59414e use Table instead of the deprecated TableHelper 2015-01-05 21:17:59 +01:00
Nicolas Grekas
064799a146 [2.3] fix failing test 2015-01-05 20:37:56 +01:00
Fabien Potencier
e11f8b4934 minor #12970 [FrameworkBundle] use Table instead of the deprecated TableHelper (xabbuh)
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
2015-01-05 19:46:33 +01:00
Fabien Potencier
966ac2d066 minor #13271 [2.6] fix deprecation silencing... (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] fix deprecation silencing...

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

My bad...

Commits
-------

57fddbf [2.6] fix deprecation silencing...
2015-01-05 18:58:26 +01:00
Fabien Potencier
3b0db95cc8 Merge branch '2.5' into 2.6
* 2.5:
  [Form] fix Context\ExecutionContextInterface mock
  [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
2015-01-05 18:57:42 +01:00
Fabien Potencier
987717e40b minor #13268 [Form] fix Context\ExecutionContextInterface mock (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Form] fix Context\ExecutionContextInterface mock

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

Proper mock creation should fix tests on 2.6 once merged.

Commits
-------

d79aa70 [Form] fix Context\ExecutionContextInterface mock
2015-01-05 18:57:23 +01:00
Nicolas Grekas
57fddbf9b7 [2.6] fix deprecation silencing... 2015-01-05 18:41:06 +01:00
Nicolas Grekas
d79aa70edd [Form] fix Context\ExecutionContextInterface mock 2015-01-05 18:29:33 +01:00
Fabien Potencier
b6dadf4e18 minor #13242 CS: add missing param names to @param annotation (xabbuh)
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
2015-01-05 15:41:15 +01:00
Fabien Potencier
f7d489ef61 fixed typo 2015-01-05 15:38:29 +01:00
Fabien Potencier
190d00cb48 minor #13215 Improve the composer root version setting on Travis (stof)
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
2015-01-05 15:37:49 +01:00
Fabien Potencier
1f13517347 minor #13237 [2.5] [Validator] marks TraversalStrategy::STOP_RECURSION constant internal (hhamon)
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.
2015-01-05 15:36:28 +01:00
Fabien Potencier
12d8261d21 Merge branch '2.5' into 2.6
* 2.5:
  [2.5] cleanup deprecated uses
2015-01-05 15:28:40 +01:00
Fabien Potencier
9d4bab0cd2 minor #13254 [2.6] cleanup deprecated uses (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] cleanup deprecated uses

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

I wish again we could find a way to make deprecation authors do this job.
This is especially visible here: trying to use the new factory declaration enlightens holes in the implementation.

Commits
-------

2856cae [2.6] cleanup deprecated uses
2015-01-05 15:28:02 +01:00
Fabien Potencier
22885d82d7 minor #13243 [2.5] cleanup deprecated uses (nicolas-grekas)
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
2015-01-05 15:26:33 +01:00
Peter Thompson
3760e67cb2 [Yaml] Improve YAML boolean escaping
- Moves dumping single-quoting logic into Yaml\Escaper
- Ensures that PHP values which would be interpreted as booleans in
  older versions of the YAML spec are escaped with single quotes when
  dumped by the Dumper.
2015-01-05 12:50:08 +01:00
Nicolas Grekas
2856caed2f [2.6] cleanup deprecated uses 2015-01-05 09:56:52 +01:00
Nicolas Grekas
237c315144 [2.5] cleanup deprecated uses 2015-01-05 09:51:41 +01:00
Fabien Potencier
b4c1e898c0 minor #13245 [2.3] missing cleanup for legacy test (nicolas-grekas)
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
2015-01-04 19:21:09 +01:00
Fabien Potencier
bd8ff04506 minor #13240 Escape annotations in comments (cmfcmf)
This PR was merged into the 2.3 branch.

Discussion
----------

Escape annotations in comments

| Q             | A
| ------------- | ---
| Fixed tickets | ---
| Referenced tickets | #13089
| License       | MIT

Commits
-------

0cb17f3 Escape annotations in comments, refs #13089.
2015-01-04 19:18:18 +01:00
cmfcmf
0cb17f3dd2 Escape annotations in comments, refs #13089. 2015-01-04 19:14:50 +01:00
Fabien Potencier
a054bede9f minor #13244 [Debug] fix test (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] fix test

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

My bad, I missed this one.

Commits
-------

a2435a7 [Debug] fix test
2015-01-04 19:08:19 +01:00
Nicolas Grekas
7e929ab162 [2.3] missing cleanup for legacy test 2015-01-04 16:10:38 +01:00
Nicolas Grekas
a2435a78e3 [Debug] fix test 2015-01-04 15:59:17 +01:00
Christian Flothmann
665825b038 add missing param names to @param annotation 2015-01-04 15:17:53 +01:00
Hugo Hamon
583fee4d2d [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0. 2015-01-04 13:49:58 +01:00
Fabien Potencier
de14c14daf minor #13199 [Debug] split tests for deprecated interfaces (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] split tests for deprecated interfaces

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

Splitting tests for deprecated interfaces in "Legacy" prefixed test classes/methods should be done for every component.
Let's start by this simple one. To anyone: help welcomed for the other components.

Commits
-------

3a18cc6 [Debug] split tests for deprecated interfaces
2015-01-04 13:31:37 +01:00
Christian Flothmann
1c4a75a00a add back model_timezone and view_timezone options 2015-01-04 13:18:24 +01:00