Commit Graph

19795 Commits

Author SHA1 Message Date
Fabien Potencier
f7fcefa58e added missing support for factories in console descriptions 2015-01-07 22:27:32 +01:00
Fabien Potencier
4308bd8635 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fixed missing information in some descriptors
2015-01-07 22:10:49 +01:00
Fabien Potencier
b5c2600f5c bug #13305 [FrameworkBundle] fixed missing information in some descriptors (fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fixed missing information in some descriptors

| 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

Commits
-------

530af5c [FrameworkBundle] fixed missing information in some descriptors
2015-01-07 22:10:05 +01:00
Fabien Potencier
530af5c009 [FrameworkBundle] fixed missing information in some descriptors 2015-01-07 18:56:38 +01:00
Fabien Potencier
0577065abd Merge branch '2.6' into 2.7
* 2.6:
  bumped Symfony version to 2.6.4
  updated VERSION for 2.6.3
  updated CHANGELOG for 2.6.3
  bumped Symfony version to 2.6.3
  updated VERSION for 2.6.2
  updated CHANGELOG for 2.6.2
  bumped Symfony version to 2.5.10
  updated VERSION for 2.5.9
  updated CHANGELOG for 2.5.9
  [FrameworkBundle] Use security.token_storage service in Controller::getUser()
  bumped Symfony version to 2.3.25
  updated VERSION for 2.3.24
  update CONTRIBUTORS for 2.3.24
  Removed unneeded version requirements
  updated CHANGELOG for 2.3.24
  fixed tests
  [Security] Don't destroy the session on buggy php releases.
  [Process] Fix input reset in WindowsPipes
  add back model_timezone and view_timezone options

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-01-07 16:58:19 +01:00
Fabien Potencier
d00a43554c bumped Symfony version to 2.6.4 2015-01-07 16:48:51 +01:00
Fabien Potencier
c34ef41801 updated VERSION for 2.6.3 2015-01-07 15:47:29 +01:00
Fabien Potencier
336ded2e22 updated CHANGELOG for 2.6.3 2015-01-07 15:47:22 +01:00
Fabien Potencier
75f970618d bumped Symfony version to 2.6.3 2015-01-07 15:32:02 +01:00
Fabien Potencier
48b6210b1f Merge branch '2.5' into 2.6
* 2.5:
  bumped Symfony version to 2.5.10
  updated VERSION for 2.5.9
  updated CHANGELOG for 2.5.9
  bumped Symfony version to 2.3.25
  updated VERSION for 2.3.24
  update CONTRIBUTORS for 2.3.24
  Removed unneeded version requirements
  updated CHANGELOG for 2.3.24
  fixed tests
  [Security] Don't destroy the session on buggy php releases.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-01-07 15:31:37 +01:00
Fabien Potencier
bfd8e11441 updated VERSION for 2.6.2 2015-01-07 15:05:59 +01:00
Fabien Potencier
5b72ea5de6 updated CHANGELOG for 2.6.2 2015-01-07 15:04:20 +01:00
Fabien Potencier
8a168a31b6 feature #13241 [Form] add back model_timezone and view_timezone options (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] add back model_timezone and view_timezone options

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13224
| License       | MIT
| Doc PR        | TODO (deprecate the `model_timezone` and `view_timezone` options)

This reverts #12404.

Commits
-------

1c4a75a add back model_timezone and view_timezone options
2015-01-07 14:18:11 +01:00
Fabien Potencier
dece1e0ee0 minor #13279 Enhance deprecation summary at end of tests (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Enhance deprecation summary at end of tests

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

Splits deprecations triggered by legacy tests and non-legacy ones.

Commits
-------

7b8cf01 Enhance deprecation summary at end of tests
2015-01-07 14:13:42 +01:00
Fabien Potencier
b3a55fe3f6 bumped Symfony version to 2.5.10 2015-01-07 14:02:53 +01:00
Fabien Potencier
0ec852d79f added a relative_path Twig function 2015-01-07 13:33:01 +01:00
Fabien Potencier
e082a9f28e updated VERSION for 2.5.9 2015-01-07 13:32:08 +01:00
Fabien Potencier
59000ae8f1 updated CHANGELOG for 2.5.9 2015-01-07 13:30:42 +01:00
Fabien Potencier
77b68b366c bug #13297 [Process] Fix input reset in WindowsPipes (mpajunen)
This PR was merged into the 2.6 branch.

Discussion
----------

[Process] Fix input reset in WindowsPipes

| 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

Unsetting the input property causes an E_NOTICE error when the
property is checked on line 249 (and is likely unintentional anyway).

Commits
-------

