Commit Graph

23891 Commits

Author SHA1 Message Date
Fabien Potencier 7b8865bb87 bumped Symfony version to 3.0.1 2015-11-30 22:21:35 +01:00
Fabien Potencier eb2a4f5f7a Merge pull request #16766 from fabpot/release-3.0.0
released v3.0.0
2015-11-30 21:59:43 +01:00
Fabien Potencier 72c6b836c9 updated VERSION for 3.0.0 2015-11-30 21:59:24 +01:00
Fabien Potencier a882401dd2 updated CHANGELOG for 3.0.0 2015-11-30 21:59:12 +01:00
Fabien Potencier af74da51b3 updated CHANGELOG for 3.0.0 2015-11-30 21:58:04 +01:00
Fabien Potencier 2e3f1cc6d7 Merge branch '2.8'
* 2.8:
  fixed EOM/EOL dates
  bumped Symfony version to 2.8.1
  updated VERSION for 2.8.0
  updated CHANGELOG for 2.8.0
2015-11-30 21:56:47 +01:00
Fabien Potencier ee739ae230 fixed EOM/EOL dates 2015-11-30 21:56:00 +01:00
Fabien Potencier bc642fb633 fixed EOM/EOL dates 2015-11-30 21:53:55 +01:00
Fabien Potencier 2ca214fc01 bumped Symfony version to 2.8.1 2015-11-30 21:37:20 +01:00
Fabien Potencier 5615b92cd4 Merge pull request #16763 from fabpot/release-2.8.0
released v2.8.0
2015-11-30 18:26:10 +01:00
Fabien Potencier a62dbb8e7f updated VERSION for 2.8.0 2015-11-30 18:25:56 +01:00
Fabien Potencier 5be63e5ad0 updated CHANGELOG for 2.8.0 2015-11-30 18:25:42 +01:00
Nicolas Grekas 1ea281fe39 Merge branch '2.8'
* 2.8:
  [Form] Cleanup
  Added the renamed options of the collection type to the upgrade information

Conflicts:
	UPGRADE-2.8.md
	src/Symfony/Component/Form/FormFactory.php
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
2015-11-30 17:36:51 +01:00
Nicolas Grekas 6df8badbe1 minor #16761 [Form] Cleanup (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Cleanup

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

ping @stof

Commits
-------

fd8e882 [Form] Cleanup
2015-11-30 17:33:00 +01:00
Nicolas Grekas fd8e882902 [Form] Cleanup 2015-11-30 17:17:29 +01:00
Fabien Potencier 0055887cbd minor #16659 Added the renamed options of the collection type to the upgrade information (peterrehm)
This PR was merged into the 2.8 branch.

Discussion
----------

Added the renamed options of the collection type to the upgrade information

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

Commits
-------

7aac273 Added the renamed options of the collection type to the upgrade information
2015-11-30 15:53:58 +01:00
Nicolas Grekas fdb419e918 Merge branch '2.8'
* 2.8:
  Fix BC for the default root form name

Conflicts:
	src/Symfony/Component/Form/FormFactory.php
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
2015-11-30 15:11:44 +01:00
Fabien Potencier b48bbb86f0 bug #16758 Fix BC for the default root form name (stof)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix BC for the default root form name

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

The block prefix is used, to match the previous behavior when using a custom block prefix.

The form type is now retrieved twice from the registry here, but this should not be an issue:
- unnamed forms are created only at the root, so only once per form at most (child forms are always named explicitly)
- the registry caches the resolved type, so the second access is just accessing the key in the array and returning it

Commits
-------

0a54d09 Fix BC for the default root form name
2015-11-30 14:52:49 +01:00
Christophe Coevoet 0a54d098a9 Fix BC for the default root form name
The block prefix is used, to match the previous behavior when using a
custom block prefix.
2015-11-30 14:33:56 +01:00
Fabien Potencier f20f2f06cc Merge branch '2.8'
* 2.8:
  add subject variable to expression context
  [Process] Fix signaling/stopping logic on Windows
  Forward compatibility with AbstractLayout* 2.8 tests
  [Yaml] minor CS cleaning
  [Console] do not encode backslashes in console default description
2015-11-30 13:36:17 +01:00
Fabien Potencier 9b6f592542 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix signaling/stopping logic on Windows
  Forward compatibility with AbstractLayout* 2.8 tests
  [Yaml] minor CS cleaning
  [Console] do not encode backslashes in console default description
