Log warnings that are on the second level also #41
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
samwilson
requested changes
Dec 19, 2017
src/MediawikiApi.php
Outdated
| } | ||
|
|
||
| foreach ( $value['warnings'] as $module => $warningData ) { | ||
| // Accomodate both formatversion=2 and old-style API results |
There was a problem hiding this comment.
This section should not be duplicated from above. Instead, you could a new protected method logWarning() and call it from each of these places.
src/MediawikiApi.php
Outdated
| $this->logger->warning( $logPrefix . $warningData['warnings'], [ 'data' => $warningData ] ); | ||
| } | ||
|
|
||
| return; |
There was a problem hiding this comment.
You're returning after the first iteration of the loop. What about if there are multiple warnings?
src/MediawikiApi.php
Outdated
|
|
||
| // ...if no then go one level deeper and check there for them. | ||
| foreach ( $result as $value ) { | ||
| if ( !array_key_exists( 'warnings', $value ) ) { |
There was a problem hiding this comment.
$value can be a string (see test results).
samwilson
requested changes
Dec 20, 2017
src/MediawikiApi.php
Outdated
| * | ||
| * @return bool Whether any warning has been logged or not. | ||
| */ | ||
| private function logWarning( $array ) { |
There was a problem hiding this comment.
This should be proteccted, in case subclasses want to do something different with it.
Bug: T177191
addshore
approved these changes
Dec 20, 2017
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.
Bug: T177191
/cc @samwilson