4e941e3 [Process] Fix input reset in WindowsPipes
2015-01-07 13:29:00 +01:00
Fabien Potencier
be0c3125d9 minor #13214 [FrameworkBundle] Use security.token_storage service in Controller::getUser() (xelaris)
This PR was squashed before being merged into the 2.6 branch (closes #13214).

Discussion
----------

[FrameworkBundle] Use security.token_storage service in Controller::getUser()

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

Replace deprecated `security.context` with `security.token_storage` service.

Commits
-------

f46ce9c [FrameworkBundle] Use security.token_storage service in Controller::getUser()
2015-01-07 13:28:03 +01:00
Alexander Schwenn
f46ce9cebb [FrameworkBundle] Use security.token_storage service in Controller::getUser() 2015-01-07 13:28:00 +01:00
Fabien Potencier
686015da73 Merge branch '2.3' into 2.5
* 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
2015-01-07 13:26:05 +01:00
Fabien Potencier
1b39930dad bumped Symfony version to 2.3.25 2015-01-07 12:12:24 +01:00
Fabien Potencier
5b2c33be25 updated VERSION for 2.3.24 2015-01-07 11:32:09 +01:00
Fabien Potencier
b74037792f update CONTRIBUTORS for 2.3.24 2015-01-07 11:31:01 +01:00
Fabien Potencier
3e02ca23de minor #13303 Removed unneeded version requirements (peterrehm)
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
2015-01-07 11:30:36 +01:00
Fabien Potencier
07ec37cf7c added missing E_USER_DEPRECATED argument to trigger_error() calls 2015-01-07 11:29:42 +01:00
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
Fabien Potencier
37601dda2c feature #13252 [Serializer] Refactoring and object_to_populate support. (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Refactoring and object_to_populate support.

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

This PR is mainly a refactoring. It move up the common code of `PorpertyNormalizer` and `GetSetMethodNormalizer` into `AbstractNormalizer`.

It also adds a news feature: the ability to use an existing object instance for denormalization:

```php
$dummy = new GetSetDummy();
$dummy->setFoo('foo');

$obj = $this->normalizer->denormalize(
    array('bar' => 'bar'),
    'GetSetDummy',
     null,
     array('object_to_populate' => $dummy)
);

// $obj and $dummy are references to the same object
```

Commits
-------

b5990be [Serializer] Refactoring and object_to_populate support.
2015-01-07 09:02:39 +01:00
Fabien Potencier
16b5614630 feature #13255 [Serializer] Add circular reference handling to the PropertyNormalizer (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Add circular reference handling to the PropertyNormalizer

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

Move circular references handling to `AbstractNormalizer` and use it in `PropertyNormalizer`.

Commits
-------

fbc9335 [Serializer] Add circular reference handling to the PropertyNormalizer
2015-01-07 09:01:42 +01:00
Fabien Potencier
9841a92d7a minor #13292 [2.7] silence deprecations for getFactory*() BC layer (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] silence deprecations for getFactory*() BC layer

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

From 150k to 5k notices

Commits
-------

998dedf [2.7] silence deprecations for getFactory*() BC layer
2015-01-07 08:57:15 +01:00
Nicolas Grekas
7b8cf01f6b Enhance deprecation summary at end of tests 2015-01-07 08:47:19 +01:00
Nicolas Grekas
998dedf788 [2.7] silence deprecations for getFactory*() BC layer 2015-01-07 08:44:59 +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
2b7a150c00 Merge branch '2.6' into 2.7
* 2.6:
  [WIP] Made help information of commands more consistent
  [2.6] Added internal annotation on Descriptor classes
  Made CLI help consistent
  Made help information consistent
2015-01-06 18:50:09 +01: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
Fabien Potencier
b009902f90 minor #13280 [HttpKernel] deprecated ContainerAwareHttpKernel (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] deprecated ContainerAwareHttpKernel

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

In Symfony 3.0, the `request` scope will be removed as the `request` is not a service anymore. So, the `ContainerAwareHttpKernel` should be deprecated now as it won't be needed anymore in 3.0. I've moved the only line of code that is still relevant in `HttpKernel` directly.

Note that I did not trigger a deprecation notice as the class is still used in Symfony 2.7.

Commits
-------

0c50301 [HttpKernel] deprecated ContainerAwareHttpKernel
2015-01-06 13:02:23 +01:00
Fabien Potencier
f3b72e4c72 feature #13259 Deprecate the translator implementation in the Validator component (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Deprecate the translator implementation in the Validator component

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

The Translation component already provides an implementation which only deals with replacing parameters in the message without translating it.
Duplicating the logic in the Validator component is not needed (and it is the wrong place for it).

Commits
-------

c71fe0c Deprecate the translator implementation in the Validator component
2015-01-06 13:01:22 +01:00
Fabien Potencier
0c50301833 [HttpKernel] deprecated ContainerAwareHttpKernel 2015-01-06 12:18:00 +01:00
Christophe Coevoet
c71fe0c37b Deprecate the translator implementation in the Validator component
The Translation component already provides an implementation which only
deals with replacing parameters in the message without translating it.
Duplicating the logic in the Validator component is not needed (and it
is the wrong place for it).
2015-01-06 12:08:07 +01:00