2015-11-30 13:35:10 +01:00
Fabien Potencier 13fda1c7c5 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix signaling/stopping logic on Windows
  [Yaml] minor CS cleaning
  [Console] do not encode backslashes in console default description
2015-11-30 13:32:50 +01:00
Fabien Potencier 70f7b1cea6 feature #16754 [Security] allow arbitrary types in VoterInterface::vote() (xabbuh)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Security] allow arbitrary types in VoterInterface::vote()

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

Commits
-------

9054bdf allow arbitrary types in VoterInterface::vote()
2015-11-30 13:31:43 +01:00
Fabien Potencier d9b8d0c1e9 bug #16753 [Process] Fix signaling/stopping logic on Windows (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix signaling/stopping logic on Windows

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

Commits
-------

9afbea2 [Process] Fix signaling/stopping logic on Windows
2015-11-30 13:29:40 +01:00
Fabien Potencier 37ceef0260 feature #16755 [Security] add subject variable to expression context (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] add subject variable to expression context

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

Commits
-------

346943e add subject variable to expression context
2015-11-30 13:28:23 +01:00
Christian Flothmann 346943e2f5 add subject variable to expression context 2015-11-30 11:54:38 +01:00
Christian Flothmann 9054bdf3ac allow arbitrary types in VoterInterface::vote() 2015-11-30 11:38:54 +01:00
Nicolas Grekas 9afbea27e9 [Process] Fix signaling/stopping logic on Windows 2015-11-30 11:29:50 +01:00
Fabien Potencier a23444ac1a Merge branch '2.8'
* 2.8:
  [Yaml] look for colon in parsed inline string
  [DI][autowiring] throw exception when many services use the same class.
2015-11-30 09:18:52 +01:00
Fabien Potencier 729b98c2ad bug #16642 [DI][autowiring] throw exception when many services use the same class. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[DI][autowiring] throw exception when many services use the same class.

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

Commits
-------

a21a016 [DI][autowiring] throw exception when many services use the same class.
2015-11-30 07:56:28 +01:00
Tobias Schultze bcfacac1e1 minor #16749 [Form] Added getBlockPrefix() to ResolvedFormTypeInterface (webmozart)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] Added getBlockPrefix() to ResolvedFormTypeInterface

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

This is the follow-up PR to #16724.

If you call `$form->getConfig()->getType()`, all the methods of FormType should be usable. In that sense, ResolvedFormType is the developer-facing version of FormType.

It is true that the same could be achieved with `getInnerType()`, but that method should be used in edge cases only as it clutters the code and makes it confusing to read:

```php
$blockPrefix = $form->getConfig()->getType()->getInnerType()->getBlockPrefix();
```

Commits
-------

7e89345 [Form] Added getBlockPrefix() to ResolvedFormTypeInterface
2015-11-29 23:04:13 +01:00
Bernhard Schussek 7e89345a0d [Form] Added getBlockPrefix() to ResolvedFormTypeInterface 2015-11-29 22:12:04 +01:00
Fabien Potencier 6f349c6ac1 bug #16745 [Yaml] look for colon in parsed inline string (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] look for colon in parsed inline string

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

Looking for a colon in an unquoted mapping value can lead to falsely
reported parse errors (e.g. when a comment after the mapping value
contains a colon).

Commits
-------

2127058 [Yaml] look for colon in parsed inline string
2015-11-29 20:56:34 +01:00
Christian Flothmann 21270585a6 [Yaml] look for colon in parsed inline string
Looking for a colon in an unquoted mapping value can lead to falsely
reported parse errors (e.g. when a comment after the mapping value
contains a colon).
2015-11-29 19:08:13 +01:00
Nicolas Grekas d4c8c1362a minor #16744 Forward compatibility with AbstractLayout* 2.8 tests (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Forward compatibility with AbstractLayout* 2.8 tests

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

Related to #16031

Commits
-------

ef61e54 Forward compatibility with AbstractLayout* 2.8 tests
2015-11-29 18:18:50 +01:00
Nicolas Grekas ef61e5481f Forward compatibility with AbstractLayout* 2.8 tests 2015-11-29 18:06:34 +01:00
Nicolas Grekas ab2044f6d8 Merge branch '2.8'
* 2.8:
  [Bridge/Doctrine+Ldap] Fix tests
  Marked the Ldap component as internal and removed Ldap constants polyfill

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
2015-11-29 17:26:49 +01:00
Nicolas Grekas 6ff5015d8f minor #16743 [Bridge/Doctrine+Ldap] Fix tests (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Bridge/Doctrine+Ldap] Fix tests

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

