Commit Graph

20145 Commits

Author SHA1 Message Date
Fabien Potencier
766393de8a Merge branch '2.7' into 2.8
* 2.7:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  prevent calling get() for service_container service
  call get() after the container was compiled
  Fixed readme of OptionsResolver
  [DependencyInjection] Suggest ExpressionLanguage in composer.json
2016-05-09 13:12:35 -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
Francis Besset
beecc6c1be Fixed readme of OptionsResolver 2016-05-06 22:13:08 +02:00
Nicolas Grekas
8ca614dbc9 Merge branch '2.7' into 2.8
* 2.7:
  top-level anonymous services must be public
2016-05-06 11:32:10 +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
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
59ffd04d18 added a conflict between Monolog bridge 2.8 and HTTP Kernel 3.0+ 2016-05-04 18:16:16 +02:00
Fabien Potencier
27c122e0ca bug #18388 [EventDispatcher] check for method to exist (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[EventDispatcher] check for method to exist

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

This change must be reverted after being merged into the `3.0` branch (the `getListenerPriority()` method was added to the interface in Symfony 3.0).

Commits
-------

78ae2ad [EventDispatcher] check for method to exist
2016-05-03 20:59:18 +02:00
Christian Flothmann
78ae2adb5b [EventDispatcher] check for method to exist 2016-05-03 20:40:49 +02:00
Fabien Potencier
2452e354df minor #18691 [DX][DI] Make failed autowiring error messages more explicit (lemoinem)
This PR was merged into the 2.8 branch.

Discussion
----------

[DX][DI] Make failed autowiring error messages more explicit

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | no (better DX integration)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18658
| License       | MIT
| Doc PR        | N/A

This is the PR improving the auto wiring error messages.
Two errors messages have augmented:

If a type-hint does not match any existing type and a service for this type cannot be automatically created, the error message now says so, instead of simply saying the type cannot be autowired.

If a type-hint matches multiple services and none of them provides an  autowiringType for it, the error message now says so and list the candidate services, instead of simply saying the type cannot be autowired.

Commits
-------

2ac81f9 Make failed autowiring error messages more explicit
2016-05-03 14:27:17 +02:00
Fabien Potencier
dd27b7d183 bug #18699 [DependencyInjection] Use the priority of service decoration on service with parent (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Use the priority of service decoration on service with parent

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

Commits
-------

d1ad43c [DependencyInjection] Fixed the priority of service decoration on service with parent
2016-05-03 14:26:31 +02:00
Fabien Potencier
a5e6172e12 Merge branch '2.7' into 2.8
* 2.7:
  add @Event annotation for AuthenticationEvents
  add @Event annotation for KernelEvents
  bumped Symfony version to 2.7.13
  updated VERSION for 2.7.12
  update CONTRIBUTORS for 2.7.12
  updated CHANGELOG for 2.7.12
  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
  Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)"
  Revert "fixed CS"
  [FrameworkBundle] Remove misleading comment
  bug #17460 [DI] fix ambiguous services schema
2016-05-03 14:21:46 +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
6bc7c87147 minor #18696 [PropertyInfo] PHPDoc correction (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PropertyInfo] PHPDoc correction

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

3b78492 [PropertyInfo] PHPDoc correction
2016-05-03 14:19:54 +02:00
Daniel Espendiller
af4ca4f48b add @Event annotation for AuthenticationEvents 2016-05-03 14:17:15 +02:00
Martin Hasoň
d1ad43c174 [DependencyInjection] Fixed the priority of service decoration on service with parent 2016-05-03 11:49:32 +02:00
Fabien Potencier
7b3c65bf67 bumped Symfony version to 2.8.6 2016-05-03 07:55:22 +02:00
Kévin Dunglas
3b78492136 [PropertyInfo] PHPDoc correction 2016-05-02 22:41:39 +02:00
Daniel Espendiller
a52e51a7b8 add @Event annotation for KernelEvents 2016-05-02 19:24:41 +02:00
Mathieu Lemoine
2ac81f954b Make failed autowiring error messages more explicit 2016-05-02 11:29:33 -04:00
Fabien Potencier
25d166b4d8 updated VERSION for 2.8.5 2016-04-29 17:33:46 +02:00
Fabien Potencier
fb92d7a04a bumped Symfony version to 2.7.13 2016-04-29 12:50:16 +02:00
Fabien Potencier
39890ed371 updated VERSION for 2.7.12 2016-04-29 11:47:36 +02:00
Fabien Potencier
ca80946379 bumped Symfony version to 2.3.41 2016-04-29 11:36:11 +02:00
Fabien Potencier
2dc63b3914 updated VERSION for 2.3.40 2016-04-29 07:38:17 +02:00
Fabien Potencier
745334e386 minor #18594 [Security] Normalize "symfony/security-acl" dependency versions across all composer.json files (siwinski)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Normalize "symfony/security-acl" dependency versions across all composer.json files

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

