[PropertyInfo] Fix dock block lookup fallback loop #27837
Merged
Conversation
This file contains hidden or 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
|
Thanks for the PR and the clear description. Could you add a test case please? |
|
Ah, looks like i rebased on master, not 4.1 ... is there an easy fix for this or is it better to create a new PR, I wonder? |
dunglas
reviewed
Jul 4, 2018
| // No valid doc block | ||
| } | ||
|
|
||
| return null; |
There was a problem hiding this comment.
You can return in the catch (same below)
There was a problem hiding this comment.
Was wondering ... I guess that a personal preference thing for me. I always feel it looks weird to not have a return at the end if the return type is not void.
lyrixx
approved these changes
Jul 6, 2018
This PR was merged into the 3.4 branch. Discussion ---------- Replaced AppBundle mentions with App | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Removed some legacy non-test related mentions of AppBundle. Probably this should be done for 4.x only, not >=3.4. Commits ------- b455237 AppBundle->App.
nicolas-grekas
approved these changes
Jul 7, 2018
|
Thank you @DerManoMann. |
nicolas-grekas
added a commit
that referenced
this pull request
Jul 7, 2018
…oMann) This PR was submitted for the 4.1 branch but it was squashed and merged into the 3.4 branch instead (closes #27837). Discussion ---------- [PropertyInfo] Fix dock block lookup fallback loop | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | `getDocBlock()` in `PhpDocExtractor` implements a fallback loop when trying to lookup a dock block for a property (property, accessor method, mutator method). This relies on the individual lookups to return `null`. Unfortunately, phpDocumentor will throw an `InvalidArgumentException` exception in case there is no dock block. Currently the try/catch is wrapping the whole loop which means if the first lookup fails the loop is ended instead of moving on to the next one. This PR moves the try/catch to each individual call of `$this->docBlockFactory->create()`. Commits ------- b1a6120 [PropertyInfo] Fix dock block lookup fallback loop
|
Merged on branch 3.4 by the way. |
This was referenced Jul 23, 2018
Merged
Merged
Merged
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.
getDocBlock()inPhpDocExtractorimplements a fallback loop when trying to lookup a dock block for a property (property, accessor method, mutator method). This relies on the individual lookups to returnnull.Unfortunately, phpDocumentor will throw an
InvalidArgumentExceptionexception in case there is no dock block.Currently the try/catch is wrapping the whole loop which means if the first lookup fails the loop is ended instead of moving on to the next one.
This PR moves the try/catch to each individual call of
$this->docBlockFactory->create().