Skip to content

Merge branch 2.8 into 3.2 #21673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Merge branch 2.8 into 3.2 #21673

wants to merge 6 commits into from

Conversation

GuilhemN
Copy link
Contributor

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

Merges #21665 and #21670 and fixes the conflicts.

nicolas-grekas and others added 6 commits February 18, 2017 12:32
…ection (nicolas-grekas, GuilhemN)

This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Fix autowiring collisions detection

| 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        |

Fixes symfony#21658 by implementing the second proposal of symfony#21658 (comment):
> Another idea: store the types used previously and check that new services registered don't implement them.

Commits
-------

bb70472 [DependencyInjection] Fix autowiring collisions detection
6f578ee [DI] Bug in autowiring collisions detection
…re are more than 2 services colliding (GuilhemN)

This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Fix autowiring types when there are more than 2 services colliding

| 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        |

There is a bug in the `AutowirePass`, when using more than 2 services colliding and you want to use the autowiring types: it may not work depending on their order because `notGuessableTypes` is not reset.

Commits
-------

5981278 [DependencyInjection] Fix using autowiring types when there are more than 2 services
@fabpot
Copy link
Member

fabpot commented Feb 19, 2017

Thanks!

@fabpot fabpot closed this Feb 19, 2017
@GuilhemN GuilhemN deleted the MERGE3.2 branch February 19, 2017 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants