Cleanup register function #6322
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
ebinnion
reviewed
Feb 8, 2017
class.jetpack.php
Outdated
| return $valid_response; | ||
| $json = Jetpack::init()->validate_remote_register_response( $response ); | ||
| if( is_wp_error( $json ) || ! $json ) { | ||
| return $json; |
There was a problem hiding this comment.
I know this is in the previous version, but if $json is falsey, should create a new WP_Error object with some error code and return that?
ebinnion
reviewed
Feb 8, 2017
class.jetpack.php
Outdated
| $json = json_decode( $entity ); | ||
| else | ||
| $json = false; | ||
|
|
||
| if ( empty( $json->jetpack_secret ) || ! is_string( $json->jetpack_secret ) ) |
There was a problem hiding this comment.
Since we're in the code, can we go ahead and add brackets, { }, around this conditional?
ebinnion
reviewed
Feb 8, 2017
class.jetpack.php
Outdated
| @@ -4498,7 +4498,7 @@ public function validate_remote_register_response( $response ) { | |||
| return new Jetpack_Error( 'jetpack_id', sprintf( __( 'Error Details: Jetpack ID begins with a numeral. Do not publicly post this error message! %s', 'jetpack' ) , $entity ), $entity ); | |||
| } | |||
|
|
|||
| return true; | |||
| return $json; | |||
There was a problem hiding this comment.
Since we're changing the return for this method, can we update the docblock at the top of the function?
There was a problem hiding this comment.
Done! Good catch.
ebinnion
reviewed
Feb 8, 2017
class.jetpack.php
Outdated
| $valid_response = Jetpack::init()->validate_remote_register_response( $response ); | ||
| if( is_wp_error( $valid_response ) || !$valid_response ) { | ||
| return $valid_response; | ||
| $json = Jetpack::init()->validate_remote_register_response( $response ); |
There was a problem hiding this comment.
Should we call this variable $json? It appears to be a PHP object since we've decoded it in the previous object.
jeherve
added
General
[Status] In Progress
[Status] Needs Author Reply
ebinnion
reviewed
Feb 14, 2017
class.jetpack.php
Outdated
| @@ -4458,7 +4458,7 @@ public function get_remote_query_timeout_limit() { | |||
| * verifies it worked properly. | |||
| * | |||
| * @since 2.6 | |||
| * @return true or Jetpack_Error | |||
| * @return json object returned by server | |||
There was a problem hiding this comment.
I think this should be @return string|Jetpack_Error A JSON object on success or Jetpack_Error on failure.
gravityrail
added
[Status] Ready to Merge
gravityrail
force-pushed
the
fix/register-cleanups
branch
from
0ca03d2 to
41e60cc
Compare
gravityrail
removed
the
[Status] Ready to Merge
dereksmart
pushed a commit
that referenced
this pull request
Feb 28, 2017
* Changelog: update stable tag and move changelog to changelog.txt Also remove old releases from readme.txt to keep the changelog tab short. * Changelog: add #5883 Also update the filter's docblock to match new version. * Changelog: add #5938 * Changelog: add #6298 * Changelog: add #3405 * Changelog: add #5941 * Changelog: add #6239 * Changelog: add #6281 * Changelog: add #6303 * Changelog: add #6018 * Changelog: add #6300 * Changelog: add #6296 * Changelog: add #6130 * Changelog: add #6292 * Readme: remove extra "on". * Changelog: add #6307 * Changelog: add #3297 * Changelog: add #6275 * Changelog: add #6321 * Changelog: add #6297 * Readme: update the support forum link anchor. Anchor changed when WordPress.org forums were updated to bbPress 2 * Readme: update list of a12s, it wasn't up to date anymore! * Changelog: add #6338 * Changelog: add #6337 * Changelog: add #6335 * Changelog: add #6333 * Testing List: first version of the 4.7 testing list. * Changelog: add #6332 * Changelog: add #6325 * Changelog: add #6326 * Changelog: add #6339 * Changelog: add #6342 * Changelog: add #6343 * Changelog: add #6346 * Changelog: add #6347 * Changelog: add #6279 * Changelog: add #6306 * Changelog: add #6312 * Changelog: add #6316 * Changelog: add #6171 * Changelog: add #6317 * Changelog: add #6246 * Changelog: add #6263 * Changelog: add #4220 * Changelog: add #5888 * Changelog: add #3406 * Changelog: add #3637 * Changelog: add #6320 * Changelog: add #5992 * Changelog: add #6322 * Changelog: add #6324 * Changelog: add #6352 * Changelog: add #6355 * Changelog: add #6360 * Changelog: add #6362 * Changelog: add #6369, #6382 * Changelog: add #6370 * Changelog: add #6375 * Changelog: add #6383 * Changelog: add #6384 * Changelog: add #6386 * Changelog: add #6395 * Changelog: add #6403 * Changelog: add #6406 * Changelog: add #6418 * Changelog: add #6419 * Changelog: add #6434 * Changelog: add #6446 * Changelog: add #6006 * Changelog: add #6096 * Changelog: add #6399 * Changelog: fix typo. @see #6331 (comment) * Changelog: add #6440 * Changelog: add #6443 * Changelog: add #6445 * Changelog: add #6463 * Changelog: add #6468 * Changelog: add #6471 * Changelog: add #6474 * Changelog: add #6480 * Changelog: add #6497 * Changelog: add #6499 * Changelog: add #6514 * Changelog: add #6267 * Changelog: add #5940 * Changelog: add #6492 * Changelog: add #5281 * Changelog: add #6327 * Changelog: add #6451 * Changelog: add #6525 * Changelog: add #6530
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.
Reduces duplication during the Jetpack register process.