insideout10 / wordlift-plugin

src/admin/partials/wordlift-admin-entity-type-settings.php

Indentation +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
@@ -19,8 +19,8 @@ 
 
 // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
 $term_settings = $settings !== null ? $settings : array(
-	'title'       => '',
-	'description' => '',
+    'title'       => '',
+    'description' => '',
 );
 
 ?>
@@ -33,36 +33,36 @@ 
 		<input type="hidden" name="tag_ID"
 			   value="
 			   <?php
-			   // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				echo esc_attr( $term_id );
-				?>
+                // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                echo esc_attr( $term_id );
+                ?>
 			   " />
 		<input type="hidden" name="action" value="wl_edit_entity_type_term" />
 		<?php
-		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-		wp_nonce_field( 'update-entity_type_term_' . $term_id );
-		?>
+        // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+        wp_nonce_field( 'update-entity_type_term_' . $term_id );
+        ?>
 		<table class="form-table">
 			<tr class="form-field form-required term-name-wrap">
 				<th scope="row">
 					<label>
 					<?php
-						esc_html_e( 'Name', 'wordlift' );
-					?>
+                        esc_html_e( 'Name', 'wordlift' );
+                    ?>
 						</label>
 				</th>
 				<td>
 				<?php
-					echo esc_html( $current_term->name )
-				?>
+                    echo esc_html( $current_term->name )
+                ?>
 					</td>
 			</tr>
 			<tr class="form-field form-required term-name-wrap">
 				<th scope="row">
 					<label for="title">
 					<?php
-						esc_html_e( 'Title', 'wordlift' );
-					?>
+                        esc_html_e( 'Title', 'wordlift' );
+                    ?>
 						</label>
 				</th>
 				<td><input name="title" id="title" type="text"
@@ -70,24 +70,24 @@ 
 						   size="40" />
 					<p class="description">
 					<?php
-						esc_html_e( 'The HTML title to be used in the entity type archive page.', 'wordlift' );
-					?>
+                        esc_html_e( 'The HTML title to be used in the entity type archive page.', 'wordlift' );
+                    ?>
 						</p>
 				</td>
 			</tr>
 			<tr class="form-field term-description-wrap">
 				<th scope="row"><label for="description">
 				<?php
-						esc_html_e( 'Description', 'wordlift' );
-				?>
+                        esc_html_e( 'Description', 'wordlift' );
+                ?>
 						</label>
 				</th>
 				<td><textarea name="description" id="description" rows="5"
 							  cols="50" class="large-text"><?php echo esc_html( $term_settings['description'] ); ?></textarea>
 					<p class="description">
 					<?php
-						esc_html_e( 'The description to be used in the entity type archive page.', 'wordlift' );
-					?>
+                        esc_html_e( 'The description to be used in the entity type archive page.', 'wordlift' );
+                    ?>
 						</p>
 				</td>
 			</tr>

Spacing +15 added lines, -15 removed lines

@@ -10,12 +10,12 @@ 
  * @subpackage Wordlift/admin/partials
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-$current_term = get_term( $term_id, 'wl_entity_type' );
+$current_term = get_term($term_id, 'wl_entity_type');
 
 // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
 $term_settings = $settings !== null ? $settings : array(
@@ -25,35 +25,35 @@ 
 
 ?>
 <div class="wrap">
-	<h1><?php esc_html_e( 'Edit Entity Type', 'wordlift' ); ?></h1>
+	<h1><?php esc_html_e('Edit Entity Type', 'wordlift'); ?></h1>
 
 	<form name="edittag" id="edittag" method="post"
-		  action="<?php echo esc_html( admin_url( 'admin.php?page=wl_entity_type_settings' ) ); ?>"
+		  action="<?php echo esc_html(admin_url('admin.php?page=wl_entity_type_settings')); ?>"
 		  class="validate">
 		<input type="hidden" name="tag_ID"
 			   value="
 			   <?php
 			   // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				echo esc_attr( $term_id );
+				echo esc_attr($term_id);
 				?>
 			   " />
 		<input type="hidden" name="action" value="wl_edit_entity_type_term" />
 		<?php
 		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-		wp_nonce_field( 'update-entity_type_term_' . $term_id );
+		wp_nonce_field('update-entity_type_term_'.$term_id);
 		?>
 		<table class="form-table">
 			<tr class="form-field form-required term-name-wrap">
 				<th scope="row">
 					<label>
 					<?php
-						esc_html_e( 'Name', 'wordlift' );
+						esc_html_e('Name', 'wordlift');
 					?>
 						</label>
 				</th>
 				<td>
 				<?php
-					echo esc_html( $current_term->name )
+					echo esc_html($current_term->name)
 				?>
 					</td>
 			</tr>
@@ -61,16 +61,16 @@ 
 				<th scope="row">
 					<label for="title">
 					<?php
-						esc_html_e( 'Title', 'wordlift' );
+						esc_html_e('Title', 'wordlift');
 					?>
 						</label>
 				</th>
 				<td><input name="title" id="title" type="text"
-						   value="<?php echo esc_attr( $term_settings['title'] ); ?>"
+						   value="<?php echo esc_attr($term_settings['title']); ?>"
 						   size="40" />
 					<p class="description">
 					<?php
-						esc_html_e( 'The HTML title to be used in the entity type archive page.', 'wordlift' );
+						esc_html_e('The HTML title to be used in the entity type archive page.', 'wordlift');
 					?>
 						</p>
 				</td>
@@ -78,20 +78,20 @@ 
 			<tr class="form-field term-description-wrap">
 				<th scope="row"><label for="description">
 				<?php
-						esc_html_e( 'Description', 'wordlift' );
+						esc_html_e('Description', 'wordlift');
 				?>
 						</label>
 				</th>
 				<td><textarea name="description" id="description" rows="5"
-							  cols="50" class="large-text"><?php echo esc_html( $term_settings['description'] ); ?></textarea>
+							  cols="50" class="large-text"><?php echo esc_html($term_settings['description']); ?></textarea>
 					<p class="description">
 					<?php
-						esc_html_e( 'The description to be used in the entity type archive page.', 'wordlift' );
+						esc_html_e('The description to be used in the entity type archive page.', 'wordlift');
 					?>
 						</p>
 				</td>
 			</tr>
 		</table>
-		<?php submit_button( __( 'Update', 'default' ) ); ?>
+		<?php submit_button(__('Update', 'default')); ?>
 	</form>
 </div>

src/admin/class-wordlift-entity-types-taxonomy-walker-5-3.php

Indentation +109 added lines, -109 removed lines

@@ -10,7 +10,7 @@ 
  * @subpackage Wordlift/includes
  */
 if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/template.php';
+    require_once ABSPATH . 'wp-admin/includes/template.php';
 }
 
 /**
@@ -23,113 +23,113 @@ 
  */
 class Wordlift_Entity_Types_Taxonomy_Walker extends Walker_Category_Checklist {
 
-	/**
-	 * Entity taxonomy metabox must show exclusive options, no checkboxes.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param       $args     {
-	 *                        An array of arguments.
-	 *
-	 * @type string $taxonomy The taxonomy name.
-	 *              }
-	 *
-	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
-	 */
-	public function terms_checklist_args( $args ) {
-
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			return $args;
-		}
-
-		// We override the way WP prints the taxonomy metabox HTML.
-		$args['walker']        = $this;
-		$args['checked_ontop'] = false;
-
-		return $args;
-
-	}
-
-	/**
-	 * Change checkboxes to radios.
-	 *
-	 * $max_depth = -1 means flatly display every element.
-	 * $max_depth = 0 means display all levels.
-	 * $max_depth > 0 specifies the number of display levels.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param array $elements  An array of elements.
-	 * @param int   $max_depth The maximum hierarchical depth.
-	 *
-	 * @param array $args      Additional arguments.
-	 *
-	 * @return string The hierarchical item output.
-	 */
-	public function walk( $elements, $max_depth, ...$args ) {
-
-		// `max_depth` force to -1 to display a flat taxonomy.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, ...$args );
-
-		$output = str_replace(
-			array( 'type="checkbox"', "type='checkbox'" ),
-			array( 'type="radio"', "type='radio'" ),
-			$output
-		);
-
-		return $output;
-	}
-
-	/**
-	 * Start the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 * @param int    $id       ID of the current term.
-	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
-		}
-	}
-
-	/**
-	 * End the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
-		}
-
-	}
+    /**
+     * Entity taxonomy metabox must show exclusive options, no checkboxes.
+     *
+     * @since 3.1.0
+     *
+     * @param       $args     {
+     *                        An array of arguments.
+     *
+     * @type string $taxonomy The taxonomy name.
+     *              }
+     *
+     * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
+     */
+    public function terms_checklist_args( $args ) {
+
+        if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            return $args;
+        }
+
+        // We override the way WP prints the taxonomy metabox HTML.
+        $args['walker']        = $this;
+        $args['checked_ontop'] = false;
+
+        return $args;
+
+    }
+
+    /**
+     * Change checkboxes to radios.
+     *
+     * $max_depth = -1 means flatly display every element.
+     * $max_depth = 0 means display all levels.
+     * $max_depth > 0 specifies the number of display levels.
+     *
+     * @since 3.1.0
+     *
+     * @param array $elements  An array of elements.
+     * @param int   $max_depth The maximum hierarchical depth.
+     *
+     * @param array $args      Additional arguments.
+     *
+     * @return string The hierarchical item output.
+     */
+    public function walk( $elements, $max_depth, ...$args ) {
+
+        // `max_depth` force to -1 to display a flat taxonomy.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/305
+        $output = parent::walk( $elements, - 1, ...$args );
+
+        $output = str_replace(
+            array( 'type="checkbox"', "type='checkbox'" ),
+            array( 'type="radio"', "type='radio'" ),
+            $output
+        );
+
+        return $output;
+    }
+
+    /**
+     * Start the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     * @param int    $id       ID of the current term.
+     */
+    public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::start_el( $output, $category, $depth, $args, $id );
+        }
+    }
+
+    /**
+     * End the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     */
+    public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::end_el( $output, $category, $depth, $args );
+        }
+
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -9,8 +9,8 @@ 
  * @package    Wordlift
  * @subpackage Wordlift/includes
  */
-if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/template.php';
+if ( ! class_exists('Walker_Category_Checklist')) {
+	require_once ABSPATH.'wp-admin/includes/template.php';
 }
 
 /**
@@ -36,9 +36,9 @@ 
 	 *
 	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
 	 */
-	public function terms_checklist_args( $args ) {
+	public function terms_checklist_args($args) {
 
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+		if ( ! isset($args['taxonomy']) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
 			return $args;
 		}
 
@@ -66,16 +66,16 @@ 
 	 *
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth, ...$args ) {
+	public function walk($elements, $max_depth, ...$args) {
 
 		// `max_depth` force to -1 to display a flat taxonomy.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, ...$args );
+		$output = parent::walk($elements, - 1, ...$args);
 
 		$output = str_replace(
-			array( 'type="checkbox"', "type='checkbox'" ),
-			array( 'type="radio"', "type='radio'" ),
+			array('type="checkbox"', "type='checkbox'"),
+			array('type="radio"', "type='radio'"),
 			$output
 		);
 
@@ -93,17 +93,17 @@ 
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 * @param int    $id       ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
+			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::start_el($output, $category, $depth, $args, $id);
 		}
 	}
 
@@ -117,17 +117,17 @@ 
 	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $category, $depth = 0, $args = array()) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 			 || 'article' !== $category->slug
-			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
+			 || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::end_el($output, $category, $depth, $args);
 		}
 
 	}

src/admin/wordlift-admin.php

Indentation +40 added lines, -40 removed lines

