Commit Graph

25269 Commits

Author SHA1 Message Date
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
WouterJ
b272ab569f Make sure security.role_hierarchy.roles always exists 2015-11-29 09:13:21 +01:00
Charles Sarrazin
3f89b2c714 Marked the Ldap component as internal and removed Ldap constants polyfill 2015-11-28 23:36:49 +01:00
Tobias Schultze
873a5417a8 [Console] do not encode backslashes in console default description 2015-11-28 23:15:59 +01:00
Nicolas Grekas
a3f48a5879 [Bridge/Twig] Fix legacy test 2015-11-28 19:08:21 +01:00
Nicolas Grekas
2cb74982de minor #16728 [Form] removed unused base test case (xabbuh)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] removed unused base test case

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

Commits
-------

fa9fd26 [Form] removed unused base test case
2015-11-28 18:13:40 +01:00
Nicolas Grekas
6001644ffe [Form] Fix tests and reference usage 2015-11-28 17:53:21 +01:00
Christian Flothmann
fa9fd26016 [Form] removed unused base test case 2015-11-28 17:25:40 +01:00
Tobias Schultze
07ac1229d3 feature #16723 [Form] remove deprecated CSRF options (xabbuh)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] remove deprecated CSRF options

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

Commits
-------

d641fc5 [Form] remove deprecated CSRF options
2015-11-28 17:15:22 +01:00
Tobias Schultze
445bdadc96 feature #16725 [Form] Removed useless code (webmozart)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] Removed useless code

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

Commits
-------

8add405 [Form] Removed useless code
2015-11-28 16:52:51 +01:00
Christian Flothmann
d641fc5d7c [Form] remove deprecated CSRF options 2015-11-28 16:51:48 +01:00
Fabien Potencier
6ae61f6d0f minor #16460 [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy (WouterJ)
This PR was submitted for the 2.3 branch but it was merged into the 2.8 branch instead (closes #16460).

Discussion
----------

[SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy

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

 * When passing `role_hierarchy: ~` in the config, the role hierarchy voter was still enabled. I've now changed this so that an empty hierarchy also results in disabling this voter. With an empty hierarchy, the voter behaves exactly the same as the RoleVoter, so no BC break is introduced here.
 * Added some tests for the RoleHierarchyVoter when passing an empty hierarchy. As it then behaves exactly like RoleVoter, the question is whether we shouldn't just always return ACCESS_ABSTAIN when the hierarchy is empty

Commits
-------

96afff6 [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy
2015-11-28 16:45:57 +01:00
WouterJ
96afff6a05 [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy 2015-11-28 16:45:57 +01:00
Fabien Potencier
6e6ac49946 Merge branch '2.8'
* 2.8:
  [Security][SecurityBundle] Use csrf_token_id instead of deprecated intention
2015-11-28 16:44:17 +01:00
Fabien Potencier
f2ee5618cf feature #16724 [3.0] Added getBlockPrefix to FormTypeInterface (WouterJ)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] Added getBlockPrefix to FormTypeInterface

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

Commits
-------

d834cd3 Added getBlockPrefix to FormTypeInterface
2015-11-28 16:43:01 +01:00
Fabien Potencier
5486c689cf feature #16722 [Security][SecurityBundle] Use csrf_token_id instead of deprecated intention (jakzal)
This PR was squashed before being merged into the 2.8 branch (closes #16722).

Discussion
----------

[Security][SecurityBundle] Use csrf_token_id instead of deprecated intention

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

Commits
-------

0450865 [Security][SecurityBundle] Use csrf_token_id instead of deprecated intention
2015-11-28 16:40:59 +01:00
Jakub Zalas
04508658b5 [Security][SecurityBundle] Use csrf_token_id instead of deprecated intention 2015-11-28 16:40:40 +01:00
Fabien Potencier
4e1effeb23 feature #16727 [Form] remove deprecated getTimezones() method (xabbuh)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] remove deprecated getTimezones() method

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

Commits
-------

4a2aea0 [Form] remove deprecated getTimezones() method
2015-11-28 16:38:52 +01:00
Christian Flothmann
4a2aea0bd7 [Form] remove deprecated getTimezones() method 2015-11-28 16:31:53 +01:00
Fabien Potencier
b5b1d504b4 minor #16707 [Process] Remove PHP_BINARY existence check (ogizanagi)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Process] Remove PHP_BINARY existence check

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

`PHP_BINARY` constant will always exists as of PHP >= 5.4.

Commits
-------

42a75bc [Process] Remove PHP_BINARY existence check
2015-11-28 14:17:09 +01:00
Nicolas Grekas
c2b54bbf47 Merge branch '2.8'
* 2.8:
  [Bundle\Twig] Fix lowet form dep

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
2015-11-28 13:50:03 +01:00
Nicolas Grekas
f94c6d4126 [Bundle\Twig] Fix lowet form dep 2015-11-28 13:49:09 +01:00
Bernhard Schussek
8add4053c0 [Form] Removed useless code 2015-11-28 13:33:28 +01:00
WouterJ
d834cd3d68 Added getBlockPrefix to FormTypeInterface 2015-11-28 12:15:28 +01:00
Fabien Potencier
7ba5f7acb3 Merge branch '2.8'
* 2.8:
  [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released
  [WIP] [Form] [TwigBridge] Bootstrap horizontal theme missing tests
  [Serializer] Improve ObjectNormalizer performance
  AssetBundle - fix docs
  [Yaml] more fixes to changelog and upgrade files
  CS: remove impossible default argument value
2015-11-28 12:03:53 +01:00
Fabien Potencier
cd0639d95b Merge branch '2.7' into 2.8
* 2.7:
  [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released
  [WIP] [Form] [TwigBridge] Bootstrap horizontal theme missing tests
  AssetBundle - fix docs
  CS: remove impossible default argument value
2015-11-28 12:03:39 +01:00
Fabien Potencier
e3f4278d59 Merge branch '2.3' into 2.7
* 2.3:
  [HttpKernel] clearstatcache() so the Cache sees when a .lck file has been released
2015-11-28 12:02:41 +01:00