Remove filter changes

Author: spacedmonkey

.phpcs.xml.dist

@@ -23,5 +23,6 @@
 	<rule ref="WordPress">
 		<exclude name="Generic.Commenting" />
 		<exclude name="Squiz.Commenting" />
+		<exclude name="WordPress.NamingConventions.ValidHookName.UseUnderscores" />
 	</rule>
 </ruleset>

inc/admin/profile/namespace.php

@@ -2,7 +2,7 @@
 /**
  * Administration UI and utilities
  *
- * @package WordPress
+ * @package    WordPress
  * @subpackage JSON API
  */
 
@@ -63,18 +63,20 @@ function ( Access_Token $token ) {
 			?>
 			</tbody>
 			<tfoot>
-				<tr>
-					<td colspan="2">
-						<a href="<?php echo esc_url( $personal_url ); ?>">
-							<?php esc_html_e( 'Create personal access token', 'oauth2' ); ?>
-						</a>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="2">
+					<a href="<?php echo esc_url( $personal_url ); ?>">
+						<?php esc_html_e( 'Create personal access token', 'oauth2' ); ?>
+					</a>
+				</td>
+			</tr>
 			</tfoot>
 		</table>
 	<?php else : ?>
 		<p class="description"><?php esc_html_e( 'No applications authorized.', 'oauth2' ); ?></p>
-		<p><a href="<?php echo esc_url( $personal_url ); ?>"><?php esc_html_e( 'Create personal access token', 'oauth2' ); ?></a></p>
+		<p>
+			<a href="<?php echo esc_url( $personal_url ); ?>"><?php esc_html_e( 'Create personal access token', 'oauth2' ); ?></a>
+		</p>
 	<?php endif ?>
 	<?php
 }
