Update phpdoc.dist.xml loading issue #1380
Merged
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
When ran phpdoc without parameters it can't load phpdoc.dist.xml directly and show a "No parsable files were found" Exception. Change userConfig file path search to take dist even if the user do not give a specific parameter. Signed-off-by: Stéphane HULARD <s.hulard@chstudio.fr>
| @@ -110,9 +110,9 @@ private function isValidFile($path) | |||
| private function createConfigurationObject($templatePath, $defaultUserConfigPath, $customUserConfigPath, $class) | |||
| { | |||
| $config = $this->serializer->deserialize(file_get_contents($templatePath), $class, 'xml'); | |||
| $customUserConfigPath = $customUserConfigPath ? : $defaultUserConfigPath; | |||
There was a problem hiding this comment.
This will throw an error on line 116 if both $customUserconfigPath and $defaultUserConfigPath contain a non-existing path; at the very least should a is_readable check be added to the if-statement below (in addition to the null check)
There was a problem hiding this comment.
Ok, I've added the is_readable in a new commit.
Thank you for the comment, I do not think this test missed 👍
…d file If $defaultUserConfigPath and $customUserConfigPath are null or contain invalid path we should not try to load it... Signed-off-by: Stéphane HULARD <s.hulard@chstudio.fr>
|
Thanks for adding that! You might be right but it never hurts to be a little defensive (that check should have been there in the original version as well). I have merged this item |
mvriel
added a commit
that referenced
this pull request
Aug 1, 2014
Update phpdoc.dist.xml loading issue
|
Thanks, don't worry I'm not hurted, maybe my english is not so good to use the right words... |
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.
When ran phpdoc without parameters it can't load phpdoc.dist.xml directly and show a "No parsable files were found" Exception.
Change userConfig file path search to take dist even if the user do not give a specific parameter.