@@ -17,28 +17,28 @@ 
  */
 function wl_serialize_entity( $entity ) {
 
-	$entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
+    $entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
 
-	// Bail if the entity doesn't exists.
-	// In some cases we have `wl_topic` meta
-	// pointing to an entity that has been deleted.
-	if ( empty( $entity ) ) {
-		return;
-	}
+    // Bail if the entity doesn't exists.
+    // In some cases we have `wl_topic` meta
+    // pointing to an entity that has been deleted.
+    if ( empty( $entity ) ) {
+        return;
+    }
 
-	$type   = Wordlift_Entity_Type_Service::get_instance()->get( $entity->ID );
-	$images = wl_get_image_urls( $entity->ID );
+    $type   = Wordlift_Entity_Type_Service::get_instance()->get( $entity->ID );
+    $images = wl_get_image_urls( $entity->ID );
 
-	return array(
-		'id'          => wl_get_entity_uri( $entity->ID ),
-		'label'       => $entity->post_title,
-		'description' => $entity->post_content,
-		'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
-		'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
-		'types'       => wl_get_entity_rdf_types( $entity->ID ),
-		'images'      => $images,
+    return array(
+        'id'          => wl_get_entity_uri( $entity->ID ),
+        'label'       => $entity->post_title,
+        'description' => $entity->post_content,
+        'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
+        'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
+        'types'       => wl_get_entity_rdf_types( $entity->ID ),
+        'images'      => $images,
 
-	);
+    );
 }
 
 /**
@@ -51,29 +51,29 @@ 
  */
 function wl_remove_text_annotations( $data ) {
 
-	// Remove blank elements that can interfere with annotations removing
-	// See https://github.com/insideout10/wordlift-plugin/issues/234
-	// Just blank span tags without any attributes are cleaned up.
-	// Restrict removal to empty spans only as we may impact valid empty elements like: <th>
-	$pattern = '/<span><\/span>/im';
-	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], - 1, $count );
-	}
-	// Remove text annotations
-	// <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">.
+    // Remove blank elements that can interfere with annotations removing
+    // See https://github.com/insideout10/wordlift-plugin/issues/234
+    // Just blank span tags without any attributes are cleaned up.
+    // Restrict removal to empty spans only as we may impact valid empty elements like: <th>
+    $pattern = '/<span><\/span>/im';
+    // Remove the pattern while it is found (match nested annotations).
+    while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {
+        $data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], - 1, $count );
+    }
+    // Remove text annotations
+    // <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">.
 
-	// @see https://github.com/insideout10/wordlift-plugin/issues/771
-	// Changing this:
-	// $pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
-	// to:
-	$pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>(.*?)<\/\1>/im';
-	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], - 1, $count );
-	}
+    // @see https://github.com/insideout10/wordlift-plugin/issues/771
+    // Changing this:
+    // $pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
+    // to:
+    $pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>(.*?)<\/\1>/im';
+    // Remove the pattern while it is found (match nested annotations).
+    while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {
+        $data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], - 1, $count );
+    }
 
-	return $data;
+    return $data;
 }
 
 add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
@@ -88,5 +88,5 @@ 
  */
 function wl_admin_metaboxes_add_css_class( $classes = array() ) {
 
-	return array_merge( $classes, array( 'wl-metabox' ) );
+    return array_merge( $classes, array( 'wl-metabox' ) );
 }

Spacing +17 added lines, -17 removed lines

@@ -15,27 +15,27 @@ 
  *
  * @return array mixed The entity data array.
  */
-function wl_serialize_entity( $entity ) {
+function wl_serialize_entity($entity) {
 
-	$entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
+	$entity = (is_numeric($entity)) ? get_post($entity) : $entity;
 
 	// Bail if the entity doesn't exists.
 	// In some cases we have `wl_topic` meta
 	// pointing to an entity that has been deleted.
-	if ( empty( $entity ) ) {
+	if (empty($entity)) {
 		return;
 	}
 
-	$type   = Wordlift_Entity_Type_Service::get_instance()->get( $entity->ID );
-	$images = wl_get_image_urls( $entity->ID );
+	$type   = Wordlift_Entity_Type_Service::get_instance()->get($entity->ID);
+	$images = wl_get_image_urls($entity->ID);
 
 	return array(
-		'id'          => wl_get_entity_uri( $entity->ID ),
+		'id'          => wl_get_entity_uri($entity->ID),
 		'label'       => $entity->post_title,
 		'description' => $entity->post_content,
-		'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
-		'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
-		'types'       => wl_get_entity_rdf_types( $entity->ID ),
+		'sameAs'      => wl_schema_get_value($entity->ID, 'sameAs'),
+		'mainType'    => str_replace('wl-', '', $type['css_class']),
+		'types'       => wl_get_entity_rdf_types($entity->ID),
 		'images'      => $images,
 
 	);
@@ -49,7 +49,7 @@ 
  * @return array mixed The post data array.
  * @since 1.0.0
  */
-function wl_remove_text_annotations( $data ) {
+function wl_remove_text_annotations($data) {
 
 	// Remove blank elements that can interfere with annotations removing
 	// See https://github.com/insideout10/wordlift-plugin/issues/234
@@ -57,8 +57,8 @@ 
 	// Restrict removal to empty spans only as we may impact valid empty elements like: <th>
 	$pattern = '/<span><\/span>/im';
 	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], - 1, $count );
+	while (1 === preg_match($pattern, $data['post_content'])) {
+		$data['post_content'] = preg_replace($pattern, '$2', $data['post_content'], - 1, $count);
 	}
 	// Remove text annotations
 	// <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">.
@@ -69,14 +69,14 @@ 
 	// to:
 	$pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>(.*?)<\/\1>/im';
 	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], - 1, $count );
+	while (1 === preg_match($pattern, $data['post_content'])) {
+		$data['post_content'] = preg_replace($pattern, '$2', $data['post_content'], - 1, $count);
 	}
 
 	return $data;
 }
 
-add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
+add_filter('wp_insert_post_data', 'wl_remove_text_annotations', '98', 1);
 
 /**
  * Adds wl-metabox CSS class to a metabox.
@@ -86,7 +86,7 @@ 
  * @return array The updated list of CSS classes.
  * @since 3.2.0
  */