@@ -106,21 +108,11 @@ function render_token_row( WP_User $user, Access_Token $token ) {
 	/**
 	 * Filter details shown for an access token on the profile screen.
 	 *
-	 * @deprecated
-	 * @param string[] $details List of HTML snippets to render in table.
-	 * @param Access_Token $token Token being displayed.
-	 * @param WP_User $user User whose profile is being rendered.
-	 */
-	$details = apply_filters_deprecated( 'oauth2.admin.profile.render_token_row.details', $details, $token, $user ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-
-	/**
-	 * Filter details shown for an access token on the profile screen.
-	 *
-	 * @param string[] $details List of HTML snippets to render in table.
-	 * @param Access_Token $token Token being displayed.
-	 * @param WP_User $user User whose profile is being rendered.
+	 * @param string[]     $details List of HTML snippets to render in table.
+	 * @param Access_Token $token   Token being displayed.
+	 * @param WP_User      $user    User whose profile is being rendered.
 	 */
-	$details = apply_filters( 'oauth2_admin_profile_render_token_row_details', $details, $token, $user );
+	$details = apply_filters( 'oauth2.admin.profile.render_token_row.details', $details, $token, $user );
 
 	// Build actions.
 	if ( $is_personal ) {
@@ -149,21 +141,11 @@ function render_token_row( WP_User $user, Access_Token $token ) {
 	/**
 	 * Filter actions shown for an access token on the profile screen.
 	 *
-	 * @deprecated
-	 * @param string[] $actions List of HTML snippets to render in table.
-	 * @param Access_Token $token Token being displayed.
-	 * @param WP_User $user User whose profile is being rendered.
-	 */
-	$actions = apply_filters_deprecated( 'oauth2.admin.profile.render_token_row.actions', $actions, $token, $user ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-
-	/**
-	 * Filter actions shown for an access token on the profile screen.
-	 *
-	 * @param string[] $actions List of HTML snippets to render in table.
-	 * @param Access_Token $token Token being displayed.
-	 * @param WP_User $user User whose profile is being rendered.
+	 * @param string[]     $actions List of HTML snippets to render in table.
+	 * @param Access_Token $token   Token being displayed.
+	 * @param WP_User      $user    User whose profile is being rendered.
 	 */
-	$actions = apply_filters( 'oauth2_admin_profile_render_token_row_actions', $actions, $token, $user );
+	$actions = apply_filters( 'oauth2.admin.profile.render_token_row.actions', $actions, $token, $user );
 
 	$name = sprintf( '<strong>%s</strong>', $client->get_name() );
 	if ( $is_personal ) {

inc/class-client.php

@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * @package WordPress
+ * @package    WordPress
  * @subpackage JSON API
  */
 
@@ -15,15 +15,15 @@
 use WP_User;
 
 class Client implements ClientInterface {
-	const POST_TYPE            = 'oauth2_client';
-	const CLIENT_SECRET_KEY    = '_oauth2_client_secret';
-	const TYPE_KEY             = '_oauth2_client_type';
-	const REDIRECT_URI_KEY     = '_oauth2_redirect_uri';
+	const POST_TYPE = 'oauth2_client';
+	const CLIENT_SECRET_KEY = '_oauth2_client_secret';
+	const TYPE_KEY = '_oauth2_client_type';
+	const REDIRECT_URI_KEY = '_oauth2_redirect_uri';
 	const AUTH_CODE_KEY_PREFIX = '_oauth2_authcode_';
-	const AUTH_CODE_LENGTH     = 12;
-	const CLIENT_ID_LENGTH     = 12;
+	const AUTH_CODE_LENGTH = 12;
+	const CLIENT_ID_LENGTH = 12;
 	const CLIENT_SECRET_LENGTH = 48;
-	const AUTH_CODE_AGE        = 600; // 10 * MINUTE_IN_SECONDS
+	const AUTH_CODE_AGE = 600; // 10 * MINUTE_IN_SECONDS
 
 	/**
 	 * @var WP_Post
@@ -72,6 +72,7 @@ public function get_name() {
 	 * Get the client's description.
 	 *
 	 * @param boolean $raw True to get raw database value for editing, false to get rendered value for display.
+	 *
 	 * @return string
 	 */
 	public function get_description( $raw = false ) {
@@ -137,6 +138,7 @@ public function get_redirect_uris() {
 	 * just HTTP with standard ports.
 	 *
 	 * @param string $url URL for the callback.
+	 *
 	 * @return bool True for a valid callback URL, false otherwise.
 	 */
 	public static function validate_callback( $url ) {
@@ -163,10 +165,11 @@ public static function validate_callback( $url ) {
 	/**
 	 * Check if a redirect URI is valid for the client.
 	 *
-	 * @todo Implement this properly :)
-	 *
 	 * @param string $uri Supplied redirect URI to check.
+	 *
 	 * @return boolean True if the URI is valid, false otherwise.
+	 * @todo Implement this properly :)
+	 *
 	 */
 	public function check_redirect_uri( $uri ) {
 		if ( ! $this->validate_callback( $uri ) ) {
@@ -207,30 +210,12 @@ public function check_redirect_uri( $uri ) {
 			 * Filter whether a callback is counted as valid. (deprecated).
 			 * User rest_oauth_check_callback.
 			 *
-			 * @param boolean $valid True if the callback URL is valid, false otherwise.
-			 * @param string $url Supplied callback URL.
-			 * @param string $registered_uri URI being checked.
-			 * @param Client $client OAuth 2 client object.
-			 */
-			$valid = apply_filters_deprecated( 'rest_oauth.check_callback', $valid, $uri, $registered_uri, $this ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-
-			/**
-			 * Filter whether a callback is counted as valid.
-			 *
-			 * By default, the URLs must match scheme, host, port, user, pass, and
-			 * path. Query and fragment segments are allowed to be different.
-			 *
-			 * To change this behaviour, filter this value. Note that consumers must
-			 * have a callback registered, even if you relax this restruction. It is
-			 * highly recommended not to change this behaviour, as clients will
-			 * expect the same behaviour across all WP sites.
-			 *
-			 * @param boolean $valid True if the callback URL is valid, false otherwise.
-			 * @param string $url Supplied callback URL.
-			 * @param string $registered_uri URI being checked.
-			 * @param Client $client OAuth 2 client object.
+			 * @param boolean $valid          True if the callback URL is valid, false otherwise.
+			 * @param string  $url            Supplied callback URL.
+			 * @param string  $registered_uri URI being checked.
+			 * @param Client  $client         OAuth 2 client object.
 			 */
-			$valid = apply_filters( 'rest_oauth_check_callback', $valid, $uri, $registered_uri, $this );
+			$valid = apply_filters( 'rest_oauth.check_callback', $valid, $uri, $registered_uri, $this );
 
 			if ( $valid ) {
 				// Stop checking, we have a match.
@@ -254,6 +239,7 @@ public function generate_authorization_code( WP_User $user ) {
 	 * Get data stored for an authorization code.
 	 *
 	 * @param string $code Authorization code to fetch.
+	 *
 	 * @return Authorization_Code|WP_Error Data if available, error if invalid code.
 	 */
 	public function get_authorization_code( $code ) {
@@ -288,6 +274,7 @@ public function issue_token( WP_User $user, $meta = [] ) {
 	 * Get a client by ID.
 	 *
 	 * @param string $id Client ID.
+	 *
 	 * @return static|null Token if ID is found, null otherwise.
 	 */
 	public static function get_by_id( $id ) {
@@ -312,6 +299,7 @@ public static function get_by_id( $id ) {
 	 * Get a client by post ID.
 	 *
 	 * @param int $id Client/post ID.
+	 *
 	 * @return static|null Client instance on success, null if invalid/not found.
 	 */
 	public static function get_by_post_id( $id ) {
@@ -327,7 +315,8 @@ public static function get_by_post_id( $id ) {
 	 * Create a new client.
 	 *
 	 * @param array $data {
-	 * }
+	 *                    }
+	 *
 	 * @return WP_Error|Client Client instance on success, error otherwise.
 	 */
 	public static function create( $data ) {
@@ -417,6 +406,7 @@ public function approve() {
 			'post_status' => 'publish',
 		];
 		$result = wp_update_post( wp_slash( $data ), true );
+
 		return is_wp_error( $result ) ? $result : true;
 	}
 

inc/class-clientinterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * @package WordPress
+ * @package    WordPress
  * @subpackage JSON API
  */
 
@@ -28,6 +28,7 @@ public function get_name();
 	 * Get the client's description.
 	 *
 	 * @param boolean $raw True to get raw database value for editing, false to get rendered value for display.
+	 *
 	 * @return string
 	 */
 	public function get_description( $raw = false );
@@ -56,10 +57,11 @@ public function get_redirect_uris();
 	/**
 	 * Check if a redirect URI is valid for the client.
 	 *
-	 * @todo Implement this properly :)
-	 *
 	 * @param string $uri Supplied redirect URI to check.
+	 *
 	 * @return boolean True if the URI is valid, false otherwise.
+	 * @todo Implement this properly :)
+	 *
 	 */
 	public function check_redirect_uri( $uri );
 
@@ -74,6 +76,7 @@ public function generate_authorization_code( WP_User $user );
 	 * Get data stored for an authorization code.
 	 *
 	 * @param string $code Authorization code to fetch.
+	 *
 	 * @return Authorization_Code|WP_Error Data if available, error if invalid code.
 	 */
 	public function get_authorization_code( $code );

inc/class-personalclient.php

@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * @package WordPress
+ * @package    WordPress
  * @subpackage JSON API
  */
 
@@ -42,6 +42,7 @@ public static function get_instance() {
 		if ( empty( $instance ) ) {
 			$instance = new static();
 		}
+
 		return $instance;
 	}
 
@@ -67,6 +68,7 @@ public function get_name() {
 	 * Get the client's description.
 	 *
 	 * @param boolean $raw True to get raw database value for editing, false to get rendered value for display.
+	 *
 	 * @return string
 	 */
 	public function get_description( $raw = false ) {
@@ -104,6 +106,7 @@ public function get_redirect_uris() {
 	 * Check if a redirect URI is valid for the client.
 	 *
 	 * @param string $uri Supplied redirect URI to check.
+	 *
 	 * @return boolean Always false: personal tokens do not support redirections.
 	 */
 	public function check_redirect_uri( $uri ) {
@@ -126,6 +129,7 @@ public function generate_authorization_code( WP_User $user ) {
 	 * Get data stored for an authorization code.
 	 *
 	 * @param string $code Authorization code to fetch.
+	 *
 	 * @return Authorization_Code|WP_Error Data if available, error if invalid code.
 	 */
 	public function get_authorization_code( $code ) {

inc/class-scopes.php

@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * @package WordPress
+ * @package    WordPress
  * @subpackage JSON API
  */