Commit Graph

23232 Commits

Author SHA1 Message Date
Nicolas Grekas d94c322272 Merge branch '2.7' into 2.8
* 2.7:
  [ci] Force update of ./phpunit deps
  [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false
  [Process] Don't catch RuntimeException when it complicates tests debugging
  [appveyor] Workaround transient segfault when APCu is enabled
2015-11-28 10:05:52 +01:00
Nicolas Grekas 60b02fcc97 Merge branch '2.3' into 2.7
* 2.3:
  [ci] Force update of ./phpunit deps
  [Process] Don't catch RuntimeException when it complicates tests debugging
  [appveyor] Workaround transient segfault when APCu is enabled
2015-11-28 10:05:32 +01:00
Nicolas Grekas 59b782a200 [ci] Force update of ./phpunit deps 2015-11-28 10:05:13 +01:00
Tobias Schultze cdfae4f8a9 minor #16717 [PhpUnitBridge] fix typo (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[PhpUnitBridge] fix typo

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

Commits
-------

1cec08b [PhpUnitBridge] fix typo
2015-11-28 03:32:59 +01:00
Christian Flothmann 1cec08b844 [PhpUnitBridge] fix typo 2015-11-27 23:51:43 +01:00
Nicolas Grekas d628d925c1 bug #16685 [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false

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

Commits
-------

1179f07 [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false
2015-11-27 23:37:53 +01:00
Nicolas Grekas 342786aa8f feature #16709 [Bridge\PhpUnit] Display the stack trace of a deprecation on-demand (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Bridge\PhpUnit] Display the stack trace of a deprecation on-demand

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

This PR has been essential into making #16708, and I think everyone working on a 3.0 migration will need this.

Example:

```
$ SYMFONY_DEPRECATIONS_HELPER=/FormExtensionBootstrap3LayoutTest/ ./phpunit src/Symfony/Bridge/Twig/
PHPUnit 4.8.18 by Sebastian Bergmann and contributors.

Testing src/Symfony/Bridge/Twig/
................................................
Remaining deprecation triggered by Symfony\Bridge\Twig\Tests\Extension\FormExtensionBootstrap3LayoutTest::testSingleChoiceGrouped:
The value "false" for the "choices_as_values" option is deprecated since version 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.
Stack trace:
#0 src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php(286): trigger_error()
#1 src/Symfony/Component/OptionsResolver/OptionsResolver.php(962): Symfony\Component\Form\Extension\Core\Type\ChoiceType->Symfony\Component\Form\Extension\Core\Type\{closure}()
#2 src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php(277): Symfony\Component\OptionsResolver\OptionsResolver->offsetGet()
#3 src/Symfony/Component/OptionsResolver/OptionsResolver.php(962): Symfony\Component\Form\Extension\Core\Type\ChoiceType->Symfony\Component\Form\Extension\Core\Type\{closure}()
#4 src/Symfony/Component/OptionsResolver/OptionsResolver.php(791): Symfony\Component\OptionsResolver\OptionsResolver->offsetGet()
#5 src/Symfony/Component/Form/ResolvedFormType.php(156): Symfony\Component\OptionsResolver\OptionsResolver->resolve()
#6 src/Symfony/Component/Form/FormFactory.php(119): Symfony\Component\Form\ResolvedFormType->createBuilder()
#7 src/Symfony/Component/Form/FormFactory.php(48): Symfony\Component\Form\FormFactory->createNamedBuilder()
#8 src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php(540): Symfony\Component\Form\FormFactory->createNamed()
#9 [internal function]: Symfony\Component\Form\Tests\AbstractBootstrap3LayoutTest->testSingleChoiceGrouped()
#10 {main}
KO src/Symfony/Bridge/Twig/
```

Commits
-------

5a88fb6 [Bridge\PhpUnit] Display the stack trace of a deprecation on-demand
2015-11-27 23:34:17 +01:00
Nicolas Grekas 5a88fb619f [Bridge\PhpUnit] Display the stack trace of a deprecation on-demand 2015-11-27 17:34:29 +01:00
Nicolas Grekas fad3d38e95 bug #16704 [Form+SecurityBundle] Trigger deprecation for csrf_provider+intention options (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form+SecurityBundle] Trigger deprecation for csrf_provider+intention options

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

ping @stof

Commits
-------

62eba7c [Form+SecurityBundle] Trigger deprecation for csrf_provider+intention options
2015-11-27 15:37:15 +01:00
Bernhard Schussek 1179f0727b [Form] Fixed: Duplicate choice labels are remembered when using "choices_as_values" = false 2015-11-27 15:25:47 +01:00
Nicolas Grekas de08816caa Merge branch '2.7' into 2.8
* 2.7:
  [Form] Fix missing choices_as_values=true in tests

Conflicts:
	src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
	src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
2015-11-27 15:19:27 +01:00
Nicolas Grekas f84beb449c minor #16708 [Form] Fix missing choices_as_values=true in tests (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix missing choices_as_values=true in tests

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

Commits
-------

2a16e87 [Form] Fix missing choices_as_values=true in tests
2015-11-27 15:13:55 +01:00
Nicolas Grekas 2a16e87aec [Form] Fix missing choices_as_values=true in tests 2015-11-27 14:50:51 +01:00
Nicolas Grekas 62eba7c426 [Form+SecurityBundle] Trigger deprecation for csrf_provider+intention options 2015-11-27 13:22:26 +01:00
Nicolas Grekas 4e73e1a436 minor #16702 [Process] Don't catch RuntimeException when it complicates tests debugging (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Don't catch RuntimeException when it complicates tests debugging

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

See https://github.com/symfony/symfony/pull/16702/files?w=1

Commits
-------

8588a4f [Process] Don't catch RuntimeException when it complicates tests debugging
2015-11-27 12:58:28 +01:00
Nicolas Grekas 9610602ab5 feature #16706 [HttpFoundation] Deprecate $deep parameter on ParameterBag (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] Deprecate $deep parameter on ParameterBag

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

Commits
-------

f4f082e [HttpFoundation] Deprecate $deep parameter on ParameterBag
2015-11-27 12:57:36 +01:00
Nicolas Grekas f4f082ee6d [HttpFoundation] Deprecate $deep parameter on ParameterBag 2015-11-27 12:03:19 +01:00
Fabien Potencier 78ff9dc515 Merge branch '2.7' into 2.8
* 2.7:
  [Form] Deprecated setting "choices_as_values" to "false"
2015-11-27 11:16:11 +01:00
Fabien Potencier ff582b8ac9 bug #16705 [Form] Deprecated setting "choices_as_values" to "false" (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Deprecated setting "choices_as_values" to "false"

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

This is #16681 for 2.7, i.e. without the deprecations trigger

Commits
-------

3ab8189 [Form] Deprecated setting "choices_as_values" to "false"
2015-11-27 11:12:39 +01:00
Bernhard Schussek 3ab8189080 [Form] Deprecated setting "choices_as_values" to "false" 2015-11-27 10:37:24 +01:00
Fabien Potencier b29691067d feature #16690 [Form] Deprecated ArrayKeyChoiceList (webmozart)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Deprecated ArrayKeyChoiceList

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

Commits
-------

5386752 [Form] Deprecated ArrayKeyChoiceList
2015-11-27 10:03:43 +01:00
Fabien Potencier 6dacdc4ebd feature #16687 [Form] Deprecated TimezoneType::getTimezones() (webmozart)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Deprecated TimezoneType::getTimezones()

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

This method is useless as of https://github.com/symfony/symfony/pull/16681. It needs to be deprecated before we can remove it since it is public.

Commits
-------

41df3fc [Form] Deprecated TimezoneType::getTimezones()
2015-11-27 10:01:47 +01:00
Fabien Potencier ab5efa7309 bug #16681 [Form] Deprecated setting "choices_as_values" to "false" (webmozart)
This PR was submitted for the 2.7 branch but it was merged into the 2.8 branch instead (closes #16681).

Discussion
----------

[Form] Deprecated setting "choices_as_values" to "false"

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

This PR does two important things that were forgot in the 2.7 branch:

* The value `false` of the `choices_as_values` option was deprecated, but the deprecation error was missing. This error was added now. The option should be set to `true`, the entries of the corresponding `choices` option should be flipped. In 2.8, the `choices_as_values` option will be deprecated entirely.

* When setting `choices_as_values` to `true`, the generated HTML values of choices always fell back to `0`, `1`, …, even when the choices can be converted to duplicate-free strings. This is fixed now: The HTML values now equal the string cast of the choices whenever possible to match the <2.7 behavior.

Commits
-------

5d7678e [Form] Deprecated setting "choices_as_values" to "false"
2015-11-27 10:00:18 +01:00
Bernhard Schussek 5d7678e432 [Form] Deprecated setting "choices_as_values" to "false" 2015-11-27 10:00:10 +01:00
Nicolas Grekas 8588a4f63b [Process] Don't catch RuntimeException when it complicates tests debugging 2015-11-27 09:37:23 +01:00
Nicolas Grekas f8a7ddb9f8 minor #16684 [appveyor] Workaround transient segfault when APCu is enabled (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Workaround transient segfault when APCu is enabled

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

See e.g. https://ci.appveyor.com/project/nicolas-grekas/symfony/build/1.0.4#L1186

Commits
-------

12a152b [appveyor] Workaround transient segfault when APCu is enabled
2015-11-27 09:29:25 +01:00
Fabien Potencier 5de9c354dd Merge branch '2.7' into 2.8
* 2.7:
  Fixed the wrong source name and the ja translation
  [Debug] fix readme: DebugClassLoader moved to debug itself
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset
  [Form] Disabled view data validation if "data_class" is set to null
  [HttpFoundation] Workaround HHVM rewriting HTTP response line
2015-11-27 06:45:55 +01:00
Fabien Potencier d65b92469e Merge branch '2.3' into 2.7
* 2.3:
  Fixed the wrong source name and the ja translation
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset
2015-11-27 06:41:56 +01:00
Fabien Potencier 12e63398fe minor #16700 Fixed the wrong source name and the ja translation (hainey)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16700).

Discussion
----------

Fixed the wrong source name and the ja translation

Commits
-------

90f3b94 Fixed the wrong source name and the ja translation
2015-11-27 06:41:09 +01:00
hainey 90f3b941d3 Fixed the wrong source name and the ja translation 2015-11-27 06:41:08 +01:00
Fabien Potencier 82b6ec192b bug #16695 [SecurityBundle] disable the init:acl command if ACL is not used (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] disable the init:acl command if ACL is not used

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

Related to #16694 but this should go in 2.3 IMO because it was just forgotten. The other acl command already has this logic: https://github.com/symfony/symfony/blob/2.7/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php#L36

It ensures the command list is not flooded with unusable commands.

Commits
-------

55f84a3 [SecurityBundle] disable the init:acl command if ACL is not used
2015-11-26 21:09:40 +01:00
Fabien Potencier 98f827beab minor #16664 [Debug] fix readme: DebugClassLoader moved to debug itself (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] fix readme: DebugClassLoader moved to debug itself

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/16663#discussion_r45866385
| License       | MIT
| Doc PR        | -

Commits
-------

123a300 [Debug] fix readme: DebugClassLoader moved to debug itself
2015-11-26 21:07:32 +01:00
Tobias Schultze 123a300ad7 [Debug] fix readme: DebugClassLoader moved to debug itself 2015-11-26 21:02:12 +01:00
Tobias Schultze 55f84a3369 [SecurityBundle] disable the init:acl command if ACL is not used 2015-11-26 20:19:29 +01:00
Fabien Potencier fd140fc045 minor #16691 [DI] remove useless condition around unset (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[DI] remove useless condition around unset

| 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

Commits
-------

478375d [DI] remove useless condition around unset
2015-11-26 19:04:30 +01:00
Fabien Potencier 402d474a96 bug #16677 [Form] Fixed wrong usages of the "text" type (webmozart)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fixed wrong usages of the "text" type

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

Commits
-------

9149622 [Form] Fixed wrong usages of the "text" type
2015-11-26 18:59:59 +01:00
Tobias Schultze 478375d664 [DI] remove useless condition around unset 2015-11-26 18:53:25 +01:00
Bernhard Schussek 5386752bf9 [Form] Deprecated ArrayKeyChoiceList 2015-11-26 18:38:25 +01:00
Fabien Potencier 99c05b3fc4 bug #16679 [Form] Disabled view data validation if "data_class" is set to null (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Disabled view data validation if "data_class" is set to null

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

After this PR, Form::setData() does not validate the view data anymore when "data_class" is set to `null`. This way it is possible to create fields with dynamic view data types (see #14877).

Commits
-------

f495410 [Form] Disabled view data validation if "data_class" is set to null
2015-11-26 18:18:04 +01:00
Bernhard Schussek 41df3fce32 [Form] Deprecated TimezoneType::getTimezones() 2015-11-26 18:08:26 +01:00
Fabien Potencier 14f70aeafd bug #16621 [Console] Fix bug with $output overloading (WouterJ)
This PR was squashed before being merged into the 2.8 branch (closes #16621).

Discussion
----------

[Console] Fix bug with $output overloading

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony-standard/issues/887, #16622
| License       | MIT
| Doc PR        | -

This is exactly why variable overloading isn't a great idea :)

Commits
-------

5764a00 [Console] Fix bug with  overloading
2015-11-26 17:44:52 +01:00
Wouter J 5764a00a76 [Console] Fix bug with overloading 2015-11-26 17:44:51 +01:00
Bernhard Schussek 91496229ab [Form] Fixed wrong usages of the "text" type 2015-11-26 17:29:22 +01:00
Nicolas Grekas 12a152b666 [appveyor] Workaround transient segfault when APCu is enabled 2015-11-26 16:12:01 +01:00
Nicolas Grekas a58df11244 feature #16601 [Security] Deprecate "AbstractVoter" in favor of "Voter" (nicolas-grekas, lyrixx)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Deprecate "AbstractVoter" in favor of "Voter"

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

Commits
-------

fd8b87c [Security] Deprecate "AbstractVoter" in favor of "Voter"
d3c6d93 [Security] Revert changes made between 2.7 and 2.8-beta
2015-11-26 15:48:43 +01:00
Nicolas Grekas 0a40b543e4 Merge branch '2.3' into 2.7
* 2.3:
  [HttpFoundation] Workaround HHVM rewriting HTTP response line

Conflicts:
	src/Symfony/Component/HttpFoundation/Response.php
2015-11-26 10:20:19 +01:00
Nicolas Grekas 5f93188dc0 bug #16676 [HttpFoundation] Workaround HHVM rewriting HTTP response line (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Workaround HHVM rewriting HTTP response line

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

Commits
-------

5013f98 [HttpFoundation] Workaround HHVM rewriting HTTP response line
2015-11-26 10:19:28 +01:00
Bernhard Schussek f495410d25 [Form] Disabled view data validation if "data_class" is set to null 2015-11-26 10:11:54 +01:00
Nicolas Grekas da43309f07 Merge branch '2.7' into 2.8
* 2.7:
  Always enable clock-mock for HttpFoundation
  [ClassLoader] Fix parsing namespace when token_get_all() is missing
  Bug #16343 [Router] Too many Routes ?
  [Debug] Ensure class declarations are loaded only once
2015-11-26 08:00:59 +01:00
Nicolas Grekas d1a50a2b61 Merge branch '2.3' into 2.7
* 2.3:
  Always enable clock-mock for HttpFoundation
  [ClassLoader] Fix parsing namespace when token_get_all() is missing
  Bug #16343 [Router] Too many Routes ?
2015-11-26 08:00:48 +01:00