Commit Graph

23432 Commits

Author SHA1 Message Date
Fabien Potencier 9a0e29991d fixed bad merge 2016-05-09 14:39:01 -05:00
Fabien Potencier 60bf201eba Merge branch '2.3' into 2.7
* 2.3:
  limited the maximum length of a submitted username
2016-05-09 14:23:35 -05:00
Fabien Potencier ff93b17930 security #18733 limited the maximum length of a submitted username (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

limited the maximum length of a submitted username

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| 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
-------

f8dc28a limited the maximum length of a submitted username
2016-05-09 14:13:10 -05:00
Fabien Potencier f8dc28ae53 limited the maximum length of a submitted username 2016-05-09 13:29:33 -05:00
Fabien Potencier b9b68f7af8 Merge branch '2.3' into 2.7
* 2.3:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  call get() after the container was compiled
  Fixed readme of OptionsResolver
2016-05-09 13:11:52 -05:00
Fabien Potencier 928c1d65b4 bug #18730 [FrameworkBundle] prevent calling get() for service_container service (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] prevent calling get() for service_container service

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

This change will simply fix the tests once #18728 gets merged. An alternative approach would be to compile the container so that the code would still work even for services that have been set directly using `set()`. However, compiling the container in a descriptor imo is an unexpected side effect which I tried to avoid here.

Commits
-------

2d46bd4 prevent calling get() for service_container service
2016-05-09 13:08:03 -05:00
Fabien Potencier daa2afa90c minor #18729 call get() after the container was compiled (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

call get() after the container was compiled

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

This will prevent future issues when calling `ContainerBuilder::get()` before compiling the container will be deprecated (see #18728).

Commits
-------

954126b call get() after the container was compiled
2016-05-09 13:03:25 -05:00
Fabien Potencier 17e29116c6 minor #18695 [DependencyInjection] Suggest ExpressionLanguage in composer.json (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] Suggest ExpressionLanguage in composer.json

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

As the DependencyInjection component has lots of classes containing uses of the ExpressionLanguage component, I propose to add it to the composer.json suggests.

Commits
-------

d6c9073 [DependencyInjection] Suggest ExpressionLanguage in composer.json
2016-05-09 13:00:26 -05:00
Fabien Potencier bdc99de4bc minor #18727 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param (eriwin)
This PR was squashed before being merged into the 2.3 branch (closes #18727).

Discussion
----------

[2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param

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

Updated phpdoc of AnonymousToken $user param from string to string|object since an object is allowed to in the parent AbstractToken: https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php#L91

Commits
-------

b1c60b4 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
2016-05-09 12:47:57 -05:00
Erik van Wingerden b1c60b4f0d [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param 2016-05-09 12:47:55 -05:00
Christian Flothmann 2d46bd4812 prevent calling get() for service_container service 2016-05-09 17:08:24 +02:00
Christian Flothmann 954126b04f call get() after the container was compiled 2016-05-09 17:05:30 +02:00
Tobias Schultze e8970a6de2 minor #18721 [OptionsResolver] Fixed readme (francisbesset)
This PR was merged into the 2.3 branch.

Discussion
----------

[OptionsResolver] Fixed readme

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

This PR fix bad markdown syntax in readme file of OptionsResolver component.

Commits
-------

beecc6c Fixed readme of OptionsResolver
2016-05-06 22:49:13 +02:00
Francis Besset beecc6c1be Fixed readme of OptionsResolver 2016-05-06 22:13:08 +02:00
Nicolas Grekas a53aba327e Merge branch '2.3' into 2.7
* 2.3:
  top-level anonymous services must be public

Conflicts:
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
2016-05-06 11:19:28 +02:00
Nicolas Grekas 9fabd83223 bug #18709 [DependencyInjection] top-level anonymous services must be public (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] top-level anonymous services must be public

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

Commits
-------

13a47c3 top-level anonymous services must be public
2016-05-06 11:06:26 +02:00
Christian Flothmann 13a47c3c6d top-level anonymous services must be public 2016-05-04 22:01:55 +02:00
Robin Chalas d6c9073ec2 [DependencyInjection] Suggest ExpressionLanguage in composer.json
Add a suggestion message

Fix wrong message
2016-05-04 18:44:06 +02:00
Fabien Potencier 591fc3a491 Merge branch '2.3' into 2.7
* 2.3:
  add @Event annotation for AuthenticationEvents
  bumped Symfony version to 2.3.41
  updated VERSION for 2.3.40
  update CONTRIBUTORS for 2.3.40
  updated CHANGELOG for 2.3.40
  bug #17460 [DI] fix ambiguous services schema
2016-05-03 14:21:10 +02:00
Fabien Potencier 6f86b0e9bb bug #18692 add @Event annotation for KernelEvents (Haehnchen)
This PR was merged into the 2.7 branch.

Discussion
----------

add @Event annotation for KernelEvents

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

split of #18684 for targeting 2.7 branch

Commits
-------

a52e51a add @Event annotation for KernelEvents
2016-05-03 14:18:00 +02:00
Daniel Espendiller af4ca4f48b add @Event annotation for AuthenticationEvents 2016-05-03 14:17:15 +02:00
Daniel Espendiller a52e51a7b8 add @Event annotation for KernelEvents 2016-05-02 19:24:41 +02:00
Fabien Potencier fb92d7a04a bumped Symfony version to 2.7.13 2016-04-29 12:50:16 +02:00
Fabien Potencier 9edf2430f1 Merge pull request #18670 from fabpot/release-2.7.12
released v2.7.12
2016-04-29 11:48:03 +02:00
Fabien Potencier 39890ed371 updated VERSION for 2.7.12 2016-04-29 11:47:36 +02:00
Fabien Potencier 1ce2f04915 update CONTRIBUTORS for 2.7.12 2016-04-29 11:47:34 +02:00
Fabien Potencier 2ada5535cd updated CHANGELOG for 2.7.12 2016-04-29 11:47:27 +02:00
Fabien Potencier ca80946379 bumped Symfony version to 2.3.41 2016-04-29 11:36:11 +02:00
Fabien Potencier 7bcb5deb31 Merge pull request #18669 from fabpot/release-2.3.40
released v2.3.40
2016-04-29 07:45:37 +02:00
Fabien Potencier 2dc63b3914 updated VERSION for 2.3.40 2016-04-29 07:38:17 +02:00
Fabien Potencier 30d7571ec6 update CONTRIBUTORS for 2.3.40 2016-04-29 07:37:50 +02:00
Fabien Potencier 84d46cc404 updated CHANGELOG for 2.3.40 2016-04-29 07:37:42 +02:00
Fabien Potencier cf38962dfe minor #18551 [FrameworkBundle] Remove misleading comment (JhonnyL)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove misleading comment

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

This is not true for service_container anymore.

Commits
-------

9f2f858 [FrameworkBundle] Remove misleading comment
2016-04-28 13:02:03 +02:00
Fabien Potencier 616ebb758f Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)"
This reverts commit f03dc6eec5, reversing
changes made to 2f2ce3e637.
2016-04-28 12:50:58 +02:00
Fabien Potencier e9dda1ee0a Revert "fixed CS"
This reverts commit ba1cd26237.
2016-04-28 12:50:52 +02:00
Fabien Potencier fcf5e278d7 bug #18246 [DependencyInjection] fix ambiguous services schema (backbone87)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fix ambiguous services schema

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

Commits
-------

9828f23 bug #17460 [DI] fix ambiguous services schema
2016-04-28 12:41:45 +02:00
Fabien Potencier a8c10ac6e5 bug #18180 [Form] fixed BC break with pre selection of choices with `ChoiceType` and its children (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fixed BC break with pre selection of choices with `ChoiceType` and its children

| Q             | A
| ------------- | ---
| Branch        | 2.7+
| Bugfix?  | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18173, #14712, #17789
| License       | MIT
| Doc PR        | -

- f7eea72 reverts BC break introduced in #17760
- 58e8ed0 fixes pre selection of choice with model values such as `false`, `null` or empty string without BC break.

`ChoiceType` now always use `ChoiceToValueTransformer` or `ChoicesToValuesTransformer` depending on `multiple` option.
Hence `CheckboxListMapper` and `RadioListMapper` don't handle the transformation anymore.

Commits
-------

ea5375c [Form] refactor CheckboxListMapper and RadioListMapper
71841c7 Revert "[Form] refactor `RadioListMapper::mapDataToForm()`"
2016-04-28 11:51:12 +02:00
Fabien Potencier 4aca7038b8 minor #18606 [FrameworkBundle] Remove duplicated code in ContainerDebugCommand (JhonnyL)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove duplicated code in ContainerDebugCommand

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

Commits
-------

5885cbc [FrameworkBundle] Remove duplicated code in ContainerDebugCommand
2016-04-26 14:22:32 +02:00
Nicolas Grekas a795388faa Merge branch '2.3' into 2.7
* 2.3:
  use stable 1.0.x Composer versions
2016-04-25 13:16:44 +02:00
Nicolas Grekas 1d43d9c602 minor #18620 use stable 1.0.x Composer versions (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

use stable 1.0.x Composer versions

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

This will make our tests pass on AppVeyor again where we always used the latest Composer snapshot (this is 1.1.x-dev now which the `hirak/prestissimo` plugin is not compatible yet, but I opened hirak/prestissimo#79 to make that happen).

Commits
-------

10e2dfb use stable 1.0.x Composer versions
2016-04-25 13:15:41 +02:00
Christian Flothmann 10e2dfb4f7 use stable 1.0.x Composer versions 2016-04-25 10:06:36 +02:00
Nicolas Grekas 4d8b4bfbe3 minor #18616 Fix typo in VarDumper README (WouterSioen)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #18616).

Discussion
----------

Fix typo in VarDumper README

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

Commits
-------

36e65fc Fix typo in VarDumper README
2016-04-22 14:44:08 +02:00
Wouter Sioen 36e65fcbcf Fix typo in VarDumper README 2016-04-22 14:44:08 +02:00
Fabien Potencier 70b12a8583 bug #18562 [2.7][WebProfilerBunde] Give an absolute url in case the request occured from another domain (romainneutron)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][WebProfilerBunde] Give an absolute url in case the request occured from another domain

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

This is related to #18413:

Using two symfony application ProjectA and MicroServiceB, if ProjectA issues XHR to MicroServiceB and both have the WebProfilerBundle enabled, then Ajax requests will be monitored in ProjectA. But - at the moment - it will try to look for profiles under ProjectA domain whereas data are stored on MicroServiceB domain.

This PR fixes this issue

Commits
-------

1a5d4ad [WebProfilerBunde] Give an absolute url in case the request occured from another domain
2016-04-21 18:18:51 +02:00
JhonnyL 5885cbc1a2 [FrameworkBundle] Remove duplicated code in ContainerDebugCommand 2016-04-21 09:55:15 +02:00
Nicolas Grekas 1ff12d92fd Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] ->getValue() should be read-only
  [Config] Fix XmlUtilsTest namespace
  [Routing] add query param if value is different from default

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-04-20 20:45:26 +02:00
Nicolas Grekas c1cb357d3a bug #18603 [PropertyAccess] ->getValue() should be read-only (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] ->getValue() should be read-only

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

Commits
-------

fa68529 [PropertyAccess] ->getValue() should be read-only
2016-04-20 20:37:31 +02:00
Nicolas Grekas fa6852968b [PropertyAccess] ->getValue() should be read-only 2016-04-20 17:25:54 +02:00
Nicolas Grekas 6a0a6872bf bug #18593 [VarDumper] Fix dumping type hints for non-existing parent classes (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix dumping type hints for non-existing parent classes

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

Commits
-------

812bf5c [VarDumper] Fix dumping type hints for non-existing parent classes
2016-04-20 14:13:47 +02:00
Fabien Potencier 2f0b8f8f3f bug #18581 [Console] [TableHelper] make it work with SymfonyStyle. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] [TableHelper] make it work with SymfonyStyle.

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

Commits
-------

43cc93c [Console] [TableHelper] make it work with SymfonyStyle.
2016-04-20 08:32:07 +02:00