There are some inconsistencies in the Symfony 2.8 `symfony/security-acl` dependency versions that would help downstream if we could just package `symfony/security-acl` 3.0.0 instead of having to package both versions 2.8.0 (for Symfony 2.8) and 3.0.0 (for Symfony 3.0).

```
$ git clone https://github.com/symfony/symfony.git
Cloning into 'symfony'...
cd remote: Counting objects: 319438, done.
nyReceiving objects:   4% (12778/319438), 2.06 MiB | 4.12 MiB/s
4Receiving objects:  41% (130970/319438), 40.80 MiB | 7.86 MiB/s
remote: Total 319438 (delta 0), reused 0 (delta 0), pack-reused 319437
Receiving objects: 100% (319438/319438), 68.46 MiB | 8.21 MiB/s, done.
Resolving deltas: 100% (204691/204691), done.
Checking connectivity... done.

$ cd symfony

$ git checkout v2.8.4
Previous HEAD position was 4e17cb2... Merge branch '2.8' into 3.0
HEAD is now at 9e14f9f... Merge branch '2.7' into 2.8

$ find . -name 'composer.json' | xargs grep 'symfony/security-acl'
./src/Symfony/Bundle/SecurityBundle/composer.json:        "symfony/security-acl": "~2.7|~3.0.0",
./src/Symfony/Bridge/Twig/composer.json:        "symfony/security-acl": "~2.6|~3.0.0",
./src/Symfony/Component/Security/composer.json:        "symfony/security-acl": "~2.7",
./composer.json:        "symfony/security-acl": "~2.7",
```

Commits
-------

e249bc3 [Security] Normalize "symfony/security-acl" dependency versions across all composer.json files
2016-04-28 13:08:06 +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
996251ce13 fixed deprecation notices in tests 2016-04-28 11:59:09 +02:00
Fabien Potencier
5c235428d2 Merge branch '2.7' into 2.8
* 2.7:
  [Form] refactor CheckboxListMapper and RadioListMapper
  Revert "[Form] refactor `RadioListMapper::mapDataToForm()`"
2016-04-28 11:53:50 +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
fddf0736f5 Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] Remove duplicated code in ContainerDebugCommand
2016-04-28 11:48:28 +02:00
Nicolas Grekas
f146f8491c bug #18645 [Console] Fix wrong exceptions being thrown (JhonnyL)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] Fix wrong exceptions being thrown

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

Commits
-------

28fca7c [Console] Fix wrong exceptions being thrown
2016-04-27 15:32:57 +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
jhonnyL
28fca7c343 [Console] Fix wrong exceptions being thrown 2016-04-26 12:00:47 +00:00
Jeremy Benoist
199aa09c0f Add missing parenthesis in docblock description 2016-04-26 10:02:35 +02:00
Nicolas Grekas
38bbb57bec Merge branch '2.7' into 2.8
* 2.7:
  use stable 1.0.x Composer versions
  Fix typo in VarDumper README
  [WebProfilerBunde] Give an absolute url in case the request occured from another domain
2016-04-25 13:17:03 +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
Kévin Dunglas
ca5930b3ec bug #18600 [DI] Fix AutowirePass fatal error with classes that have non-existing parents (hason, nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DI] Fix AutowirePass fatal error with classes that have non-existing parents

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

Commits
-------

202cc77 [DI] Fix AutowirePass fatal error with classes that have non-existing parents
1735b85 [DependencyInjection] Tests for AutowirePass with missing parent class
2016-04-21 14:16:17 +02:00