8000 [DI] Add missing check in PhpDumper by nicolas-grekas · Pull Request #22498 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DI] Add missing check in PhpDumper #22498

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 25, 2017
Merged

[DI] Add missing check in PhpDumper #22498

merged 1 commit into from
Apr 25, 2017

Conversation

nicolas-grekas
Copy link
Member
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 -

@nicolas-grekas nicolas-grekas added this to the 2.7 milestone Apr 21, 2017
@nicolas-grekas nicolas-grekas mentioned this pull request Apr 21, 2017
Merged
nicolas-grekas
nicolas-grekas commented Apr 21, 2017
View reviewed changes
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1331,9 +1331,12 @@ private function dumpValue($value, $interpolate = true)
if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {
return $this->dumpValue($this->definitionVariables->offsetGet($value), $interpolate);
}
if (count($value->getMethodCalls()) > 0) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change is already done on master thus will remove a merge conflict

javiereguiluz
javiereguiluz approved these changes Apr 24, 2017
View reviewed changes
Copy link
Member
@javiereguiluz javiereguiluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

dunglas
dunglas approved these changes Apr 24, 2017
View reviewed changes
Copy link
Member
@dunglas dunglas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

(a test would be nice)

@nicolas-grekas nicolas-grekas merged commit 5cabf88 into symfony:2.7 Apr 25, 2017
nicolas-grekas added a commit that referenced this pull request Apr 25, 2017
@nicolas-grekas
minor #22498 [DI] Add missing check in PhpDumper (nicolas-grekas)
9774780 
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Add missing check in PhpDumper

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

5cabf88 [DI] Add missing check in PhpDumper
7B32
@nicolas-grekas nicolas-grekas deleted the fix-di-prop branch April 25, 2017 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dunglas dunglas dunglas approved these changes

@javiereguiluz javiereguiluz javiereguiluz approved these changes

Assignees
No one assigned
Labels
Bug DependencyInjection Status: Reviewed
Projects
None yet
Milestone
2.7
Development

Successfully merging this pull request may close these issues.
4 participants
@nicolas-grekas @dunglas @javiereguiluz @carsonbot
0