Using "choice_list" is deprecated and thus can't work with 3.0 deps loaded. Test upgrades backported from #16725
@csarrazi : the Ldap tests now require the ldap extension. Annotations added.

Commits
-------

4819a70 [Bridge/Doctrine+Ldap] Fix tests
2015-11-29 17:25:46 +01:00
Nicolas Grekas 4819a702d7 [Bridge/Doctrine+Ldap] Fix tests 2015-11-29 17:07:42 +01:00
Fabien Potencier 52209dbcdc minor #16737 [Yaml] minor CS cleaning (mhujer)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16737).

Discussion
----------

[Yaml] minor CS cleaning

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

PHPStorm reported different types of coding style suggestions along the Symfony codebase. I've fixed some of them in the Yaml compontent and I have two questions:
1) What is the correct branch for such changes? Not all of them can be fixed in 2.3/2.8, for example `ParserTest`'s docblock is different there.
2) Should I create similar PRs for other components or is there a plan to do all such fixes at once someday in the future (e.g. after 2.8/3.0 is released)?

Commits
-------

613804d [Yaml] minor CS cleaning
2015-11-29 11:53:55 +01:00
Martin Hujer 613804d0cf [Yaml] minor CS cleaning 2015-11-29 11:53:50 +01:00
Fabien Potencier 0239d4ae7e bug #16733 [Console] do not encode backslashes in console default description (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] do not encode backslashes in console default description

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

Commits
-------

873a541 [Console] do not encode backslashes in console default description
2015-11-29 11:50:28 +01:00
Fabien Potencier afe1668b41 feature #16735 [WIP] [Ldap] Marked the Ldap component as internal (csarrazi)
This PR was merged into the 2.8 branch.

Discussion
----------

[WIP] [Ldap] Marked the Ldap component as internal

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

As mentioned earlier, the LDAP component suffers from a few problems, addressed in PR #15994
However, as raised by @Tobion, the component does not yet have tests (they can be added at a later time, though), and is not considered stable yet.

Commits
-------

3f89b2c Marked the Ldap component as internal and removed Ldap constants polyfill
2015-11-29 11:47:37 +01:00
Nicolas Grekas 9952ef9ec7 Merge branch '2.8'
* 2.8:
  [Bridge/Twig] Fix lowest form dep
  [Bridge/Doctrine] Fix legacy tests
  Make sure security.role_hierarchy.roles always exists
  [Form] Fix tests and reference usage
  [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListCompositeIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleAssociationToIntIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleIntIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleStringIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListCompositeIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleAssociationToIntIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleIntIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleStringIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListCompositeIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListCompositeIdWithQueryBuilderTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleAssociationToIntIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleAssociationToIntIdWithQueryBuilderTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdWithQueryBuilderTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleStringIdTest.php
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleStringIdWithQueryBuilderTest.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
2015-11-29 11:01:15 +01:00
Nicolas Grekas b255dfebc3 minor #16739 [Bridge/Doctrine] Fix legacy tests (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Bridge/Doctrine] Fix legacy tests

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

Commits
-------

7d92372 [Bridge/Doctrine] Fix legacy tests
2015-11-29 10:58:44 +01:00
Nicolas Grekas 0dd72cd5be Merge branch '2.7' into 2.8
* 2.7:
  [Bridge/Twig] Fix lowest form dep
  [Form] Fix tests and reference usage

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
2015-11-29 10:57:23 +01:00
Nicolas Grekas beb8525fe4 [Bridge/Twig] Fix lowest form dep 2015-11-29 10:55:05 +01:00
Nicolas Grekas 7d9237200f [Bridge/Doctrine] Fix legacy tests 2015-11-29 10:46:30 +01:00
Nicolas Grekas a3991535d7 minor #16729 [Form] Fix tests and reference usage (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix tests and reference usage

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

Commits
-------

6001644 [Form] Fix tests and reference usage
2015-11-29 10:16:52 +01:00
Fabien Potencier ff2addc4f9 bug #16734 Make sure security.role_hierarchy.roles always exists (WouterJ)
This PR was squashed before being merged into the 2.8 branch (closes #16734).

Discussion
----------

Make sure security.role_hierarchy.roles always exists

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

Commits
-------

b272ab5 Make sure security.role_hierarchy.roles always exists
2015-11-29 09:13:24 +01:00