[DependencyInjection] fix @return anno created by PhpDumper #11756
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jakubkulhan
force-pushed
the
phpdumper-return-anno
branch
from
d686544
to
a9f04d3
Compare
|
👍 |
|
This should be merged in 2.3 right? |
|
@sstok indeed |
| @@ -521,7 +521,7 @@ private function addService($id, $definition) | |||
| if ($definition->isSynthetic()) { | |||
| $return[] = '@throws RuntimeException always since this service is expected to be injected dynamically'; | |||
| } elseif ($class = $definition->getClass()) { | |||
| $return[] = sprintf("@return %s A %s instance.", 0 === strpos($class, '%') ? 'object' : $class, $class); | |||
| $return[] = sprintf("@return %s A %s instance.", 0 === strpos($class, '%') ? 'object' : "\\" . $class, $class); | |||
There was a problem hiding this comment.
Can you remove the spaces around the dot?
There was a problem hiding this comment.
@fabpot FYI, the PHP-CS-Fixer now fixes this kind of issues (well, once you make a new release containing the recent work)
jakubkulhan
force-pushed
the
phpdumper-return-anno
branch
from
a9f04d3
to
c66da9d
Compare
|
👍 |
|
Thank you @jakubkulhan. |
fabpot
added a commit
that referenced
this pull request
Aug 26, 2014
…r (jakubkulhan) This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11756). Discussion ---------- [DependencyInjection] fix @return anno created by PhpDumper | Q | A | ------------- | --- | Fixed tickets | --- | License | MIT If a generated container is inside namespace, generated @return annos are not valid. Commits ------- 39c4cc3 [DependencyInjection] fix @return anno created by PhpDumper
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a generated container is inside namespace, generated @return annos are not valid.