-function wl_admin_metaboxes_add_css_class( $classes = array() ) {
+function wl_admin_metaboxes_add_css_class($classes = array()) {
 
-	return array_merge( $classes, array( 'wl-metabox' ) );
+	return array_merge($classes, array('wl-metabox'));
 }

src/admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php

Indentation +96 added lines, -96 removed lines

@@ -17,43 +17,43 @@ 
  */
 class Wordlift_Admin_Schemaorg_Taxonomy_Metabox {
 
-	/**
-	 * Render the metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public static function render() {
+    /**
+     * Render the metabox.
+     *
+     * @since 3.20.0
+     */
+    public static function render() {
 
-		self::post_categories_meta_box(
-			get_post(),
-			array(
-				'args' =>
-					array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
-			)
-		);
+        self::post_categories_meta_box(
+            get_post(),
+            array(
+                'args' =>
+                    array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
+            )
+        );
 
-	}
+    }
 
-	/**
-	 * A function which resembles WordPress' own to display a metabox, but which customizes the output
-	 * to display the Schema.org classes tree.
-	 *
-	 * @param WP_Post $post The {@link WP_Post} being edited.
-	 * @param array   $box An array of arguments.
-	 *
-	 * @since 3.20.0
-	 */
-	private static function post_categories_meta_box( $post, $box ) {
-		$defaults = array( 'taxonomy' => 'category' );
-		if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
-			$args = array();
-		} else {
-			$args = $box['args'];
-		}
-		$r        = wp_parse_args( $args, $defaults );
-		$tax_name = esc_attr( $r['taxonomy'] );
-		$taxonomy = get_taxonomy( $r['taxonomy'] );
-		?>
+    /**
+     * A function which resembles WordPress' own to display a metabox, but which customizes the output
+     * to display the Schema.org classes tree.
+     *
+     * @param WP_Post $post The {@link WP_Post} being edited.
+     * @param array   $box An array of arguments.
+     *
+     * @since 3.20.0
+     */
+    private static function post_categories_meta_box( $post, $box ) {
+        $defaults = array( 'taxonomy' => 'category' );
+        if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+            $args = array();
+        } else {
+            $args = $box['args'];
+        }
+        $r        = wp_parse_args( $args, $defaults );
+        $tax_name = esc_attr( $r['taxonomy'] );
+        $taxonomy = get_taxonomy( $r['taxonomy'] );
+        ?>
 		<div id="taxonomy-<?php echo esc_attr( $tax_name ); ?>" class="categorydiv">
 			<ul id="<?php echo esc_attr( $tax_name ); ?>-tabs" class="category-tabs">
 				<li class="tabs"><a
@@ -79,34 +79,34 @@ 
 
 			<div id="<?php echo esc_attr( $tax_name ); ?>-legacy" class="tabs-panel" style="display: none;">
 				<?php
-				$name = ( 'category' === $tax_name ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
-				echo wp_kses(
-					sprintf(
-						"<input type='hidden' name='%s[]' value='0' />",
-						esc_attr( $name )
-					),
-					array(
-						'input' =>
-							array(
-								'type'  => array(),
-								'name'  => array(),
-								'value' => array(),
-							),
-					)
-				); // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-				?>
+                $name = ( 'category' === $tax_name ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+                echo wp_kses(
+                    sprintf(
+                        "<input type='hidden' name='%s[]' value='0' />",
+                        esc_attr( $name )
+                    ),
+                    array(
+                        'input' =>
+                            array(
+                                'type'  => array(),
+                                'name'  => array(),
+                                'value' => array(),
+                            ),
+                    )
+                ); // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+                ?>
 				<ul id="<?php echo esc_attr( $tax_name ); ?>checklist"
 					data-wp-lists="list:<?php echo esc_attr( $tax_name ); ?>"
 					class="categorychecklist form-no-clear">
 					<?php
-					wp_terms_checklist(
-						$post->ID,
-						array(
-							'taxonomy'     => $tax_name,
-							'popular_cats' => $popular_ids,
-						)
-					);
-					?>
+                    wp_terms_checklist(
+                        $post->ID,
+                        array(
+                            'taxonomy'     => $tax_name,
+                            'popular_cats' => $popular_ids,
+                        )
+                    );
+                    ?>
 				</ul>
 			</div>
 			<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
@@ -115,9 +115,9 @@ 
 					   href="#<?php echo esc_attr( $tax_name ); ?>-add"
 					   class="taxonomy-add-new">
 						<?php
-						/* translators: %s: add new taxonomy label */
-						echo esc_html( sprintf( __( '+ %s', 'default' ), $taxonomy->labels->add_new_item ) );
-						?>
+                        /* translators: %s: add new taxonomy label */
+                        echo esc_html( sprintf( __( '+ %s', 'default' ), $taxonomy->labels->add_new_item ) );
+                        ?>
 					</a>
 					<p id="<?php echo esc_attr( $tax_name ); ?>-add" class="category-add wp-hidden-child">
 						<label class="screen-reader-text"
@@ -131,42 +131,42 @@ 
 							<?php echo esc_html( $taxonomy->labels->parent_item_colon ); ?>
 						</label>
 						<?php
-						$parent_dropdown_args = array(
-							'taxonomy'         => $tax_name,
-							'hide_empty'       => 0,
-							'name'             => 'new' . $tax_name . '_parent',
-							'orderby'          => 'name',
-							'hierarchical'     => 1,
-							'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
-						);
+                        $parent_dropdown_args = array(
+                            'taxonomy'         => $tax_name,
+                            'hide_empty'       => 0,
+                            'name'             => 'new' . $tax_name . '_parent',
+                            'orderby'          => 'name',
+                            'hierarchical'     => 1,
+                            'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+                        );
 
-						/**
-						 * Filters the arguments for the taxonomy parent dropdown on the Post Edit page.
-						 *
-						 * @param array $parent_dropdown_args {
-						 *     Optional. Array of arguments to generate parent dropdown.
-						 *
-						 * @type string $taxonomy Name of the taxonomy to retrieve.
-						 * @type bool $hide_if_empty True to skip generating markup if no
-						 *                                      categories are found. Default 0.
-						 * @type string $name Value for the 'name' attribute
-						 *                                      of the select element.
-						 *                                      Default "new{$tax_name}_parent".
-						 * @type string $orderby Which column to use for ordering
-						 *                                      terms. Default 'name'.
-						 * @type bool|int $hierarchical Whether to traverse the taxonomy
-						 *                                      hierarchy. Default 1.
-						 * @type string $show_option_none Text to display for the "none" option.
-						 *                                      Default "&mdash; {$parent} &mdash;",
-						 *                                      where `$parent` is 'parent_item'
-						 *                                      taxonomy label.
-						 * }
-						 * @since 4.4.0
-						 */
-						$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+                        /**
+                         * Filters the arguments for the taxonomy parent dropdown on the Post Edit page.
+                         *
+                         * @param array $parent_dropdown_args {
+                         *     Optional. Array of arguments to generate parent dropdown.
+                         *
+                         * @type string $taxonomy Name of the taxonomy to retrieve.
+                         * @type bool $hide_if_empty True to skip generating markup if no
+                         *                                      categories are found. Default 0.
+                         * @type string $name Value for the 'name' attribute
+                         *                                      of the select element.
+                         *                                      Default "new{$tax_name}_parent".
+                         * @type string $orderby Which column to use for ordering
+                         *                                      terms. Default 'name'.
+                         * @type bool|int $hierarchical Whether to traverse the taxonomy
+                         *                                      hierarchy. Default 1.
+                         * @type string $show_option_none Text to display for the "none" option.
+                         *                                      Default "&mdash; {$parent} &mdash;",
+                         *                                      where `$parent` is 'parent_item'
+                         *                                      taxonomy label.
+                         * }
+                         * @since 4.4.0
+                         */
+                        $parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
 
-						wp_dropdown_categories( $parent_dropdown_args );
-						?>
+                        wp_dropdown_categories( $parent_dropdown_args );
+                        ?>
 						<input type="button" id="<?php echo esc_attr( $tax_name ); ?>-add-submit"
 							   data-wp-lists="add:<?php echo esc_html( $tax_name ); ?>checklist:<?php echo esc_attr( $tax_name ); ?>-add"
 							   class="button category-add-submit"
@@ -178,6 +178,6 @@ 
 			<?php endif; ?>
 		</div>
 		<?php
-	}
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -28,7 +28,7 @@ 
 			get_post(),
 			array(
 				'args' =>
-					array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
+					array('taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME),
 			)
 		);
 
@@ -43,47 +43,47 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	private static function post_categories_meta_box( $post, $box ) {
-		$defaults = array( 'taxonomy' => 'category' );
-		if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+	private static function post_categories_meta_box($post, $box) {
+		$defaults = array('taxonomy' => 'category');
+		if ( ! isset($box['args']) || ! is_array($box['args'])) {
 			$args = array();
 		} else {
 			$args = $box['args'];
 		}
-		$r        = wp_parse_args( $args, $defaults );
-		$tax_name = esc_attr( $r['taxonomy'] );
-		$taxonomy = get_taxonomy( $r['taxonomy'] );
+		$r        = wp_parse_args($args, $defaults);
+		$tax_name = esc_attr($r['taxonomy']);
+		$taxonomy = get_taxonomy($r['taxonomy']);
 		?>
-		<div id="taxonomy-<?php echo esc_attr( $tax_name ); ?>" class="categorydiv">
-			<ul id="<?php echo esc_attr( $tax_name ); ?>-tabs" class="category-tabs">
+		<div id="taxonomy-<?php echo esc_attr($tax_name); ?>" class="categorydiv">
+			<ul id="<?php echo esc_attr($tax_name); ?>-tabs" class="category-tabs">
 				<li class="tabs"><a
-							href="#<?php echo esc_attr( $tax_name ); ?>-all"><?php echo esc_html( $taxonomy->labels->all_items ); ?></a>
+							href="#<?php echo esc_attr($tax_name); ?>-all"><?php echo esc_html($taxonomy->labels->all_items); ?></a>
 				</li>
 				<li>
-					<a href="#<?php echo esc_attr( $tax_name ); ?>-pop"><?php echo esc_html__( 'Most Used', 'wordlift' ); ?></a>
+					<a href="#<?php echo esc_attr($tax_name); ?>-pop"><?php echo esc_html__('Most Used', 'wordlift'); ?></a>
 				</li>
-				<li><a href="#<?php echo esc_attr( $tax_name ); ?>-legacy">
-						<?php echo esc_html_x( 'A-Z', 'Entity Types metabox', 'wordlift' ); ?></a>
+				<li><a href="#<?php echo esc_attr($tax_name); ?>-legacy">
+						<?php echo esc_html_x('A-Z', 'Entity Types metabox', 'wordlift'); ?></a>
 				</li>
 			</ul>
 
-			<div id="<?php echo esc_attr( $tax_name ); ?>-all" class="tabs-panel">
+			<div id="<?php echo esc_attr($tax_name); ?>-all" class="tabs-panel">
 				<div id="wl-schema-class-tree"></div>
 			</div>
 
-			<div id="<?php echo esc_attr( $tax_name ); ?>-pop" class="tabs-panel" style="display: none;">
-				<ul id="<?php echo esc_attr( $tax_name ); ?>checklist-pop" class="categorychecklist form-no-clear">
-					<?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+			<div id="<?php echo esc_attr($tax_name); ?>-pop" class="tabs-panel" style="display: none;">
+				<ul id="<?php echo esc_attr($tax_name); ?>checklist-pop" class="categorychecklist form-no-clear">
+					<?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
 				</ul>
 			</div>
 
-			<div id="<?php echo esc_attr( $tax_name ); ?>-legacy" class="tabs-panel" style="display: none;">
+			<div id="<?php echo esc_attr($tax_name); ?>-legacy" class="tabs-panel" style="display: none;">
 				<?php
-				$name = ( 'category' === $tax_name ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+				$name = ('category' === $tax_name) ? 'post_category' : 'tax_input['.$tax_name.']';
 				echo wp_kses(
 					sprintf(
 						"<input type='hidden' name='%s[]' value='0' />",
-						esc_attr( $name )
+						esc_attr($name)
 					),
 					array(
 						'input' =>
@@ -95,8 +95,8 @@ 
 					)
 				); // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
 				?>
-				<ul id="<?php echo esc_attr( $tax_name ); ?>checklist"
-					data-wp-lists="list:<?php echo esc_attr( $tax_name ); ?>"
+				<ul id="<?php echo esc_attr($tax_name); ?>checklist"
+					data-wp-lists="list:<?php echo esc_attr($tax_name); ?>"
 					class="categorychecklist form-no-clear">
 					<?php
 					wp_terms_checklist(
@@ -109,35 +109,35 @@ 
 					?>
 				</ul>
 			</div>
-			<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
-				<div id="<?php echo esc_attr( $tax_name ); ?>-adder" class="wp-hidden-children">
-					<a id="<?php echo esc_attr( $tax_name ); ?>-add-toggle"
-					   href="#<?php echo esc_attr( $tax_name ); ?>-add"
+			<?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
+				<div id="<?php echo esc_attr($tax_name); ?>-adder" class="wp-hidden-children">
+					<a id="<?php echo esc_attr($tax_name); ?>-add-toggle"
+					   href="#<?php echo esc_attr($tax_name); ?>-add"
 					   class="taxonomy-add-new">
 						<?php
 						/* translators: %s: add new taxonomy label */
-						echo esc_html( sprintf( __( '+ %s', 'default' ), $taxonomy->labels->add_new_item ) );
+						echo esc_html(sprintf(__('+ %s', 'default'), $taxonomy->labels->add_new_item));
 						?>
 					</a>
-					<p id="<?php echo esc_attr( $tax_name ); ?>-add" class="category-add wp-hidden-child">
+					<p id="<?php echo esc_attr($tax_name); ?>-add" class="category-add wp-hidden-child">
 						<label class="screen-reader-text"
-							   for="new<?php echo esc_attr( $tax_name ); ?>"><?php echo esc_html( $taxonomy->labels->add_new_item ); ?></label>
-						<input type="text" name="new<?php echo esc_html( $tax_name ); ?>"
-							   id="new<?php echo esc_attr( $tax_name ); ?>"
+							   for="new<?php echo esc_attr($tax_name); ?>"><?php echo esc_html($taxonomy->labels->add_new_item); ?></label>
+						<input type="text" name="new<?php echo esc_html($tax_name); ?>"
+							   id="new<?php echo esc_attr($tax_name); ?>"
 							   class="form-required form-input-tip"
-							   value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>"
+							   value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>"
 							   aria-required="true"/>
-						<label class="screen-reader-text" for="new<?php echo esc_attr( $tax_name ); ?>_parent">
-							<?php echo esc_html( $taxonomy->labels->parent_item_colon ); ?>
+						<label class="screen-reader-text" for="new<?php echo esc_attr($tax_name); ?>_parent">
+							<?php echo esc_html($taxonomy->labels->parent_item_colon); ?>
 						</label>
 						<?php
 						$parent_dropdown_args = array(
 							'taxonomy'         => $tax_name,
 							'hide_empty'       => 0,
-							'name'             => 'new' . $tax_name . '_parent',
+							'name'             => 'new'.$tax_name.'_parent',
 							'orderby'          => 'name',
 							'hierarchical'     => 1,
-							'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+							'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;',
 						);
 
 						/**
@@ -163,16 +163,16 @@ 
 						 * }
 						 * @since 4.4.0
 						 */
-						$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+						$parent_dropdown_args = apply_filters('post_edit_category_parent_dropdown_args', $parent_dropdown_args);
 
-						wp_dropdown_categories( $parent_dropdown_args );
+						wp_dropdown_categories($parent_dropdown_args);
 						?>
-						<input type="button" id="<?php echo esc_attr( $tax_name ); ?>-add-submit"
-							   data-wp-lists="add:<?php echo esc_html( $tax_name ); ?>checklist:<?php echo esc_attr( $tax_name ); ?>-add"
+						<input type="button" id="<?php echo esc_attr($tax_name); ?>-add-submit"
+							   data-wp-lists="add:<?php echo esc_html($tax_name); ?>checklist:<?php echo esc_attr($tax_name); ?>-add"
 							   class="button category-add-submit"
-							   value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>"/>
-						<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
-						<span id="<?php echo esc_attr( $tax_name ); ?>-ajax-response"></span>
+							   value="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>"/>
+						<?php wp_nonce_field('add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false); ?>
+						<span id="<?php echo esc_attr($tax_name); ?>-ajax-response"></span>
 					</p>
 				</div>
 			<?php endif; ?>

src/admin/class-wordlift-admin-dashboard-v2.php

Indentation +132 added lines, -132 removed lines

@@ -4,95 +4,95 @@ 
 
 class Wordlift_Admin_Dashboard_V2 {
 
-	const TODAYS_TIP       = 'wl_todays_tip_data';
-	const AVERAGE_POSITION = 'wl_search_rankings_average_position';
-
-	/**
-	 * @var \Wordlift_Entity_Service $entity_service
-	 */
-	private $entity_service;
-
-	/**
-	 * Wordlift_Admin_Dashboard_V2 constructor.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $entity_service ) {
-
-		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
-
-		// Define where to access the tip.
-		defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * Set up the dashboard metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public function dashboard_setup() {
-		/**
-		 * Filter name: wl_feature__enable__wordlift-dashboard
-		 * Feature flag to enable / disable dashboard
-		 *
-		 * @since 3.30.0
-		 */
+    const TODAYS_TIP       = 'wl_todays_tip_data';
+    const AVERAGE_POSITION = 'wl_search_rankings_average_position';
+
+    /**
+     * @var \Wordlift_Entity_Service $entity_service
+     */
+    private $entity_service;
+
+    /**
+     * Wordlift_Admin_Dashboard_V2 constructor.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $entity_service ) {
+
+        add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+
+        // Define where to access the tip.
+        defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
+        defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
+        defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * Set up the dashboard metabox.
+     *
+     * @since 3.20.0
+     */
+    public function dashboard_setup() {
+        /**
+         * Filter name: wl_feature__enable__wordlift-dashboard
+         * Feature flag to enable / disable dashboard
+         *
+         * @since 3.30.0
+         */
         // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__wordlift-dashboard', true ) ) {
-			wp_add_dashboard_widget(
-				'wl-dashboard-v2',
-				__( 'WordLift Dashboard', 'wordlift' ),
-				array( $this, 'dashboard_setup_callback' )
-			);
-		}
-
-	}
-
-	/**
-	 * The dashboard setup callback.
-	 *
-	 * @since 3.20.0
-	 */
-	public function dashboard_setup_callback() {
-
-		require_once plugin_dir_path( __DIR__ ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
-
-	}
-
-	/**
-	 * Get the top entities.
-	 *
-	 * @return array|object|null An array of top entities.
-	 * @since 3.20.0
-	 */
-	private function get_top_entities() {
-		/**
-		 * @since 3.27.7
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-		 * Top entities are generated by cron now.
-		 */
-		return get_option( Top_Entities::OPTION_KEY, array() );
-	}
-
-	/**
-	 * Get the today's tip block.
-	 *
-	 * @since 3.20.0
-	 */
-	public static function get_todays_tip_block() {
+        if ( apply_filters( 'wl_feature__enable__wordlift-dashboard', true ) ) {
+            wp_add_dashboard_widget(
+                'wl-dashboard-v2',
+                __( 'WordLift Dashboard', 'wordlift' ),
+                array( $this, 'dashboard_setup_callback' )
+            );
+        }
+
+    }
+
+    /**
+     * The dashboard setup callback.
+     *
+     * @since 3.20.0
+     */
+    public function dashboard_setup_callback() {
+
+        require_once plugin_dir_path( __DIR__ ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
+
+    }
+
+    /**
+     * Get the top entities.
+     *
+     * @return array|object|null An array of top entities.
+     * @since 3.20.0
+     */
+    private function get_top_entities() {
+        /**
+         * @since 3.27.7
+         * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+         * Top entities are generated by cron now.
+         */
+        return get_option( Top_Entities::OPTION_KEY, array() );
+    }
+
+    /**
+     * Get the today's tip block.
+     *
+     * @since 3.20.0
+     */
+    public static function get_todays_tip_block() {
 
         // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		$data = @self::get_todays_tip_data();
+        $data = @self::get_todays_tip_data();
 
-		// Unable to get data from the local cache, nor from the remote URL.
-		if ( false === $data ) {
-			return;
-		}
-		?>
+        // Unable to get data from the local cache, nor from the remote URL.
+        if ( false === $data ) {
+            return;
+        }
+        ?>
 
 		<div id="wl-todays-tip" class="wl-dashboard__block wl-dashboard__block--todays-tip">
 			<header>
@@ -107,52 +107,52 @@ 
 		</div>
 		<?php
 
-	}
-
-	/**
-	 * Get the today's tip data.
-	 *
-	 * @return array|false The today's tip data or false in case of error.
-	 * @since 3.20.0
-	 */
-	private static function get_todays_tip_data() {
-
-		// Return the transient.
-		if ( false !== get_transient( self::TODAYS_TIP ) ) {
-			return get_transient( self::TODAYS_TIP );
-		}
-
-		// If the transient isn't available, query the remote web site.
-		$url = WL_TODAYS_TIP_JSON_URL
-			   . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
-
-		$response = wp_remote_get( $url );
-
-		if ( is_wp_error( $response )
-			 || ! isset( $response['response']['code'] )
-			 || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-
-		$json = json_decode( $response['body'], true );
-
-		if ( empty( $json )
-			 || ! isset( $json[0]['title']['rendered'] )
-			 || ! isset( $json[0]['excerpt']['rendered'] )
-			 || ! isset( $json[0]['link'] ) ) {
-			return false;
-		}
-
-		$value = array(
-			'title'   => $json[0]['title']['rendered'],
-			'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
-			'link'    => $json[0]['link'],
-		);
-
-		// Store the results for one day.
-		set_transient( self::TODAYS_TIP, $value, 86400 );
-
-		return $value;
-	}
+    }
+
+    /**
+     * Get the today's tip data.
+     *
+     * @return array|false The today's tip data or false in case of error.
+     * @since 3.20.0
+     */
+    private static function get_todays_tip_data() {
+
+        // Return the transient.
+        if ( false !== get_transient( self::TODAYS_TIP ) ) {
+            return get_transient( self::TODAYS_TIP );
+        }
+
+        // If the transient isn't available, query the remote web site.
+        $url = WL_TODAYS_TIP_JSON_URL
+                . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
+
+        $response = wp_remote_get( $url );
+
+        if ( is_wp_error( $response )
+             || ! isset( $response['response']['code'] )
+             || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+
+        $json = json_decode( $response['body'], true );
+
+        if ( empty( $json )
+             || ! isset( $json[0]['title']['rendered'] )
+             || ! isset( $json[0]['excerpt']['rendered'] )
+             || ! isset( $json[0]['link'] ) ) {
+            return false;
+        }
+
+        $value = array(
+            'title'   => $json[0]['title']['rendered'],
+            'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
+            'link'    => $json[0]['link'],
+        );
+
+        // Store the results for one day.
+        set_transient( self::TODAYS_TIP, $value, 86400 );
+
+        return $value;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -17,14 +17,14 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+		add_action('wp_dashboard_setup', array($this, 'dashboard_setup'));
 
 		// Define where to access the tip.
-		defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
+		defined('WL_TODAYS_TIP_JSON_URL') || define('WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog');
+		defined('WL_TODAYS_TIP_JSON_URL_IT') || define('WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27');
+		defined('WL_TODAYS_TIP_JSON_URL_EN') || define('WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38');
 		$this->entity_service = $entity_service;
 
 	}
@@ -42,11 +42,11 @@ 
 		 * @since 3.30.0
 		 */
         // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__wordlift-dashboard', true ) ) {
+		if (apply_filters('wl_feature__enable__wordlift-dashboard', true)) {
 			wp_add_dashboard_widget(
 				'wl-dashboard-v2',
-				__( 'WordLift Dashboard', 'wordlift' ),
-				array( $this, 'dashboard_setup_callback' )
+				__('WordLift Dashboard', 'wordlift'),
+				array($this, 'dashboard_setup_callback')
 			);
 		}
 
@@ -59,7 +59,7 @@ 
 	 */
 	public function dashboard_setup_callback() {
 
-		require_once plugin_dir_path( __DIR__ ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
+		require_once plugin_dir_path(__DIR__).'admin/partials/wordlift-admin-dashboard-v2.php';
 
 	}
 
@@ -75,7 +75,7 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
 		 * Top entities are generated by cron now.
 		 */
-		return get_option( Top_Entities::OPTION_KEY, array() );
+		return get_option(Top_Entities::OPTION_KEY, array());
 	}
 
 	/**
@@ -89,20 +89,20 @@ 
 		$data = @self::get_todays_tip_data();
 
 		// Unable to get data from the local cache, nor from the remote URL.
-		if ( false === $data ) {
+		if (false === $data) {
 			return;
 		}
 		?>
 
 		<div id="wl-todays-tip" class="wl-dashboard__block wl-dashboard__block--todays-tip">
 			<header>
-				<h3><?php esc_html_e( "Today's Tip", 'wordlift' ); ?></h3>
+				<h3><?php esc_html_e("Today's Tip", 'wordlift'); ?></h3>
 			</header>
 			<article>
-				<p><strong><?php echo esc_html( wp_strip_all_tags( $data['title'] ) ); ?></strong>
-					<?php echo esc_html( wp_strip_all_tags( $data['excerpt'] ) ); ?>
+				<p><strong><?php echo esc_html(wp_strip_all_tags($data['title'])); ?></strong>
+					<?php echo esc_html(wp_strip_all_tags($data['excerpt'])); ?>
 					<a target="_blank"
-					   href="<?php echo esc_attr( $data['link'] ); ?>"><?php echo esc_html( __( 'Read more', 'wordlift' ) ); ?></a>
+					   href="<?php echo esc_attr($data['link']); ?>"><?php echo esc_html(__('Read more', 'wordlift')); ?></a>
 				</p>
 		</div>
 		<?php
@@ -118,39 +118,39 @@ 
 	private static function get_todays_tip_data() {
 
 		// Return the transient.
-		if ( false !== get_transient( self::TODAYS_TIP ) ) {
-			return get_transient( self::TODAYS_TIP );
+		if (false !== get_transient(self::TODAYS_TIP)) {
+			return get_transient(self::TODAYS_TIP);
 		}
 
 		// If the transient isn't available, query the remote web site.
 		$url = WL_TODAYS_TIP_JSON_URL
-			   . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
+			   . ('it' === get_bloginfo('language') ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN);
 
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
-		if ( is_wp_error( $response )
-			 || ! isset( $response['response']['code'] )
-			 || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response)
+			 || ! isset($response['response']['code'])
+			 || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
 
-		$json = json_decode( $response['body'], true );
+		$json = json_decode($response['body'], true);
 
-		if ( empty( $json )
-			 || ! isset( $json[0]['title']['rendered'] )
-			 || ! isset( $json[0]['excerpt']['rendered'] )
-			 || ! isset( $json[0]['link'] ) ) {
+		if (empty($json)
+			 || ! isset($json[0]['title']['rendered'])
+			 || ! isset($json[0]['excerpt']['rendered'])
+			 || ! isset($json[0]['link'])) {
 			return false;
 		}
 
 		$value = array(
 			'title'   => $json[0]['title']['rendered'],
-			'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
+			'excerpt' => '<!-- cached -->'.$json[0]['excerpt']['rendered'],
 			'link'    => $json[0]['link'],
 		);
 
 		// Store the results for one day.
-		set_transient( self::TODAYS_TIP, $value, 86400 );
+		set_transient(self::TODAYS_TIP, $value, 86400);
 
 		return $value;
 	}

src/shortcodes/wordlift-shortcode-field.php

Indentation +27 added lines, -27 removed lines

@@ -11,36 +11,36 @@
  */
 function wl_shortcode_field( $atts ) {
 
-	// Extract attributes and set default values.
-	$field_atts = shortcode_atts(
-		array(
-			'id'   => null,
-			'name' => null,
-		),
-		$atts
-	);
-
-	// Get id of the post
-	$entity_id = $field_atts['id'];
-	if ( $field_atts['id'] === null || ! is_numeric( $field_atts['id'] ) ) {
-		$entity_id = get_the_ID();
-	}
-
-	$property_name = $field_atts['name'];
-	if ( $property_name !== null ) {
-		$values = wl_schema_get_value( $entity_id, $property_name );
-	}
-
-	// Return
-	if ( is_array( $values ) ) {
-		return implode( ', ', $values );
-	} else {
-		return null;
-	}
+    // Extract attributes and set default values.
+    $field_atts = shortcode_atts(
+        array(
+            'id'   => null,
+            'name' => null,
+        ),
+        $atts
+    );
+
+    // Get id of the post
+    $entity_id = $field_atts['id'];
+    if ( $field_atts['id'] === null || ! is_numeric( $field_atts['id'] ) ) {
+        $entity_id = get_the_ID();
+    }
+
+    $property_name = $field_atts['name'];
+    if ( $property_name !== null ) {
+        $values = wl_schema_get_value( $entity_id, $property_name );
+    }
+
+    // Return
+    if ( is_array( $values ) ) {
+        return implode( ', ', $values );
+    } else {
+        return null;
+    }
 }
 
 function wl_register_shortcode_field() {
-	add_shortcode( 'wl_field', 'wl_shortcode_field' );
+    add_shortcode( 'wl_field', 'wl_shortcode_field' );
 }
 
 add_action( 'init', 'wl_register_shortcode_field' );

Spacing +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
  * @param array $atts An array of shortcode attributes.
  * @return string A dom element with requested property value(s).
  */
-function wl_shortcode_field( $atts ) {
+function wl_shortcode_field($atts) {
 
 	// Extract attributes and set default values.
 	$field_atts = shortcode_atts(
@@ -22,26 +22,26 @@ 
 
 	// Get id of the post
 	$entity_id = $field_atts['id'];
-	if ( $field_atts['id'] === null || ! is_numeric( $field_atts['id'] ) ) {
+	if ($field_atts['id'] === null || ! is_numeric($field_atts['id'])) {
 		$entity_id = get_the_ID();
 	}
 
 	$property_name = $field_atts['name'];
-	if ( $property_name !== null ) {
-		$values = wl_schema_get_value( $entity_id, $property_name );
+	if ($property_name !== null) {
+		$values = wl_schema_get_value($entity_id, $property_name);
 	}
 
 	// Return
-	if ( is_array( $values ) ) {
-		return implode( ', ', $values );
+	if (is_array($values)) {
+		return implode(', ', $values);
 	} else {
 		return null;
 	}
 }
 
 function wl_register_shortcode_field() {
-	add_shortcode( 'wl_field', 'wl_shortcode_field' );
+	add_shortcode('wl_field', 'wl_shortcode_field');
 }
 
-add_action( 'init', 'wl_register_shortcode_field' );
+add_action('init', 'wl_register_shortcode_field');
 

src/shortcodes/class-wordlift-shortcode-rest.php

Indentation +125 added lines, -125 removed lines

@@ -10,131 +10,131 @@
  */
 abstract class Wordlift_Shortcode_REST {
 
-	/**
-	 * The cache_ttl, set by extending classes.
-	 */
-	const CACHE_TTL = 86400; // 24 hours
-
-	public function __construct( $endpoint, $args ) {
-
-		$scope          = $this;
-		$this->endpoint = $endpoint;
-		$this->args     = $args;
-
-		// Register rest route with callback
-		add_action(
-			'rest_api_init',
-			function () use ( $scope ) {
-				register_rest_route(
-					WL_REST_ROUTE_DEFAULT_NAMESPACE,
-					$scope->endpoint,
-					array(
-						'methods'             => WP_REST_Server::READABLE,
-						'permission_callback' => '__return_true',
-						'callback'            => array( $scope, 'rest_callback' ),
-						'args'                => $scope->args,
-					)
-				);
-			}
-		);
-
-		// Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
-		add_action(
-			'plugins_loaded',
-			function () use ( $scope ) {
-
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
-					return;
-				}
-
-				remove_action( 'plugins_loaded', 'rocket_init' );
-				remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-				remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-			},
-			0
-		);
-
-		add_action(
-			'init',
-			function () use ( $scope ) {
-
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
-					return;
-				}
-
-				remove_action( 'init', 'wp_widgets_init', 1 );
-				remove_action( 'init', 'gglcptch_init' );
-			},
-			0
-		);
-
-	}
-
-	abstract public function get_data( $request );
-
-	public function rest_callback( WP_REST_Request $request ) {
-
-		// Respond from origin if TTL is 0
-		if ( static::CACHE_TTL === 0 ) {
-
-			$data     = $this->get_data( $request );
-			$response = rest_ensure_response( $data );
-			if ( is_wp_error( $data ) ) {
-				return $response;
-			}
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'MISS' );
-
-			return $response;
-		}
-
-		// Create the cache key.
-		$cache_key_params = $request->get_params();
-		unset( $cache_key_params['uniqid'] );
-		unset( $cache_key_params['rest_route'] );
-		$cache_key = array( 'request_params' => $cache_key_params );
-
-		// Create the TTL cache and try to get the results.
-		$cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
-		$cache_results = $cache->get( $cache_key );
-
-		if ( isset( $cache_results ) ) {
-
-			$response = rest_ensure_response( $cache_results );
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'HIT' );
-
-			return $response;
-		}
-
-		$data     = $this->get_data( $request );
-		$response = rest_ensure_response( $data );
-		if ( is_wp_error( $data ) ) {
-			return $response;
-		}
-		$response->header( 'Access-Control-Allow-Origin', '*' );
-		$response->header( 'X-WordLift-Cache', 'MISS' );
-
-		// Put the result before sending the json to the client, since sending the json will terminate us.
-		$cache->put( $cache_key, $data );
-
-		return $response;
-
-	}
-
-	private function is_endpoint() {
-		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
-
-		// Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
-
-		if ( isset( $_SERVER['REQUEST_URI'] ) && strpos( esc_url_raw( wp_unslash( (string) $_SERVER['REQUEST_URI'] ) ), $compare_route ) ) {
-			return true;
-		}
-		if ( ! empty( $_GET['rest_route'] ) && strpos( esc_url_raw( wp_unslash( (string) $_GET['rest_route'] ) ), $compare_route ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return true;
-		}
+    /**
+     * The cache_ttl, set by extending classes.
+     */
+    const CACHE_TTL = 86400; // 24 hours
+
+    public function __construct( $endpoint, $args ) {
+
+        $scope          = $this;
+        $this->endpoint = $endpoint;
+        $this->args     = $args;
+
+        // Register rest route with callback
+        add_action(
+            'rest_api_init',
+            function () use ( $scope ) {
+                register_rest_route(
+                    WL_REST_ROUTE_DEFAULT_NAMESPACE,
+                    $scope->endpoint,
+                    array(
+                        'methods'             => WP_REST_Server::READABLE,
+                        'permission_callback' => '__return_true',
+                        'callback'            => array( $scope, 'rest_callback' ),
+                        'args'                => $scope->args,
+                    )
+                );
+            }
+        );
+
+        // Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
+        add_action(
+            'plugins_loaded',
+            function () use ( $scope ) {
+
+                if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+                    return;
+                }
+
+                remove_action( 'plugins_loaded', 'rocket_init' );
+                remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+                remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+            },
+            0
+        );
+
+        add_action(
+            'init',
+            function () use ( $scope ) {
+
+                if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+                    return;
+                }
+
+                remove_action( 'init', 'wp_widgets_init', 1 );
+                remove_action( 'init', 'gglcptch_init' );
+            },
+            0
+        );
+
+    }
+
+    abstract public function get_data( $request );
+
+    public function rest_callback( WP_REST_Request $request ) {
+
+        // Respond from origin if TTL is 0
+        if ( static::CACHE_TTL === 0 ) {
+
+            $data     = $this->get_data( $request );
+            $response = rest_ensure_response( $data );
+            if ( is_wp_error( $data ) ) {
+                return $response;
+            }
+            $response->header( 'Access-Control-Allow-Origin', '*' );
+            $response->header( 'X-WordLift-Cache', 'MISS' );
+
+            return $response;
+        }
+
+        // Create the cache key.
+        $cache_key_params = $request->get_params();
+        unset( $cache_key_params['uniqid'] );
+        unset( $cache_key_params['rest_route'] );
+        $cache_key = array( 'request_params' => $cache_key_params );
+
+        // Create the TTL cache and try to get the results.
+        $cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
+        $cache_results = $cache->get( $cache_key );
+
+        if ( isset( $cache_results ) ) {
+
+            $response = rest_ensure_response( $cache_results );
+            $response->header( 'Access-Control-Allow-Origin', '*' );
+            $response->header( 'X-WordLift-Cache', 'HIT' );
+
+            return $response;
+        }
+
+        $data     = $this->get_data( $request );
+        $response = rest_ensure_response( $data );
+        if ( is_wp_error( $data ) ) {
+            return $response;
+        }
+        $response->header( 'Access-Control-Allow-Origin', '*' );
+        $response->header( 'X-WordLift-Cache', 'MISS' );
+
+        // Put the result before sending the json to the client, since sending the json will terminate us.
+        $cache->put( $cache_key, $data );
+
+        return $response;
+
+    }
+
+    private function is_endpoint() {
+        $compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
+
+        // Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
+
+        if ( isset( $_SERVER['REQUEST_URI'] ) && strpos( esc_url_raw( wp_unslash( (string) $_SERVER['REQUEST_URI'] ) ), $compare_route ) ) {
+            return true;
+        }
+        if ( ! empty( $_GET['rest_route'] ) && strpos( esc_url_raw( wp_unslash( (string) $_GET['rest_route'] ) ), $compare_route ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

Spacing +38 added lines, -38 removed lines

@@ -15,7 +15,7 @@ 
 	 */
 	const CACHE_TTL = 86400; // 24 hours
 
-	public function __construct( $endpoint, $args ) {
+	public function __construct($endpoint, $args) {
 
 		$scope          = $this;
 		$this->endpoint = $endpoint;
@@ -24,14 +24,14 @@ 
 		// Register rest route with callback
 		add_action(
 			'rest_api_init',
-			function () use ( $scope ) {
+			function() use ($scope) {
 				register_rest_route(
 					WL_REST_ROUTE_DEFAULT_NAMESPACE,
 					$scope->endpoint,
 					array(
 						'methods'             => WP_REST_Server::READABLE,
 						'permission_callback' => '__return_true',
-						'callback'            => array( $scope, 'rest_callback' ),
+						'callback'            => array($scope, 'rest_callback'),
 						'args'                => $scope->args,
 					)
 				);
@@ -41,96 +41,96 @@ 
 		// Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
 		add_action(
 			'plugins_loaded',
-			function () use ( $scope ) {
+			function() use ($scope) {
 
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+				if ( ! defined('REST_REQUEST') || ! REST_REQUEST || ! $scope->is_endpoint()) {
 					return;
 				}
 
-				remove_action( 'plugins_loaded', 'rocket_init' );
-				remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-				remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+				remove_action('plugins_loaded', 'rocket_init');
+				remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+				remove_action('plugins_loaded', 'wpseo_init', 14);
 			},
 			0
 		);
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
+			function() use ($scope) {
 
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+				if ( ! defined('REST_REQUEST') || ! REST_REQUEST || ! $scope->is_endpoint()) {
 					return;
 				}
 
-				remove_action( 'init', 'wp_widgets_init', 1 );
-				remove_action( 'init', 'gglcptch_init' );
+				remove_action('init', 'wp_widgets_init', 1);
+				remove_action('init', 'gglcptch_init');
 			},
 			0
 		);
 
 	}
 
-	abstract public function get_data( $request );
+	abstract public function get_data($request);
 
-	public function rest_callback( WP_REST_Request $request ) {
+	public function rest_callback(WP_REST_Request $request) {
 
 		// Respond from origin if TTL is 0
-		if ( static::CACHE_TTL === 0 ) {
+		if (static::CACHE_TTL === 0) {
 
-			$data     = $this->get_data( $request );
-			$response = rest_ensure_response( $data );
-			if ( is_wp_error( $data ) ) {
+			$data     = $this->get_data($request);
+			$response = rest_ensure_response($data);
+			if (is_wp_error($data)) {
 				return $response;
 			}
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'MISS' );
+			$response->header('Access-Control-Allow-Origin', '*');
+			$response->header('X-WordLift-Cache', 'MISS');
 
 			return $response;
 		}
 
 		// Create the cache key.
 		$cache_key_params = $request->get_params();
-		unset( $cache_key_params['uniqid'] );
-		unset( $cache_key_params['rest_route'] );
-		$cache_key = array( 'request_params' => $cache_key_params );
+		unset($cache_key_params['uniqid']);
+		unset($cache_key_params['rest_route']);
+		$cache_key = array('request_params' => $cache_key_params);
 
 		// Create the TTL cache and try to get the results.
-		$cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
-		$cache_results = $cache->get( $cache_key );
+		$cache         = new Ttl_Cache($this->endpoint, static::CACHE_TTL);
+		$cache_results = $cache->get($cache_key);
 
-		if ( isset( $cache_results ) ) {
+		if (isset($cache_results)) {
 
-			$response = rest_ensure_response( $cache_results );
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'HIT' );
+			$response = rest_ensure_response($cache_results);
+			$response->header('Access-Control-Allow-Origin', '*');
+			$response->header('X-WordLift-Cache', 'HIT');
 
 			return $response;
 		}
 
-		$data     = $this->get_data( $request );
-		$response = rest_ensure_response( $data );
-		if ( is_wp_error( $data ) ) {
+		$data     = $this->get_data($request);
+		$response = rest_ensure_response($data);
+		if (is_wp_error($data)) {
 			return $response;
 		}
-		$response->header( 'Access-Control-Allow-Origin', '*' );
-		$response->header( 'X-WordLift-Cache', 'MISS' );
+		$response->header('Access-Control-Allow-Origin', '*');
+		$response->header('X-WordLift-Cache', 'MISS');
 
 		// Put the result before sending the json to the client, since sending the json will terminate us.
-		$cache->put( $cache_key, $data );
+		$cache->put($cache_key, $data);
 
 		return $response;
 
 	}
 
 	private function is_endpoint() {
-		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
+		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE.$this->endpoint;
 
 		// Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
 
-		if ( isset( $_SERVER['REQUEST_URI'] ) && strpos( esc_url_raw( wp_unslash( (string) $_SERVER['REQUEST_URI'] ) ), $compare_route ) ) {
+		if (isset($_SERVER['REQUEST_URI']) && strpos(esc_url_raw(wp_unslash((string) $_SERVER['REQUEST_URI'])), $compare_route)) {
 			return true;
 		}
-		if ( ! empty( $_GET['rest_route'] ) && strpos( esc_url_raw( wp_unslash( (string) $_GET['rest_route'] ) ), $compare_route ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! empty($_GET['rest_route']) && strpos(esc_url_raw(wp_unslash((string) $_GET['rest_route'])), $compare_route)) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return true;
 		}
 

src/shortcodes/wordlift-shortcode-geomap.php

Indentation +103 added lines, -103 removed lines

@@ -11,46 +11,46 @@ 
  * Print both global or post related places in json. It's executed via Ajax
  */
 function wl_shortcode_geomap_ajax() {
-	check_ajax_referer( 'wl_geomap' );
-	// Get the post Id.
-	$post_id = isset( $_REQUEST['post_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_id'] ) ) : null;
+    check_ajax_referer( 'wl_geomap' );
+    // Get the post Id.
+    $post_id = isset( $_REQUEST['post_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_id'] ) ) : null;
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+    $map_data = ( is_numeric( $post_id )
+        ? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
+        : wl_shortcode_geomap_ajax_all_posts() );
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+    wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
 
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
-	global $wpdb;
-
-	return $wpdb->get_results(
-		$wpdb->prepare(
-			'SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude'
-			. " FROM {$wpdb->posts} p1 "
-			. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
-			. '  ON ri.object_id = p1.ID AND ri.predicate = %s'
-			. " INNER JOIN {$wpdb->postmeta} pm1"
-			. "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
-			. " INNER JOIN {$wpdb->postmeta} pm2"
-			. "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
-			. ' WHERE p1.post_status = %s',
-			'where',
-			'wl_geo_latitude',
-			'wl_geo_longitude',
-			'publish'
-		)
-	);
+    global $wpdb;
+
+    return $wpdb->get_results(
+        $wpdb->prepare(
+            'SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude'
+            . " FROM {$wpdb->posts} p1 "
+            . " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
+            . '  ON ri.object_id = p1.ID AND ri.predicate = %s'
+            . " INNER JOIN {$wpdb->postmeta} pm1"
+            . "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
+            . " INNER JOIN {$wpdb->postmeta} pm2"
+            . "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
+            . ' WHERE p1.post_status = %s',
+            'where',
+            'wl_geo_latitude',
+            'wl_geo_longitude',
+            'publish'
+        )
+    );
 }
 
 function wl_shortcode_geomap_ajax_single_post( $post_id ) {
-	global $wpdb;
+    global $wpdb;
 
-	return $wpdb->get_results(
-		$wpdb->prepare(
-			"
+    return $wpdb->get_results(
+        $wpdb->prepare(
+            "
 		SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude
 		 FROM {$wpdb->prefix}wl_relation_instances ri
 		 INNER JOIN {$wpdb->posts} p2
@@ -69,87 +69,87 @@ 
 		  ON pm2.post_id = p.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value
 		 WHERE p.ID = %s
 		",
-			'publish',
-			'wl_geo_latitude',
-			'wl_geo_longitude',
-			$post_id,
-			'where',
-			// UNION
-			'wl_geo_latitude',
-			'wl_geo_longitude',
-			$post_id
-		)
-	);
+            'publish',
+            'wl_geo_latitude',
+            'wl_geo_longitude',
+            $post_id,
+            'where',
+            // UNION
+            'wl_geo_latitude',
+            'wl_geo_longitude',
+            $post_id
+        )
+    );
 }
 
 function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
 
-	global $wpdb;
-
-	return $wpdb->get_results(
-		$wpdb->prepare(
-			'SELECT p.ID, p.post_title'
-			. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-			" INNER JOIN {$wpdb->posts} p" .
-			'  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d' .
-			' WHERE ri.object_id = %d AND ri.predicate = %s',
-			'publish',
-			$exclude_post_id,
-			$post_id,
-			'where'
-		)
-	);
+    global $wpdb;
+
+    return $wpdb->get_results(
+        $wpdb->prepare(
+            'SELECT p.ID, p.post_title'
+            . " FROM {$wpdb->prefix}wl_relation_instances ri" .
+            " INNER JOIN {$wpdb->posts} p" .
+            '  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d' .
+            ' WHERE ri.object_id = %d AND ri.predicate = %s',
+            'publish',
+            $exclude_post_id,
+            $post_id,
+            'where'
+        )
+    );
 }
 
 function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
 
-	$boundaries = array();
-	$features   = array_map(
-		function ( $item ) use ( &$boundaries, $post_id ) {
-
-			$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-			$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
-
-			// Related posts.
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-			$subjects_inner_html = array_reduce(
-				$subjects,
-				function ( $carry, $subject ) {
-
-					$permalink = get_permalink( $subject->ID );
-
-					return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-				},
-				''
-			);
-			$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
-
-			$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-			$latitude      = floatval( $item->latitude );
-			$longitude     = floatval( $item->longitude );
-			$coordinates   = array( $latitude, $longitude );
-			$geometry      = array(
-				'type'        => 'Point',
-				'coordinates' => $coordinates,
-			);
-
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$boundaries[] = array( $longitude, $latitude );
-
-			return array(
-				'type'       => 'Feature',
-				'properties' => array( 'popupContent' => $popup_content ),
-				'geometry'   => $geometry,
-			);
-		},
-		$results
-	);
-
-	return array(
-		'features'   => $features,
-		'boundaries' => $boundaries,
-	);
+    $boundaries = array();
+    $features   = array_map(
+        function ( $item ) use ( &$boundaries, $post_id ) {
+
+            $thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
+            $thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+
+            // Related posts.
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+            $subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+            $subjects_inner_html = array_reduce(
+                $subjects,
+                function ( $carry, $subject ) {
+
+                    $permalink = get_permalink( $subject->ID );
+
+                    return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+                },
+                ''
+            );
+            $subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+
+            $popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
+            $latitude      = floatval( $item->latitude );
+            $longitude     = floatval( $item->longitude );
+            $coordinates   = array( $latitude, $longitude );
+            $geometry      = array(
+                'type'        => 'Point',
+                'coordinates' => $coordinates,
+            );
+
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+            $boundaries[] = array( $longitude, $latitude );
+
+            return array(
+                'type'       => 'Feature',
+                'properties' => array( 'popupContent' => $popup_content ),
+                'geometry'   => $geometry,
+            );
+        },
+        $results
+    );
+
+    return array(
+        'features'   => $features,
+        'boundaries' => $boundaries,
+    );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );

Spacing +28 added lines, -28 removed lines

@@ -11,15 +11,15 @@ 
  * Print both global or post related places in json. It's executed via Ajax
  */
 function wl_shortcode_geomap_ajax() {
-	check_ajax_referer( 'wl_geomap' );
+	check_ajax_referer('wl_geomap');
 	// Get the post Id.
-	$post_id = isset( $_REQUEST['post_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_id'] ) ) : null;
+	$post_id = isset($_REQUEST['post_id']) ? sanitize_text_field(wp_unslash($_REQUEST['post_id'])) : null;
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+	$map_data = (is_numeric($post_id)
+		? wl_shortcode_geomap_ajax_single_post((int) $post_id)
+		: wl_shortcode_geomap_ajax_all_posts());
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+	wl_core_send_json(wl_shortcode_geomap_format_results($map_data, $post_id));
 
 }
 
@@ -45,7 +45,7 @@ 
 	);
 }
 
-function wl_shortcode_geomap_ajax_single_post( $post_id ) {
+function wl_shortcode_geomap_ajax_single_post($post_id) {
 	global $wpdb;
 
 	return $wpdb->get_results(
@@ -82,16 +82,16 @@ 
 	);
 }
 
-function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
+function wl_shortcode_geomap_get_subjects($post_id, $exclude_post_id) {
 
 	global $wpdb;
 
 	return $wpdb->get_results(
 		$wpdb->prepare(
 			'SELECT p.ID, p.post_title'
-			. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-			" INNER JOIN {$wpdb->posts} p" .
-			'  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d' .
+			. " FROM {$wpdb->prefix}wl_relation_instances ri".
+			" INNER JOIN {$wpdb->posts} p".
+			'  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d'.
 			' WHERE ri.object_id = %d AND ri.predicate = %s',
 			'publish',
 			$exclude_post_id,
@@ -101,45 +101,45 @@ 
 	);
 }
 
-function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
+function wl_shortcode_geomap_format_results($results, $post_id = null) {
 
 	$boundaries = array();
 	$features   = array_map(
-		function ( $item ) use ( &$boundaries, $post_id ) {
+		function($item) use (&$boundaries, $post_id) {
 
-			$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-			$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+			$thumbnail_url  = get_the_post_thumbnail_url($item->ID);
+			$thumbnail_html = ($thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '');
 
 			// Related posts.
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+			$subjects            = wl_shortcode_geomap_get_subjects($item->ID, $post_id);
 			$subjects_inner_html = array_reduce(
 				$subjects,
-				function ( $carry, $subject ) {
+				function($carry, $subject) {
 
-					$permalink = get_permalink( $subject->ID );
+					$permalink = get_permalink($subject->ID);
 
-					return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+					return $carry.sprintf('<li><a href="%s">%s</a></li>', $permalink, esc_html($subject->post_title));
 				},
 				''
 			);
-			$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+			$subjects_html = ( ! empty($subjects_inner_html) ? '<ul>'.$subjects_inner_html.'</ul>' : '');
 
-			$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-			$latitude      = floatval( $item->latitude );
-			$longitude     = floatval( $item->longitude );
-			$coordinates   = array( $latitude, $longitude );
+			$popup_content = sprintf('<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink($item->ID), $thumbnail_html, esc_html($item->post_title), $subjects_html);
+			$latitude      = floatval($item->latitude);
+			$longitude     = floatval($item->longitude);
+			$coordinates   = array($latitude, $longitude);
 			$geometry      = array(
 				'type'        => 'Point',
 				'coordinates' => $coordinates,
 			);
 
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$boundaries[] = array( $longitude, $latitude );
+			$boundaries[] = array($longitude, $latitude);
 
 			return array(
 				'type'       => 'Feature',
-				'properties' => array( 'popupContent' => $popup_content ),
+				'properties' => array('popupContent' => $popup_content),
 				'geometry'   => $geometry,
 			);
 		},
@@ -152,5 +152,5 @@ 
 	);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');

src/shortcodes/class-wordlift-products-navigator-shortcode-rest.php

Indentation +287 added lines, -287 removed lines

@@ -4,243 +4,243 @@ 
 
 class Wordlift_Products_Navigator_Shortcode_REST extends Wordlift_Shortcode_REST {
 
-	const CACHE_TTL = 3600; // 1 hour
-
-	public function __construct() {
-		parent::__construct(
-			'/products-navigator',
-			array(
-				'post_id' => array(
-					'description' => __( 'Post ID for which Navigator has to be queried', 'wordlift' ),
-					'type'        => 'integer',
-					'required'    => true,
-				),
-				'uniqid'  => array(
-					'description' => __( 'Navigator uniqueid', 'wordlift' ),
-					'type'        => 'string',
-					'required'    => true,
-				),
-				'limit'   => array(
-					'default'           => 4,
-					'type'              => 'integer',
-					'sanitize_callback' => 'absint',
-				),
-				'offset'  => array(
-					'default'           => 0,
-					'type'              => 'integer',
-					'sanitize_callback' => 'absint',
-				),
-				'sort'    => array(
-					'default'           => 'ID DESC',
-					'sanitize_callback' => 'sanitize_sql_orderby',
-				),
-				'amp'     => array(
-					'sanitize_callback' => 'rest_sanitize_boolean',
-				),
-			)
-		);
-	}
-
-	public function get_data( $request ) {
-
-		// Sanitize and set defaults
-		$navigator_length = $request['limit'];
-		$navigator_offset = $request['offset'];
-		$order_by         = $request['sort'];
-		$post_id          = $request['post_id'];
-		$navigator_id     = $request['uniqid'];
-		$amp              = $request['amp'];
-
-		$post = get_post( $post_id );
-
-		// Post ID has to match an existing item
-		if ( null === $post ) {
-			return new WP_Error( 'rest_invalid_post_id', __( 'Invalid post_id', 'wordlift' ), array( 'status' => 404 ) );
-		}
-
-		// Determine navigator type and call respective get_*_results
-		if ( get_post_type( $post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
-			$referencing_posts = $this->get_entity_results(
-				$post_id,
-				array(
-					'ID',
-					'post_title',
-				),
-				$order_by,
-				$navigator_length,
-				$navigator_offset
-			);
-		} else {
-			$referencing_posts = $this->get_post_results(
-				$post_id,
-				array(
-					'ID',
-					'post_title',
-				),
-				$order_by,
-				$navigator_length,
-				$navigator_offset
-			);
-		}
-
-		// Fetch directly referencing posts excluding referencing posts via entities
-		$directly_referencing_posts = $this->get_directly_referencing_posts(
-			$post_id,
-			array_map(
-				function ( $referencing_post ) {
-					return $referencing_post->ID;
-				},
-				$referencing_posts
-			)
-		);
-
-		// Combine directly referencing posts and referencing posts via entities
-		$referencing_posts = array_merge( $directly_referencing_posts, $referencing_posts );
-
-		// loop over them and take the first one which is not already in the $related_posts
-		$results = array();
-		foreach ( $referencing_posts as $referencing_post ) {
-			$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-			$product           = wc_get_product( $referencing_post->ID );
-
-			$result = array(
-				'product' => array(
-					'id'              => $referencing_post->ID,
-					'permalink'       => get_permalink( $referencing_post->ID ),
-					'title'           => $referencing_post->post_title,
-					'thumbnail'       => get_the_post_thumbnail_url( $referencing_post, 'medium' ),
-					'regular_price'   => $product->get_regular_price(),
-					'sale_price'      => $product->get_sale_price(),
-					'price'           => $product->get_price(),
-					'currency_symbol' => get_woocommerce_currency_symbol(),
-					'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
-					'average_rating'  => $product->get_average_rating(),
-					'rating_count'    => $product->get_rating_count(),
-					'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
-				),
-				'entity'  => array(
-					'id'        => $referencing_post->entity_id,
-					'label'     => $serialized_entity['label'],
-					'mainType'  => $serialized_entity['mainType'],
-					'permalink' => get_permalink( $referencing_post->entity_id ),
-				),
-			);
-
-			$results[] = $result;
-
-		}
-
-		if ( count( $results ) < $navigator_length ) {
-			$results = apply_filters( 'wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-		}
-
-		// Add filler posts if needed
-		$filler_count = $navigator_length - count( $results );
-		if ( $filler_count > 0 ) {
-			$referencing_post_ids = array_map(
-				function ( $p ) {
-					return $p->ID;
-				},
-				$referencing_posts
-			);
-			/**
-			 * @since 3.28.0
-			 * Filler posts are fetched using this util.
-			 */
-			$filler_posts_util       = new Filler_Posts_Util( $post_id, 'product' );
-			$post_ids_to_be_excluded = array_merge( array( $post_id ), $referencing_post_ids );
-			$filler_posts            = $filler_posts_util->get_product_navigator_response( $filler_count, $post_ids_to_be_excluded );
-			$results                 = array_merge( $results, $filler_posts );
-		}
-
-		// Apply filters after fillers are added
-		foreach ( $results as $result_index => $result ) {
-			$results[ $result_index ]['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $result['product']['id'] ), $navigator_id );
-			$results[ $result_index ]['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
-		}
-
-		$results = apply_filters( 'wl_products_navigator_results', $results, $navigator_id );
-
-		return $amp ? array(
-			'items' => array(
-				array( 'values' => $results ),
-			),
-		) : $results;
-
-	}
-
-	private function get_directly_referencing_posts( $post_id, $referencing_post_ids ) {
-
-		$directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities( $post_id );
-
-		$post__in = array_diff( $directly_referencing_post_ids, $referencing_post_ids );
-
-		$directly_referencing_posts = get_posts(
-			array(
-				'meta_query'          => array(
-					array(
-						'key' => '_thumbnail_id',
-					),
-					array(
-						'key'   => '_stock_status',
-						'value' => 'instock',
-					),
-				),
-				'post__in'            => $post__in,
-				'post_type'           => 'product',
-				'ignore_sticky_posts' => 1,
-			)
-		);
-
-		$results = array();
-
-		foreach ( $directly_referencing_posts as $post ) {
-			$result             = new stdClass();
-			$result->ID         = $post->ID;
-			$result->post_title = $post->post_title;
-			$result->entity_id  = $post->ID;
-			$results[]          = $result;
-		}
-
-		return $results;
-	}
-
-	private function get_entity_results(
-		$post_id,
-		$fields = array(
-			'ID',
-			'post_title',
-		),
-		$order_by = 'ID DESC',
-		$limit = 10,
-		$offset = 0
-	) {
-		global $wpdb;
-
-		$select = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item AS $item";
-				},
-				(array) $fields
-			)
-		);
-
-		$order_by = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item";
-				},
-				(array) $order_by
-			)
-		);
+    const CACHE_TTL = 3600; // 1 hour
+
+    public function __construct() {
+        parent::__construct(
+            '/products-navigator',
+            array(
+                'post_id' => array(
+                    'description' => __( 'Post ID for which Navigator has to be queried', 'wordlift' ),
+                    'type'        => 'integer',
+                    'required'    => true,
+                ),
+                'uniqid'  => array(
+                    'description' => __( 'Navigator uniqueid', 'wordlift' ),
+                    'type'        => 'string',
+                    'required'    => true,
+                ),
+                'limit'   => array(
+                    'default'           => 4,
+                    'type'              => 'integer',
+                    'sanitize_callback' => 'absint',
+                ),
+                'offset'  => array(
+                    'default'           => 0,
+                    'type'              => 'integer',
+                    'sanitize_callback' => 'absint',
+                ),
+                'sort'    => array(
+                    'default'           => 'ID DESC',
+                    'sanitize_callback' => 'sanitize_sql_orderby',
+                ),
+                'amp'     => array(
+                    'sanitize_callback' => 'rest_sanitize_boolean',
+                ),
+            )
+        );
+    }
+
+    public function get_data( $request ) {
+
+        // Sanitize and set defaults
+        $navigator_length = $request['limit'];
+        $navigator_offset = $request['offset'];
+        $order_by         = $request['sort'];
+        $post_id          = $request['post_id'];
+        $navigator_id     = $request['uniqid'];
+        $amp              = $request['amp'];
+
+        $post = get_post( $post_id );
+
+        // Post ID has to match an existing item
+        if ( null === $post ) {
+            return new WP_Error( 'rest_invalid_post_id', __( 'Invalid post_id', 'wordlift' ), array( 'status' => 404 ) );
+        }
+
+        // Determine navigator type and call respective get_*_results
+        if ( get_post_type( $post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+            $referencing_posts = $this->get_entity_results(
+                $post_id,
+                array(
+                    'ID',
+                    'post_title',
+                ),
+                $order_by,
+                $navigator_length,
+                $navigator_offset
+            );
+        } else {
+            $referencing_posts = $this->get_post_results(
+                $post_id,
+                array(
+                    'ID',
+                    'post_title',
+                ),
+                $order_by,
+                $navigator_length,
+                $navigator_offset
+            );
+        }
+
+        // Fetch directly referencing posts excluding referencing posts via entities
+        $directly_referencing_posts = $this->get_directly_referencing_posts(
+            $post_id,
+            array_map(
+                function ( $referencing_post ) {
+                    return $referencing_post->ID;
+                },
+                $referencing_posts
+            )
+        );
+
+        // Combine directly referencing posts and referencing posts via entities
+        $referencing_posts = array_merge( $directly_referencing_posts, $referencing_posts );
+
+        // loop over them and take the first one which is not already in the $related_posts
+        $results = array();
+        foreach ( $referencing_posts as $referencing_post ) {
+            $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+            $product           = wc_get_product( $referencing_post->ID );
+
+            $result = array(
+                'product' => array(
+                    'id'              => $referencing_post->ID,
+                    'permalink'       => get_permalink( $referencing_post->ID ),
+                    'title'           => $referencing_post->post_title,
+                    'thumbnail'       => get_the_post_thumbnail_url( $referencing_post, 'medium' ),
+                    'regular_price'   => $product->get_regular_price(),
+                    'sale_price'      => $product->get_sale_price(),
+                    'price'           => $product->get_price(),
+                    'currency_symbol' => get_woocommerce_currency_symbol(),
+                    'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
+                    'average_rating'  => $product->get_average_rating(),
+                    'rating_count'    => $product->get_rating_count(),
+                    'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
+                ),
+                'entity'  => array(
+                    'id'        => $referencing_post->entity_id,
+                    'label'     => $serialized_entity['label'],
+                    'mainType'  => $serialized_entity['mainType'],
+                    'permalink' => get_permalink( $referencing_post->entity_id ),
+                ),
+            );
+
+            $results[] = $result;
+
+        }
+
+        if ( count( $results ) < $navigator_length ) {
+            $results = apply_filters( 'wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+        }
+
+        // Add filler posts if needed
+        $filler_count = $navigator_length - count( $results );
+        if ( $filler_count > 0 ) {
+            $referencing_post_ids = array_map(
+                function ( $p ) {
+                    return $p->ID;
+                },
+                $referencing_posts
+            );
+            /**
+             * @since 3.28.0
+             * Filler posts are fetched using this util.
+             */
+            $filler_posts_util       = new Filler_Posts_Util( $post_id, 'product' );
+            $post_ids_to_be_excluded = array_merge( array( $post_id ), $referencing_post_ids );
+            $filler_posts            = $filler_posts_util->get_product_navigator_response( $filler_count, $post_ids_to_be_excluded );
+            $results                 = array_merge( $results, $filler_posts );
+        }
+
+        // Apply filters after fillers are added
+        foreach ( $results as $result_index => $result ) {
+            $results[ $result_index ]['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $result['product']['id'] ), $navigator_id );
+            $results[ $result_index ]['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+        }
+
+        $results = apply_filters( 'wl_products_navigator_results', $results, $navigator_id );
+
+        return $amp ? array(
+            'items' => array(
+                array( 'values' => $results ),
+            ),
+        ) : $results;
+
+    }
+
+    private function get_directly_referencing_posts( $post_id, $referencing_post_ids ) {
+
+        $directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities( $post_id );
+
+        $post__in = array_diff( $directly_referencing_post_ids, $referencing_post_ids );
+
+        $directly_referencing_posts = get_posts(
+            array(
+                'meta_query'          => array(
+                    array(
+                        'key' => '_thumbnail_id',
+                    ),
+                    array(
+                        'key'   => '_stock_status',
+                        'value' => 'instock',
+                    ),
+                ),
+                'post__in'            => $post__in,
+                'post_type'           => 'product',
+                'ignore_sticky_posts' => 1,
+            )
+        );
+
+        $results = array();
+
+        foreach ( $directly_referencing_posts as $post ) {
+            $result             = new stdClass();
+            $result->ID         = $post->ID;
+            $result->post_title = $post->post_title;
+            $result->entity_id  = $post->ID;
+            $results[]          = $result;
+        }
+
+        return $results;
+    }
+
+    private function get_entity_results(
+        $post_id,
+        $fields = array(
+            'ID',
+            'post_title',
+        ),
+        $order_by = 'ID DESC',
+        $limit = 10,
+        $offset = 0
+    ) {
+        global $wpdb;
+
+        $select = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item AS $item";
+                },
+                (array) $fields
+            )
+        );
+
+        $order_by = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item";
+                },
+                (array) $order_by
+            )
+        );
 // phpcs:disable WordPress.DB.PreparedSQLPlaceholders.UnquotedComplexPlaceholder
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"
+        /** @noinspection SqlNoDataSourceInspection */
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -273,51 +273,51 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 ",
-				$post_id,
-				$limit,
-				$offset,
-				$select,
-				$order_by
-			)
-		);
-	}
+                $post_id,
+                $limit,
+                $offset,
+                $select,
+                $order_by
+            )
+        );
+    }
 // phpcs:enable
-	private function get_post_results(
-		$post_id,
-		$fields = array(
-			'ID',
-			'post_title',
-		),
-		$order_by = 'ID DESC',
-		$limit = 10,
-		$offset = 0
-	) {
-		global $wpdb;
-
-		$select = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item AS $item";
-				},
-				(array) $fields
-			)
-		);
-
-		$order_by = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item";
-				},
-				(array) $order_by
-			)
-		);
+    private function get_post_results(
+        $post_id,
+        $fields = array(
+            'ID',
+            'post_title',
+        ),
+        $order_by = 'ID DESC',
+        $limit = 10,
+        $offset = 0
+    ) {
+        global $wpdb;
+
+        $select = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item AS $item";
+                },
+                (array) $fields
+            )
+        );
+
+        $order_by = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item";
+                },
+                (array) $order_by
+            )
+        );
 // phpcs:disable WordPress.DB.PreparedSQLPlaceholders.UnquotedComplexPlaceholder,WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"
+        /** @noinspection SqlNoDataSourceInspection */
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -353,13 +353,13 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 ",
-				$post_id,
-				$limit,
-				$offset,
-				$select,
-				$order_by
-			)
-		);
-	}
+                $post_id,
+                $limit,
+                $offset,
+                $select,
+                $order_by
+            )
+        );
+    }
 // phpcs:enable
 }

Spacing +39 added lines, -39 removed lines

@@ -11,12 +11,12 @@ 
 			'/products-navigator',
 			array(
 				'post_id' => array(
-					'description' => __( 'Post ID for which Navigator has to be queried', 'wordlift' ),
+					'description' => __('Post ID for which Navigator has to be queried', 'wordlift'),
 					'type'        => 'integer',
 					'required'    => true,
 				),
 				'uniqid'  => array(
-					'description' => __( 'Navigator uniqueid', 'wordlift' ),
+					'description' => __('Navigator uniqueid', 'wordlift'),
 					'type'        => 'string',
 					'required'    => true,
 				),
@@ -41,7 +41,7 @@ 
 		);
 	}
 
-	public function get_data( $request ) {
+	public function get_data($request) {
 
 		// Sanitize and set defaults
 		$navigator_length = $request['limit'];
@@ -51,15 +51,15 @@ 
 		$navigator_id     = $request['uniqid'];
 		$amp              = $request['amp'];
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Post ID has to match an existing item
-		if ( null === $post ) {
-			return new WP_Error( 'rest_invalid_post_id', __( 'Invalid post_id', 'wordlift' ), array( 'status' => 404 ) );
+		if (null === $post) {
+			return new WP_Error('rest_invalid_post_id', __('Invalid post_id', 'wordlift'), array('status' => 404));
 		}
 
 		// Determine navigator type and call respective get_*_results
-		if ( get_post_type( $post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+		if (get_post_type($post_id) === Wordlift_Entity_Service::TYPE_NAME) {
 			$referencing_posts = $this->get_entity_results(
 				$post_id,
 				array(
@@ -87,7 +87,7 @@ 
 		$directly_referencing_posts = $this->get_directly_referencing_posts(
 			$post_id,
 			array_map(
-				function ( $referencing_post ) {
+				function($referencing_post) {
 					return $referencing_post->ID;
 				},
 				$referencing_posts
@@ -95,34 +95,34 @@ 
 		);
 
 		// Combine directly referencing posts and referencing posts via entities
-		$referencing_posts = array_merge( $directly_referencing_posts, $referencing_posts );
+		$referencing_posts = array_merge($directly_referencing_posts, $referencing_posts);
 
 		// loop over them and take the first one which is not already in the $related_posts
 		$results = array();
-		foreach ( $referencing_posts as $referencing_post ) {
-			$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-			$product           = wc_get_product( $referencing_post->ID );
+		foreach ($referencing_posts as $referencing_post) {
+			$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
+			$product           = wc_get_product($referencing_post->ID);
 
 			$result = array(
 				'product' => array(
 					'id'              => $referencing_post->ID,
-					'permalink'       => get_permalink( $referencing_post->ID ),
+					'permalink'       => get_permalink($referencing_post->ID),
 					'title'           => $referencing_post->post_title,
-					'thumbnail'       => get_the_post_thumbnail_url( $referencing_post, 'medium' ),
+					'thumbnail'       => get_the_post_thumbnail_url($referencing_post, 'medium'),
 					'regular_price'   => $product->get_regular_price(),
 					'sale_price'      => $product->get_sale_price(),
 					'price'           => $product->get_price(),
 					'currency_symbol' => get_woocommerce_currency_symbol(),
-					'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
+					'discount_pc'     => ($product->get_sale_price() && ($product->get_regular_price() > 0)) ? round(1 - ($product->get_sale_price() / $product->get_regular_price()), 2) * 100 : 0,
 					'average_rating'  => $product->get_average_rating(),
 					'rating_count'    => $product->get_rating_count(),
-					'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
+					'rating_html'     => wc_get_rating_html($product->get_average_rating(), $product->get_rating_count()),
 				),
 				'entity'  => array(
 					'id'        => $referencing_post->entity_id,
 					'label'     => $serialized_entity['label'],
 					'mainType'  => $serialized_entity['mainType'],
-					'permalink' => get_permalink( $referencing_post->entity_id ),
+					'permalink' => get_permalink($referencing_post->entity_id),
 				),
 			);
 
@@ -130,15 +130,15 @@ 
 
 		}
 
-		if ( count( $results ) < $navigator_length ) {
-			$results = apply_filters( 'wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+		if (count($results) < $navigator_length) {
+			$results = apply_filters('wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 		}
 
 		// Add filler posts if needed
-		$filler_count = $navigator_length - count( $results );
-		if ( $filler_count > 0 ) {
+		$filler_count = $navigator_length - count($results);
+		if ($filler_count > 0) {
 			$referencing_post_ids = array_map(
-				function ( $p ) {
+				function($p) {
 					return $p->ID;
 				},
 				$referencing_posts
@@ -147,33 +147,33 @@ 
 			 * @since 3.28.0
 			 * Filler posts are fetched using this util.
 			 */
-			$filler_posts_util       = new Filler_Posts_Util( $post_id, 'product' );
-			$post_ids_to_be_excluded = array_merge( array( $post_id ), $referencing_post_ids );
-			$filler_posts            = $filler_posts_util->get_product_navigator_response( $filler_count, $post_ids_to_be_excluded );
-			$results                 = array_merge( $results, $filler_posts );
+			$filler_posts_util       = new Filler_Posts_Util($post_id, 'product');
+			$post_ids_to_be_excluded = array_merge(array($post_id), $referencing_post_ids);
+			$filler_posts            = $filler_posts_util->get_product_navigator_response($filler_count, $post_ids_to_be_excluded);
+			$results                 = array_merge($results, $filler_posts);
 		}
 
 		// Apply filters after fillers are added
-		foreach ( $results as $result_index => $result ) {
-			$results[ $result_index ]['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $result['product']['id'] ), $navigator_id );
-			$results[ $result_index ]['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+		foreach ($results as $result_index => $result) {
+			$results[$result_index]['product'] = apply_filters('wl_products_navigator_data_post', $result['product'], intval($result['product']['id']), $navigator_id);
+			$results[$result_index]['entity']  = apply_filters('wl_products_navigator_data_entity', $result['entity'], intval($result['entity']['id']), $navigator_id);
 		}
 
-		$results = apply_filters( 'wl_products_navigator_results', $results, $navigator_id );
+		$results = apply_filters('wl_products_navigator_results', $results, $navigator_id);
 
 		return $amp ? array(
 			'items' => array(
-				array( 'values' => $results ),
+				array('values' => $results),
 			),
 		) : $results;
 
 	}
 
-	private function get_directly_referencing_posts( $post_id, $referencing_post_ids ) {
+	private function get_directly_referencing_posts($post_id, $referencing_post_ids) {
 
-		$directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities( $post_id );
+		$directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities($post_id);
 
-		$post__in = array_diff( $directly_referencing_post_ids, $referencing_post_ids );
+		$post__in = array_diff($directly_referencing_post_ids, $referencing_post_ids);
 
 		$directly_referencing_posts = get_posts(
 			array(
@@ -194,7 +194,7 @@ 
 
 		$results = array();
 
-		foreach ( $directly_referencing_posts as $post ) {
+		foreach ($directly_referencing_posts as $post) {
 			$result             = new stdClass();
 			$result->ID         = $post->ID;
 			$result->post_title = $post->post_title;
@@ -220,7 +220,7 @@ 
 		$select = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item AS $item";
 				},
 				(array) $fields
@@ -230,7 +230,7 @@ 
 		$order_by = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item";
 				},
 				(array) $order_by
@@ -297,7 +297,7 @@ 
 		$select = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item AS $item";
 				},
 				(array) $fields
@@ -307,7 +307,7 @@ 
 		$order_by = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item";
 				},
 				(array) $order_by