insideout10 / wordlift-plugin

src/admin/elements/class-wordlift-admin-input-radio-element.php

Indentation +39 added lines, -39 removed lines

@@ -18,48 +18,48 @@ 
  */
 class Wordlift_Admin_Radio_Input_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * Output the HTML for an input box type settings_page.
-	 *
-	 * @param array $args {
-	 *                           An array of arguments.
-	 *
-	 * @type string $name The name attribute of the input element. Mandatory.
-	 * @type string $id The id attribute of the input element. Optional,
-	 *                           randomly generated one is used if not supplied.
-	 * @type string $value The value of the input element. Optional, defaults
-	 *                           to empty string.
-	 * @type string $css_class The class attribute for the input element. If empty
-	 *                           string no class attribute will be added. Optional,
-	 *                           defaults to empty string.
-	 * @type string $description The description text to be displayed below the element.
-	 *                           Can include some HTML element. If empty string no
-	 *                           description will be displayed. Optional, defaults to
-	 *                           empty string.
-	 * }
-	 * @return $this|Wordlift_Admin_Element
-	 * @since      3.13.0
-	 *
-	 */
-	public function render( $args ) {
-		/*
+    /**
+     * Output the HTML for an input box type settings_page.
+     *
+     * @param array $args {
+     *                           An array of arguments.
+     *
+     * @type string $name The name attribute of the input element. Mandatory.
+     * @type string $id The id attribute of the input element. Optional,
+     *                           randomly generated one is used if not supplied.
+     * @type string $value The value of the input element. Optional, defaults
+     *                           to empty string.
+     * @type string $css_class The class attribute for the input element. If empty
+     *                           string no class attribute will be added. Optional,
+     *                           defaults to empty string.
+     * @type string $description The description text to be displayed below the element.
+     *                           Can include some HTML element. If empty string no
+     *                           description will be displayed. Optional, defaults to
+     *                           empty string.
+     * }
+     * @return $this|Wordlift_Admin_Element
+     * @since      3.13.0
+     *
+     */
+    public function render( $args ) {
+        /*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
-			'value'       => '',
-			'css_class'   => '',
-			'description' => '',
-		) );
+        $params = wp_parse_args( $args, array(
+            'id'          => uniqid( 'wl-input-' ),
+            'value'       => '',
+            'css_class'   => '',
+            'description' => '',
+        ) );
 
-		// Set the readonly and class attributes and the description.
-		$value       = $params['value'];
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+        // Set the readonly and class attributes and the description.
+        $value       = $params['value'];
+        $css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
+        $description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
 
-		?>
+        ?>
 
         <input type="radio" id="<?php echo esc_attr( $params['id'] ); ?>"
                name="<?php echo esc_attr( $params['name'] ); ?>"
@@ -73,9 +73,9 @@ 
         /> No
 
 		<?php
-		echo  wp_kses( $description, array(  'p' =>array(), 'a' => array( 'href' => array() ) ) );
+        echo  wp_kses( $description, array(  'p' =>array(), 'a' => array( 'href' => array() ) ) );
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -41,39 +41,39 @@
 	 * @since      3.13.0
 	 *
 	 */
-	public function render( $args ) {
+	public function render($args) {
 		/*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'          => uniqid('wl-input-'),
 			'value'       => '',
 			'css_class'   => '',
 			'description' => '',
-		) );
+		));
 
 		// Set the readonly and class attributes and the description.
 		$value       = $params['value'];
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+		$css_class   = ! empty($params['css_class']) ? ' class="'.esc_attr($params['css_class']).'"' : '';
+		$description = ! empty($params['description']) ? '<p>'.wp_kses($params['description'], array('a' => array('href' => array()))).'</p>' : '';
 
 		?>
 
-        <input type="radio" id="<?php echo esc_attr( $params['id'] ); ?>"
-               name="<?php echo esc_attr( $params['name'] ); ?>"
+        <input type="radio" id="<?php echo esc_attr($params['id']); ?>"
+               name="<?php echo esc_attr($params['name']); ?>"
                value="yes" <?php echo $css_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-			<?php checked( $value, 'yes' ); ?>
+			<?php checked($value, 'yes'); ?>
         /> Yes
-        <input type="radio" id="<?php echo esc_attr( $params['id'] ); ?>"
-               name="<?php echo esc_attr( $params['name'] ); ?>"
+        <input type="radio" id="<?php echo esc_attr($params['id']); ?>"
+               name="<?php echo esc_attr($params['name']); ?>"
                value="no" <?php echo $css_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped?>
-			<?php checked( $value, 'no' ); ?>
+			<?php checked($value, 'no'); ?>
         /> No
 
 		<?php
-		echo  wp_kses( $description, array(  'p' =>array(), 'a' => array( 'href' => array() ) ) );
+		echo  wp_kses($description, array('p' =>array(), 'a' => array('href' => array())));
 
 		return $this;
 	}

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

Indentation +194 added lines, -194 removed lines

@@ -18,100 +18,100 @@ 
  */
 class Wordlift_Dashboard_Service {
 
-	/**
-	 * Transient Name
-	 *
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_NAME = 'wl_dashboard_stats';
-
-	/**
-	 * Transient Expiration (in seconds)
-	 *
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_EXPIRATION = 86400;
-
-	/**
-	 * A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	private $rating_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.4.0
-	 *
-	 */
-	protected function __construct() {
-
-		$this->rating_service = Wordlift_Rating_Service::get_instance();
-		$this->entity_service = Wordlift_Entity_Service::get_instance();
-
-	}
-
-	private static $instance;
-
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Return stats layout
-	 *
-	 * @return string Dashboard widget html markup
-	 * @since 3.4.0
-	 *
-	 */
-	public function dashboard_widget_callback( $post ) {
+    /**
+     * Transient Name
+     *
+     * @since  3.4.0
+     */
+    const TRANSIENT_NAME = 'wl_dashboard_stats';
+
+    /**
+     * Transient Expiration (in seconds)
+     *
+     * @since  3.4.0
+     */
+    const TRANSIENT_EXPIRATION = 86400;
+
+    /**
+     * A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    private $rating_service;
+
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.4.0
+     *
+     */
+    protected function __construct() {
+
+        $this->rating_service = Wordlift_Rating_Service::get_instance();
+        $this->entity_service = Wordlift_Entity_Service::get_instance();
+
+    }
+
+    private static $instance;
+
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Return stats layout
+     *
+     * @return string Dashboard widget html markup
+     * @since 3.4.0
+     *
+     */
+    public function dashboard_widget_callback( $post ) {
         $caption_kses = array( 'a' => array( 'href' => array() ) );
-		$enriched_posts_title   = __( 'enriched posts', 'wordlift' );
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'annotatedPostsPercentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )
-		);
-
-		$rating_title   = __( 'average entity rating', 'wordlift' );
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
-		);
-
-		$graph_title   = __( 'triples in your graph', 'wordlift' );
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
-		);
-
-		$triples_label = __( 'triples', 'wordlift' );
-
-		?>
+        $enriched_posts_title   = __( 'enriched posts', 'wordlift' );
+        $enriched_posts_caption = sprintf( wp_kses(
+            __( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'annotatedPostsPercentage' ),
+            esc_url( admin_url( 'edit.php' ) ),
+            $this->render_stat_param( 'annotated_posts' ),
+            $this->render_stat_param( 'posts' )
+        );
+
+        $rating_title   = __( 'average entity rating', 'wordlift' );
+        $rating_caption = sprintf( wp_kses(
+            __( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'entities' ),
+            esc_url( admin_url( 'edit.php?post_type=entity' ) ),
+            $this->render_stat_param( 'rating' )
+        );
+
+        $graph_title   = __( 'triples in your graph', 'wordlift' );
+        $graph_caption = sprintf( wp_kses(
+            __( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'wikidata' ),
+            esc_url( 'https://www.wikidata.org/' )
+        );
+
+        $triples_label = __( 'triples', 'wordlift' );
+
+        ?>
         <div id="wl-dashboard-widget-inner-wrapper">
             <div class="wl-stat-card">
                 <div class="wl-stat-graph-wrapper">
@@ -150,109 +150,109 @@ 
         </div>
 		<?php
 
-	}
-
-	/**
-	 * Return stats
-	 *
-	 * @return string markup
-	 * @since 3.4.0
-	 *
-	 */
-	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
-			$this,
-			'dashboard_widget_callback',
-		) );
-	}
-
-	/**
-	 * Return stats
-	 * @uses  https://codex.wordpress.org/Function_Reference/set_transient
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string JSON obj with all available stats.
-	 */
-	public function ajax_get_stats() {
-
-		// If needed, the transient is force to reloaded.
-		if ( isset( $_GET['force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
-		}
-
-		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
-
-		if ( ! $stats ) {
-			// Calculate stats
-			$stats = array(
-				'entities'        => $this->entity_service->count(),
-				'posts'           => $this->count_posts(),
-				'annotated_posts' => $this->count_annotated_posts(),
-				'triples'         => $this->count_triples() ?: '-',
-				'rating'          => $this->average_entities_rating(),
-			);
-			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
-		}
-		// Return stats as json object
-		wl_core_send_json( $stats );
-	}
-
-	/**
-	 * Calculate total number of published posts
-	 * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of published posts.
-	 */
-	public function count_posts() {
-
-		return (int) wp_count_posts()->publish;
-	}
-
-	/**
-	 * Calculate total number of annotated published posts
-	 * @return int Total number of annotated published posts.
-	 * @since 3.4.0
-	 *
-	 */
-	public function count_annotated_posts() {
-
-		// Prepare interaction with db
-		global $wpdb;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-		// Calculate sql statement
-		$sql_statement = "
+    }
+
+    /**
+     * Return stats
+     *
+     * @return string markup
+     * @since 3.4.0
+     *
+     */
+    public function add_dashboard_widgets() {
+        wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
+            $this,
+            'dashboard_widget_callback',
+        ) );
+    }
+
+    /**
+     * Return stats
+     * @uses  https://codex.wordpress.org/Function_Reference/set_transient
+     *
+     * @since 3.4.0
+     *
+     * @return string JSON obj with all available stats.
+     */
+    public function ajax_get_stats() {
+
+        // If needed, the transient is force to reloaded.
+        if ( isset( $_GET['force_reload'] ) ) {
+            delete_transient( self::TRANSIENT_NAME );
+        }
+
+        // Try to retrieve the transient
+        $stats = get_transient( self::TRANSIENT_NAME );
+
+        if ( ! $stats ) {
+            // Calculate stats
+            $stats = array(
+                'entities'        => $this->entity_service->count(),
+                'posts'           => $this->count_posts(),
+                'annotated_posts' => $this->count_annotated_posts(),
+                'triples'         => $this->count_triples() ?: '-',
+                'rating'          => $this->average_entities_rating(),
+            );
+            // Cache stats results trough transient
+            set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+        }
+        // Return stats as json object
+        wl_core_send_json( $stats );
+    }
+
+    /**
+     * Calculate total number of published posts
+     * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of published posts.
+     */
+    public function count_posts() {
+
+        return (int) wp_count_posts()->publish;
+    }
+
+    /**
+     * Calculate total number of annotated published posts
+     * @return int Total number of annotated published posts.
+     * @since 3.4.0
+     *
+     */
+    public function count_annotated_posts() {
+
+        // Prepare interaction with db
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+        // Calculate sql statement
+        $sql_statement = "
     		SELECT COUNT(distinct(p.id)) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 ";
 
-		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement );
-
-	}
-
-	/**
-	 * Calculate the average entities rating.
-	 *
-	 * @return int Average entities rating.
-	 * @since 3.4.0
-	 *
-	 * @since 3.20.0 this method is public.
-	 */
-	public function average_entities_rating() {
-
-		// Prepare interaction with db
-		global $wpdb;
-		$query = $wpdb->prepare(
-			"SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
-			Wordlift_Rating_Service::RATING_RAW_SCORE_META_KEY
-		);
-
-		// Perform the query.
-		return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
-	}
+        // Perform the query
+        return (int) $wpdb->get_var( $sql_statement );
+
+    }
+
+    /**
+     * Calculate the average entities rating.
+     *
+     * @return int Average entities rating.
+     * @since 3.4.0
+     *
+     * @since 3.20.0 this method is public.
+     */
+    public function average_entities_rating() {
+
+        // Prepare interaction with db
+        global $wpdb;
+        $query = $wpdb->prepare(
+            "SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
+            Wordlift_Rating_Service::RATING_RAW_SCORE_META_KEY
+        );
+
+        // Perform the query.
+        return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
+    }
 
 }

Spacing +42 added lines, -42 removed lines

@@ -66,7 +66,7 @@ 
 	private static $instance;
 
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -80,53 +80,53 @@ 
 	 * @since 3.4.0
 	 *
 	 */
-	public function dashboard_widget_callback( $post ) {
-        $caption_kses = array( 'a' => array( 'href' => array() ) );
-		$enriched_posts_title   = __( 'enriched posts', 'wordlift' );
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'annotatedPostsPercentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )
+	public function dashboard_widget_callback($post) {
+        $caption_kses = array('a' => array('href' => array()));
+		$enriched_posts_title   = __('enriched posts', 'wordlift');
+		$enriched_posts_caption = sprintf(wp_kses(
+			__('%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('annotatedPostsPercentage'),
+			esc_url(admin_url('edit.php')),
+			$this->render_stat_param('annotated_posts'),
+			$this->render_stat_param('posts')
 		);
 
-		$rating_title   = __( 'average entity rating', 'wordlift' );
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
+		$rating_title   = __('average entity rating', 'wordlift');
+		$rating_caption = sprintf(wp_kses(
+			__('You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('entities'),
+			esc_url(admin_url('edit.php?post_type=entity')),
+			$this->render_stat_param('rating')
 		);
 
-		$graph_title   = __( 'triples in your graph', 'wordlift' );
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
+		$graph_title   = __('triples in your graph', 'wordlift');
+		$graph_caption = sprintf(wp_kses(
+			__('Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('wikidata'),
+			esc_url('https://www.wikidata.org/')
 		);
 
-		$triples_label = __( 'triples', 'wordlift' );
+		$triples_label = __('triples', 'wordlift');
 
 		?>
         <div id="wl-dashboard-widget-inner-wrapper">
             <div class="wl-stat-card">
                 <div class="wl-stat-graph-wrapper">
-                    <h4><?php echo esc_html( $enriched_posts_title ); ?> <a
+                    <h4><?php echo esc_html($enriched_posts_title); ?> <a
                                 href="http://docs.wordlift.it/en/latest/faq.html#what-is-content-enrichment"
                                 target="_blank"><i class="wl-info"></i></a></h4>
                     <svg id="wl-posts-pie-chart" viewBox="0 0 32 32">
                         <circle r="16" cx="16" cy="16"/>
                     </svg>
                 </div>
-                <p><?php echo wp_kses( $enriched_posts_caption, $caption_kses ); ?> </p>
+                <p><?php echo wp_kses($enriched_posts_caption, $caption_kses); ?> </p>
             </div>
             <div class="wl-stat-card">
                 <div class="wl-stat-graph-wrapper">
-                    <h4><?php echo esc_html( $rating_title ); ?> <a
+                    <h4><?php echo esc_html($rating_title); ?> <a
                                 href="http://docs.wordlift.it/en/latest/faq.html#what-factors-determine-the-rating-of-an-entity"
                                 target="_blank"><i class="wl-info"></i></a></h4>
                     <svg id="wl-entities-gauge-chart" viewBox="0 0 32 32">
@@ -134,18 +134,18 @@ 
                         <circle r="16" cx="16" cy="16" class="stat"/>
                     </svg>
                 </div>
-                <p><?php echo wp_kses( $rating_caption, $caption_kses ); ?></p>
+                <p><?php echo wp_kses($rating_caption, $caption_kses); ?></p>
             </div>
             <div class="wl-stat-card">
                 <div class="wl-stat-graph-wrapper">
-                    <h4><?php echo esc_html( $graph_title ); ?><a href="http://docs.wordlift.it/en/latest/faq.html#what-is-a-triple"
+                    <h4><?php echo esc_html($graph_title); ?><a href="http://docs.wordlift.it/en/latest/faq.html#what-is-a-triple"
                                         target="_blank"><i class="wl-info"></i></a></h4>
                     <div class="wl-triples">
                         <span id="wl-dashboard-widget-triples"></span>
-                        <span class="wl-triples-label"><?php echo esc_html( $triples_label ); ?></span>
+                        <span class="wl-triples-label"><?php echo esc_html($triples_label); ?></span>
                     </div>
                 </div>
-                <p><?php echo wp_kses( $graph_caption, $caption_kses ); ?></p>
+                <p><?php echo wp_kses($graph_caption, $caption_kses); ?></p>
             </div>
         </div>
 		<?php
@@ -160,10 +160,10 @@ 
 	 *
 	 */
 	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
+		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array(
 			$this,
 			'dashboard_widget_callback',
-		) );
+		));
 	}
 
 	/**
@@ -177,14 +177,14 @@ 
 	public function ajax_get_stats() {
 
 		// If needed, the transient is force to reloaded.
-		if ( isset( $_GET['force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
+		if (isset($_GET['force_reload'])) {
+			delete_transient(self::TRANSIENT_NAME);
 		}
 
 		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
+		$stats = get_transient(self::TRANSIENT_NAME);
 
-		if ( ! $stats ) {
+		if ( ! $stats) {
 			// Calculate stats
 			$stats = array(
 				'entities'        => $this->entity_service->count(),
@@ -194,10 +194,10 @@ 
 				'rating'          => $this->average_entities_rating(),
 			);
 			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+			set_transient(self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION);
 		}
 		// Return stats as json object
-		wl_core_send_json( $stats );
+		wl_core_send_json($stats);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 ";
 
 		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement );
+		return (int) $wpdb->get_var($sql_statement);
 
 	}
 
@@ -252,7 +252,7 @@ 
 		);
 
 		// Perform the query.
-		return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
+		return $this->rating_service->convert_raw_score_to_percentage($wpdb->get_var($query));
 	}
 
 }

src/admin/class-wordlift-admin-not-enriched-filter.php

Indentation +29 added lines, -29 removed lines

@@ -4,53 +4,53 @@
 
 class Wordlift_Admin_Not_Enriched_Filter {
 
-	const PARAMETER_NAME = 'wl_enriched';
+    const PARAMETER_NAME = 'wl_enriched';
 
-	public function __construct() {
+    public function __construct() {
 
-		// Hook to `views_edit-post`.
-		add_filter( 'views_edit-post', array( $this, 'view_edit' ) );
+        // Hook to `views_edit-post`.
+        add_filter( 'views_edit-post', array( $this, 'view_edit' ) );
 
-		// Add the `posts_where` filter if the filter is active.
-		if ( $this->is_filter_active() ) {
-			add_filter( 'posts_where', array( $this, 'posts_where' ) );
-		}
+        // Add the `posts_where` filter if the filter is active.
+        if ( $this->is_filter_active() ) {
+            add_filter( 'posts_where', array( $this, 'posts_where' ) );
+        }
 
-	}
+    }
 
-	public function posts_where( $where ) {
-		global $wpdb;
+    public function posts_where( $where ) {
+        global $wpdb;
 
-		return $where .
-		       " AND {$wpdb->posts}.ID NOT IN ( SELECT DISTINCT subject_id FROM {$wpdb->prefix}wl_relation_instances )";
-	}
+        return $where .
+                " AND {$wpdb->posts}.ID NOT IN ( SELECT DISTINCT subject_id FROM {$wpdb->prefix}wl_relation_instances )";
+    }
 
-	public function view_edit( $views ) {
-		global $wpdb;
+    public function view_edit( $views ) {
+        global $wpdb;
 
-		$url = add_query_arg( array( self::PARAMETER_NAME => 'no', 'post_type' => 'post', ), 'edit.php' );
+        $url = add_query_arg( array( self::PARAMETER_NAME => 'no', 'post_type' => 'post', ), 'edit.php' );
 
-		$not_enriched_count = $wpdb->get_var( "
+        $not_enriched_count = $wpdb->get_var( "
 SELECT COUNT( 1 ) FROM $wpdb->posts p
  WHERE p.post_type = 'post'
    AND p.post_status <> 'trash' 
    AND p.post_status <> 'auto-draft'
    AND p.ID NOT IN ( SELECT DISTINCT subject_id FROM {$wpdb->prefix}wl_relation_instances )
 "
-		);
+        );
 
-		$link = '<a href="'
-		        . esc_url( $url ) . '"'
-		        . ( $this->is_filter_active() ? ' class="current" aria-current="page"' : '' )
-		        . '>' . esc_html( __( 'Not enriched', 'wordlift' ) ) . '</a> (' . $not_enriched_count . ')';
+        $link = '<a href="'
+                . esc_url( $url ) . '"'
+                . ( $this->is_filter_active() ? ' class="current" aria-current="page"' : '' )
+                . '>' . esc_html( __( 'Not enriched', 'wordlift' ) ) . '</a> (' . $not_enriched_count . ')';
 
-		$views['wl_not_enriched'] = $link;
+        $views['wl_not_enriched'] = $link;
 
-		return $views;
-	}
+        return $views;
+    }
 
-	public function is_filter_active() {
-		return 'no' === filter_input( INPUT_GET, self::PARAMETER_NAME );
-	}
+    public function is_filter_active() {
+        return 'no' === filter_input( INPUT_GET, self::PARAMETER_NAME );
+    }
 
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -9,28 +9,28 @@ 
 	public function __construct() {
 
 		// Hook to `views_edit-post`.
-		add_filter( 'views_edit-post', array( $this, 'view_edit' ) );
+		add_filter('views_edit-post', array($this, 'view_edit'));
 
 		// Add the `posts_where` filter if the filter is active.
-		if ( $this->is_filter_active() ) {
-			add_filter( 'posts_where', array( $this, 'posts_where' ) );
+		if ($this->is_filter_active()) {
+			add_filter('posts_where', array($this, 'posts_where'));
 		}
 
 	}
 
-	public function posts_where( $where ) {
+	public function posts_where($where) {
 		global $wpdb;
 
-		return $where .
+		return $where.
 		       " AND {$wpdb->posts}.ID NOT IN ( SELECT DISTINCT subject_id FROM {$wpdb->prefix}wl_relation_instances )";
 	}
 
-	public function view_edit( $views ) {
+	public function view_edit($views) {
 		global $wpdb;
 
-		$url = add_query_arg( array( self::PARAMETER_NAME => 'no', 'post_type' => 'post', ), 'edit.php' );
+		$url = add_query_arg(array(self::PARAMETER_NAME => 'no', 'post_type' => 'post',), 'edit.php');
 
-		$not_enriched_count = $wpdb->get_var( "
+		$not_enriched_count = $wpdb->get_var("
 SELECT COUNT( 1 ) FROM $wpdb->posts p
  WHERE p.post_type = 'post'
    AND p.post_status <> 'trash' 
@@ -40,9 +40,9 @@ 
 		);
 
 		$link = '<a href="'
-		        . esc_url( $url ) . '"'
-		        . ( $this->is_filter_active() ? ' class="current" aria-current="page"' : '' )
-		        . '>' . esc_html( __( 'Not enriched', 'wordlift' ) ) . '</a> (' . $not_enriched_count . ')';
+		        . esc_url($url).'"'
+		        . ($this->is_filter_active() ? ' class="current" aria-current="page"' : '')
+		        . '>'.esc_html(__('Not enriched', 'wordlift')).'</a> ('.$not_enriched_count.')';
 
 		$views['wl_not_enriched'] = $link;
 
@@ -50,7 +50,7 @@ 
 	}
 
 	public function is_filter_active() {
-		return 'no' === filter_input( INPUT_GET, self::PARAMETER_NAME );
+		return 'no' === filter_input(INPUT_GET, self::PARAMETER_NAME);
 	}
 
 }
\ No newline at end of file

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

Indentation +232 added lines, -232 removed lines

@@ -4,208 +4,208 @@ 
 
 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 ) );
-
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare( "
+    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 ) );
+
+        /** @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. 
@@ -238,33 +238,33 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $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 ) );
-
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare( "
+                , $post_id, $limit, $offset, $select, $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 ) );
+
+        /** @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
@@ -300,8 +300,8 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
-		);
-	}
+                , $post_id, $limit, $offset, $select, $order_by )
+        );
+    }
 
 }

Spacing +55 added lines, -55 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,60 +51,60 @@ 
 		$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 ) {
-			$referencing_posts = $this->get_entity_results( $post_id, array(
+		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 );
+			), $order_by, $navigator_length, $navigator_offset);
 		} else {
-			$referencing_posts = $this->get_post_results( $post_id, array(
+			$referencing_posts = $this->get_post_results($post_id, array(
 				'ID',
 				'post_title',
-			), $order_by, $navigator_length, $navigator_offset );
+			), $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 ) {
+		$directly_referencing_posts = $this->get_directly_referencing_posts($post_id, array_map(function($referencing_post) {
 			return $referencing_post->ID;
-		}, $referencing_posts ) );
+		}, $referencing_posts));
 
 		// 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),
 				),
 			);
 
@@ -112,50 +112,50 @@ 
 
 		}
 
-		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 ) {
-			$referencing_post_ids = array_map( function ( $p ) {
+		$filler_count = $navigator_length - count($results);
+		if ($filler_count > 0) {
+			$referencing_post_ids = array_map(function($p) {
 				return $p->ID;
-			}, $referencing_posts );
+			}, $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 );
+			$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(
+		$directly_referencing_posts = get_posts(array(
 			'meta_query'          => array(
 				array(
 					'key' => '_thumbnail_id'
@@ -168,11 +168,11 @@ 
 			'post__in'            => $post__in,
 			'post_type'           => 'product',
 			'ignore_sticky_posts' => 1
-		) );
+		));
 
 		$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;
@@ -195,17 +195,17 @@ 
 	) {
 		global $wpdb;
 
-		$select = implode( ', ', array_map( function ( $item ) {
+		$select = implode(', ', array_map(function($item) {
 			return "p.$item AS $item";
-		}, (array) $fields ) );
+		}, (array) $fields));
 
-		$order_by = implode( ', ', array_map( function ( $item ) {
+		$order_by = implode(', ', array_map(function($item) {
 			return "p.$item";
-		}, (array) $order_by ) );
+		}, (array) $order_by));
 
 		/** @noinspection SqlNoDataSourceInspection */
 		return $wpdb->get_results(
-			$wpdb->prepare( "
+			$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. 
@@ -238,7 +238,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
+				, $post_id, $limit, $offset, $select, $order_by)
 		);
 	}
 
@@ -254,17 +254,17 @@ 
 	) {
 		global $wpdb;
 
-		$select = implode( ', ', array_map( function ( $item ) {
+		$select = implode(', ', array_map(function($item) {
 			return "p.$item AS $item";
-		}, (array) $fields ) );
+		}, (array) $fields));
 
-		$order_by = implode( ', ', array_map( function ( $item ) {
+		$order_by = implode(', ', array_map(function($item) {
 			return "p.$item";
-		}, (array) $order_by ) );
+		}, (array) $order_by));
 
 		/** @noinspection SqlNoDataSourceInspection */
 		return $wpdb->get_results(
-			$wpdb->prepare( "
+			$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
@@ -300,7 +300,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
+				, $post_id, $limit, $offset, $select, $order_by)
 		);
 	}
 

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +268 added lines, -268 removed lines

@@ -20,32 +20,32 @@ 
  */
 function wl_shortcode_navigator_data() {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	// So that the endpoint can be used remotely
-	header( 'Access-Control-Allow-Origin: *' );
+    // So that the endpoint can be used remotely
+    header( 'Access-Control-Allow-Origin: *' );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_navigator_get_data();
+    $results = _wl_navigator_get_data();
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 }
 
 /**
@@ -60,240 +60,240 @@ 
  */
 function wl_network_navigator_wp_json( $request ) {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_network_navigator_get_data( $request );
+    $results = _wl_network_navigator_get_data( $request );
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 
 }
 
 function _wl_navigator_get_data() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
-
-		return array();
-	}
-
-	// Post ID must be defined
-	if ( ! isset( $_GET['uniqid'] ) ) {
-		wp_send_json_error( 'No uniqid given' );
-
-		return array();
-	}
-
-	// Limit the results (defaults to 4)
-	$navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
-	$existing_post_types = get_post_types();
-	$post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
-	$current_post_id     = (int) $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
-
-	$navigator_id = (string) $_GET['uniqid'];
-
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
-
-		return array();
-	}
-
-	// Determine navigator type and call respective _get_results
-	if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
-
-		$referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
-	} else {
-		$referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
-
-	}
-
-	// 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 );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'id'        => $referencing_post->ID,
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => html_entity_decode( $referencing_post->post_title, ENT_QUOTES, 'UTF-8' ),
-				'thumbnail' => $thumbnail,
-				'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
-			),
-			'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_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.27.8
-		 * Filler posts are fetched using this util.
-		 */
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id, $post_types );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_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 ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
-		$results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
-	}
-
-	$results = apply_filters( 'wl_navigator_results', $results, $navigator_id, $current_post_id );
-
-	return $results;
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_send_json_error( 'No post_id given' );
+
+        return array();
+    }
+
+    // Post ID must be defined
+    if ( ! isset( $_GET['uniqid'] ) ) {
+        wp_send_json_error( 'No uniqid given' );
+
+        return array();
+    }
+
+    // Limit the results (defaults to 4)
+    $navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
+    $navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
+    $order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
+    $post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
+    $post_types          = explode( ',', $post_types );
+    $existing_post_types = get_post_types();
+    $post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
+    $current_post_id     = (int) $_GET['post_id'];
+    $current_post        = get_post( $current_post_id );
+
+    $navigator_id = (string) $_GET['uniqid'];
+
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_send_json_error( 'No valid post_id given' );
+
+        return array();
+    }
+
+    // Determine navigator type and call respective _get_results
+    if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+
+        $referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset, $post_types );
+    } else {
+        $referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset, $post_types );
+
+    }
+
+    // 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 );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'id'        => $referencing_post->ID,
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => html_entity_decode( $referencing_post->post_title, ENT_QUOTES, 'UTF-8' ),
+                'thumbnail' => $thumbnail,
+                'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
+            ),
+            '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_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.27.8
+         * Filler posts are fetched using this util.
+         */
+        $filler_posts_util       = new Filler_Posts_Util( $current_post_id, $post_types );
+        $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
+        $filler_posts            = $filler_posts_util->get_filler_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 ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
+        $results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+    }
+
+    $results = apply_filters( 'wl_navigator_results', $results, $navigator_id, $current_post_id );
+
+    return $results;
 }
 
 function _wl_network_navigator_get_data( $request ) {
 
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
-	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-
-	$entities = $request['entities'];
-
-	// Post ID has to match an existing item
-	if ( ! isset( $entities ) || empty( $entities ) ) {
-		wp_send_json_error( 'No valid entities provided' );
-	}
-
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
-		'ID',
-		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
-
-	// 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 );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'entity' => array(
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	$results = apply_filters( 'wl_network_navigator_results', $results, $navigator_id );
-
-	return $results;
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
+    $navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+    $navigator_id     = $request['uniqid'];
+    $order_by         = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
+
+    $entities = $request['entities'];
+
+    // Post ID has to match an existing item
+    if ( ! isset( $entities ) || empty( $entities ) ) {
+        wp_send_json_error( 'No valid entities provided' );
+    }
+
+    $referencing_posts = _wl_network_navigator_get_results( $entities, array(
+        'ID',
+        'post_title',
+    ), $order_by, $navigator_length, $navigator_offset );
+
+    // 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 );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            'entity' => array(
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    $results = apply_filters( 'wl_network_navigator_results', $results, $navigator_id );
+
+    return $results;
 
 }
 
 function _wl_network_navigator_get_results(
-	$entities, $fields = array(
-	'ID',
-	'post_title',
+    $entities, $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 ) );
-
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
-		if ( isset( $entity ) ) {
-			return $entity->ID;
-		}
-	}, $entities ) );
-
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( "
+    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 ) );
+
+    $entities_in = implode( ',', array_map( function ( $item ) {
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
+        if ( isset( $entity ) ) {
+            return $entity->ID;
+        }
+    }, $entities ) );
+
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( "
 SELECT %3\$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. 
@@ -319,8 +319,8 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 "
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -332,9 +332,9 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	// Temporary blocking the Navigator.
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+    // Temporary blocking the Navigator.
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json( $results );
 
 }
 
@@ -346,16 +346,16 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	return array(
-		'items' => array(
-			array( 'values' => $results ),
-		),
-	);
+    return array(
+        'items' => array(
+            array( 'values' => $results ),
+        ),
+    );
 
 }
 
@@ -363,22 +363,22 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-		'methods'             => 'GET',
-		'permission_callback' => '__return_true',
-		'callback'            => 'wl_shortcode_navigator_wp_json'
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods'             => 'GET',
+        'permission_callback' => '__return_true',
+        'callback'            => 'wl_shortcode_navigator_wp_json'
+    ) );
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
-		'methods'             => 'GET',
-		'callback'            => 'wl_network_navigator_wp_json',
-		'permission_callback' => '__return_true',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+        'methods'             => 'GET',
+        'callback'            => 'wl_network_navigator_wp_json',
+        'permission_callback' => '__return_true',
+    ) );
 } );
 
 /**
@@ -387,23 +387,23 @@ 
  * @since 2.2.0
  */
 add_action( 'plugins_loaded', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
-
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    $action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+        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 () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
+    $action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+        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 );
 

Spacing +110 added lines, -110 removed lines

@@ -22,28 +22,28 @@ 
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("navigator", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
 	// So that the endpoint can be used remotely
-	header( 'Access-Control-Allow-Origin: *' );
+	header('Access-Control-Allow-Origin: *');
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
 	$results = _wl_navigator_get_data();
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 }
@@ -58,29 +58,29 @@ 
  * @since 3.22.6
  *
  */
-function wl_network_navigator_wp_json( $request ) {
+function wl_network_navigator_wp_json($request) {
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("network-navigator", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
-	$results = _wl_network_navigator_get_data( $request );
+	$results = _wl_network_navigator_get_data($request);
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 
@@ -89,58 +89,58 @@ 
 function _wl_navigator_get_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_send_json_error('No post_id given');
 
 		return array();
 	}
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['uniqid'] ) ) {
-		wp_send_json_error( 'No uniqid given' );
+	if ( ! isset($_GET['uniqid'])) {
+		wp_send_json_error('No uniqid given');
 
 		return array();
 	}
 
 	// Limit the results (defaults to 4)
-	$navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
+	$navigator_length    = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
+	$navigator_offset    = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
+	$order_by            = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
+	$post_types          = isset($_GET['post_types']) ? (string) $_GET['post_types'] : '';
+	$post_types          = explode(',', $post_types);
 	$existing_post_types = get_post_types();
-	$post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
+	$post_types          = array_values(array_intersect($existing_post_types, $post_types));
 	$current_post_id     = (int) $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
+	$current_post        = get_post($current_post_id);
 
 	$navigator_id = (string) $_GET['uniqid'];
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_send_json_error('No valid post_id given');
 
 		return array();
 	}
 
 	// Determine navigator type and call respective _get_results
-	if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+	if (get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME) {
 
-		$referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
+		$referencing_posts = Navigator_Data::entity_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
+		), $order_by, $navigator_length, $navigator_offset, $post_types);
 	} else {
-		$referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
+		$referencing_posts = Navigator_Data::post_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
+		), $order_by, $navigator_length, $navigator_offset, $post_types);
 
 	}
 
 	// 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 );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -150,21 +150,21 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
 				'id'        => $referencing_post->ID,
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => html_entity_decode( $referencing_post->post_title, ENT_QUOTES, 'UTF-8' ),
+				'permalink' => get_permalink($referencing_post->ID),
+				'title'     => html_entity_decode($referencing_post->post_title, ENT_QUOTES, 'UTF-8'),
 				'thumbnail' => $thumbnail,
-				'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
+				'srcset'    => Srcset_Util::get_srcset($referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET)
 			),
 			'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),
 			),
 		);
 
@@ -172,61 +172,61 @@ 
 	}
 
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_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 ) {
+	$filler_count = $navigator_length - count($results);
+	if ($filler_count > 0) {
+		$referencing_post_ids = array_map(function($p) {
 			return $p->ID;
-		}, $referencing_posts );
+		}, $referencing_posts);
 		/**
 		 * @since 3.27.8
 		 * Filler posts are fetched using this util.
 		 */
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id, $post_types );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
-		$results                 = array_merge( $results, $filler_posts );
+		$filler_posts_util       = new Filler_Posts_Util($current_post_id, $post_types);
+		$post_ids_to_be_excluded = array_merge(array($current_post_id), $referencing_post_ids);
+		$filler_posts            = $filler_posts_util->get_filler_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 ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
-		$results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+	foreach ($results as $result_index => $result) {
+		$results[$result_index]['post']   = apply_filters('wl_navigator_data_post', $result['post'], intval($result['post']['id']), $navigator_id);
+		$results[$result_index]['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($result['entity']['id']), $navigator_id);
 	}
 
-	$results = apply_filters( 'wl_navigator_results', $results, $navigator_id, $current_post_id );
+	$results = apply_filters('wl_navigator_results', $results, $navigator_id, $current_post_id);
 
 	return $results;
 }
 
-function _wl_network_navigator_get_data( $request ) {
+function _wl_network_navigator_get_data($request) {
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+	$navigator_length = isset($request['limit']) ? intval($request['limit']) : 4;
+	$navigator_offset = isset($request['offset']) ? intval($request['offset']) : 0;
 	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
+	$order_by         = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
 
 	$entities = $request['entities'];
 
 	// Post ID has to match an existing item
-	if ( ! isset( $entities ) || empty( $entities ) ) {
-		wp_send_json_error( 'No valid entities provided' );
+	if ( ! isset($entities) || empty($entities)) {
+		wp_send_json_error('No valid entities provided');
 	}
 
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
+	$referencing_posts = _wl_network_navigator_get_results($entities, array(
 		'ID',
 		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
+	), $order_by, $navigator_length, $navigator_offset);
 
 	// 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 );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -236,33 +236,33 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
 			'entity' => array(
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_network_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_network_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 
 	}
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
-	$results = apply_filters( 'wl_network_navigator_results', $results, $navigator_id );
+	$results = apply_filters('wl_network_navigator_results', $results, $navigator_id);
 
 	return $results;
 
@@ -276,24 +276,24 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
-		if ( isset( $entity ) ) {
+	$entities_in = implode(',', array_map(function($item) {
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
+		if (isset($entity)) {
 			return $entity->ID;
 		}
-	}, $entities ) );
+	}, $entities));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( "
+		$wpdb->prepare("
 SELECT %3\$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. 
@@ -319,7 +319,7 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 "
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -334,12 +334,12 @@ 
 
 	// Temporary blocking the Navigator.
 	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -347,13 +347,13 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
 	return array(
 		'items' => array(
-			array( 'values' => $results ),
+			array('values' => $results),
 		),
 	);
 
@@ -362,23 +362,23 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 		'methods'             => 'GET',
 		'permission_callback' => '__return_true',
 		'callback'            => 'wl_shortcode_navigator_wp_json'
-	) );
+	));
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
 		'methods'             => 'GET',
 		'callback'            => 'wl_network_navigator_wp_json',
 		'permission_callback' => '__return_true',
-	) );
+	));
 } );
 
 /**
@@ -386,24 +386,24 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('plugins_loaded', function() {
+	$action = array_key_exists('action', $_REQUEST) ? (string) $_REQUEST['action'] : '';
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $action) {
 		return;
 	}
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-}, 0 );
+	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 () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('init', function() {
+	$action = array_key_exists('action', $_REQUEST) ? (string) $_REQUEST['action'] : '';
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $action) {
 		return;
 	}
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
-}, 0 );
+	remove_action('init', 'wp_widgets_init', 1);
+	remove_action('init', 'gglcptch_init');
+}, 0);
 

src/wordlift/widgets/navigator/class-navigator-data.php

Indentation +56 added lines, -56 removed lines

@@ -7,39 +7,39 @@ 
  */
 class Navigator_Data {
 
-	public static function get_post_types_as_string( $post_types ) {
-		if ( $post_types === array() ) {
-			$post_types = get_post_types();
-		}
-		$post_types = array_map( function ( $post_type ) {
-			return "'" . esc_sql( $post_type ) . "'";
-		}, $post_types );
-
-		return implode( ',', $post_types );
-	}
-
-	public static function post_navigator_get_results(
-		$post_id, $fields = array(
-		'ID',
-		'post_title',
-	), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
-	) {
-
-		$post_types = self::get_post_types_as_string( $post_types );
-		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 ) );
-
-
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare( "
+    public static function get_post_types_as_string( $post_types ) {
+        if ( $post_types === array() ) {
+            $post_types = get_post_types();
+        }
+        $post_types = array_map( function ( $post_type ) {
+            return "'" . esc_sql( $post_type ) . "'";
+        }, $post_types );
+
+        return implode( ',', $post_types );
+    }
+
+    public static function post_navigator_get_results(
+        $post_id, $fields = array(
+        'ID',
+        'post_title',
+    ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
+    ) {
+
+        $post_types = self::get_post_types_as_string( $post_types );
+        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 ) );
+
+
+        /** @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
@@ -73,33 +73,33 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
-		);
+                , $post_id, $limit, $offset, $select, $order_by )
+        );
 
-	}
+    }
 
 
-	public static function entity_navigator_get_results(
-		$post_id, $fields = array(
-		'ID',
-		'post_title',
-	), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
-	) {
-		global $wpdb;
+    public static function entity_navigator_get_results(
+        $post_id, $fields = array(
+        'ID',
+        'post_title',
+    ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
+    ) {
+        global $wpdb;
 
-		$select = implode( ', ', array_map( function ( $item ) {
-			return "p.$item AS $item";
-		}, (array) $fields ) );
+        $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 ) );
+        $order_by = implode( ', ', array_map( function ( $item ) {
+            return "p.$item";
+        }, (array) $order_by ) );
 
-		$post_types = self::get_post_types_as_string( $post_types );
+        $post_types = self::get_post_types_as_string( $post_types );
 
-		/** @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. 
@@ -130,9 +130,9 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
-		);
-	}
+                , $post_id, $limit, $offset, $select, $order_by )
+        );
+    }
 
 
 }

Spacing +20 added lines, -20 removed lines

@@ -7,15 +7,15 @@ 
  */
 class Navigator_Data {
 
-	public static function get_post_types_as_string( $post_types ) {
-		if ( $post_types === array() ) {
+	public static function get_post_types_as_string($post_types) {
+		if ($post_types === array()) {
 			$post_types = get_post_types();
 		}
-		$post_types = array_map( function ( $post_type ) {
-			return "'" . esc_sql( $post_type ) . "'";
-		}, $post_types );
+		$post_types = array_map(function($post_type) {
+			return "'".esc_sql($post_type)."'";
+		}, $post_types);
 
-		return implode( ',', $post_types );
+		return implode(',', $post_types);
 	}
 
 	public static function post_navigator_get_results(
@@ -25,21 +25,21 @@ 
 	), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
 	) {
 
-		$post_types = self::get_post_types_as_string( $post_types );
+		$post_types = self::get_post_types_as_string($post_types);
 		global $wpdb;
 
-		$select = implode( ', ', array_map( function ( $item ) {
+		$select = implode(', ', array_map(function($item) {
 			return "p.$item AS $item";
-		}, (array) $fields ) );
+		}, (array) $fields));
 
-		$order_by = implode( ', ', array_map( function ( $item ) {
+		$order_by = implode(', ', array_map(function($item) {
 			return "p.$item";
-		}, (array) $order_by ) );
+		}, (array) $order_by));
 
 
 		/** @noinspection SqlNoDataSourceInspection */
 		return $wpdb->get_results(
-			$wpdb->prepare( "
+			$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
@@ -73,7 +73,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
+				, $post_id, $limit, $offset, $select, $order_by)
 		);
 
 	}
@@ -87,19 +87,19 @@ 
 	) {
 		global $wpdb;
 
-		$select = implode( ', ', array_map( function ( $item ) {
+		$select = implode(', ', array_map(function($item) {
 			return "p.$item AS $item";
-		}, (array) $fields ) );
+		}, (array) $fields));
 
-		$order_by = implode( ', ', array_map( function ( $item ) {
+		$order_by = implode(', ', array_map(function($item) {
 			return "p.$item";
-		}, (array) $order_by ) );
+		}, (array) $order_by));
 
-		$post_types = self::get_post_types_as_string( $post_types );
+		$post_types = self::get_post_types_as_string($post_types);
 
 		/** @noinspection SqlNoDataSourceInspection */
 		return $wpdb->get_results(
-			$wpdb->prepare( "
+			$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. 
@@ -130,7 +130,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 "
-				, $post_id, $limit, $offset, $select, $order_by )
+				, $post_id, $limit, $offset, $select, $order_by)
 		);
 	}
 

src/wordlift/vocabulary-terms/class-entity-type.php

Indentation +79 added lines, -79 removed lines

@@ -15,48 +15,48 @@ 
 
 class Entity_Type {
 
-	public function __construct() {
-
-		$that = $this;
-
-		add_action(
-			'init',
-			function () use ( $that ) {
-				$that->init_ui_and_save_handlers();
-			}
-		);
-	}
-
-
-	/**
-	 * @param $term  \WP_Term
-	 */
-	public function render_ui( $term ) {
-
-		$entity_types_text     = __( 'Entity Types', 'wordlift' );
-		$selected_entity_types = get_term_meta( $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		/**
-		 * Thing should be the default selected entity type
-		 * when this feature is activated.
-		 */
-		if ( count( $selected_entity_types ) === 0 ) {
-			$selected_entity_types[] = 'thing';
-		}
-
-		$entity_type_taxonomy = Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME;
-		$types                = Terms_Compat::get_terms(
-			$entity_type_taxonomy,
-			array(
-				'taxonomy'   => $entity_type_taxonomy,
-				'parent'     => 0,
-				'hide_empty' => false,
-			)
-		);
-
-		$terms_html = Term_Checklist::render( 'tax_input[wl_entity_type]', $types, $selected_entity_types );
-
-		$template = '
+    public function __construct() {
+
+        $that = $this;
+
+        add_action(
+            'init',
+            function () use ( $that ) {
+                $that->init_ui_and_save_handlers();
+            }
+        );
+    }
+
+
+    /**
+     * @param $term  \WP_Term
+     */
+    public function render_ui( $term ) {
+
+        $entity_types_text     = __( 'Entity Types', 'wordlift' );
+        $selected_entity_types = get_term_meta( $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        /**
+         * Thing should be the default selected entity type
+         * when this feature is activated.
+         */
+        if ( count( $selected_entity_types ) === 0 ) {
+            $selected_entity_types[] = 'thing';
+        }
+
+        $entity_type_taxonomy = Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME;
+        $types                = Terms_Compat::get_terms(
+            $entity_type_taxonomy,
+            array(
+                'taxonomy'   => $entity_type_taxonomy,
+                'parent'     => 0,
+                'hide_empty' => false,
+            )
+        );
+
+        $terms_html = Term_Checklist::render( 'tax_input[wl_entity_type]', $types, $selected_entity_types );
+
+        $template = '
         <tr class="form-field term-name-wrap">
             <th scope="row"><label for="wl-entity-type__checklist">%s</label></th>
             <td>
@@ -64,42 +64,42 @@ 
             </td>
         </tr>
 ';
-		echo sprintf( $template, esc_html( $entity_types_text ), $terms_html ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-
-		$this->enqueue_script_and_style();
-	}
-
-	public function save_field( $term_id ) {
-		if ( ! isset( $_REQUEST['tax_input'] ) ) {
-			return;
-		}
-		$entity_types = isset( $_REQUEST['tax_input'][ Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ] )
-			? (array) $_REQUEST['tax_input'][ Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ] : array();
-		if ( isset( $entity_types ) && is_array( $entity_types ) ) {
-			// Save the taxonomies.
-			delete_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			foreach ( $entity_types as $entity_type ) {
-				add_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, (string) $entity_type );
-			}
-		}
-	}
-
-	public function init_ui_and_save_handlers() {
-		$taxonomies = Terms_Compat::get_public_taxonomies();
-		foreach ( $taxonomies as $taxonomy ) {
-			add_action( "${taxonomy}_edit_form_fields", array( $this, 'render_ui' ), 1 );
-			add_action( "edited_${taxonomy}", array( $this, 'save_field' ) );
-		}
-	}
-
-	private function enqueue_script_and_style() {
-
-		Scripts_Helper::enqueue_based_on_wordpress_version( 'wl-vocabulary-term',
-			plugin_dir_url( dirname(  __DIR__ ) ) . '/js/dist/vocabulary-term',
-			array('wp-polyfill')
-		);
-		wp_enqueue_style( 'wl-vocabulary-term',
-			plugin_dir_url( dirname( __DIR__ ) ) . '/js/dist/vocabulary-term.css' );
-	}
+        echo sprintf( $template, esc_html( $entity_types_text ), $terms_html ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+        $this->enqueue_script_and_style();
+    }
+
+    public function save_field( $term_id ) {
+        if ( ! isset( $_REQUEST['tax_input'] ) ) {
+            return;
+        }
+        $entity_types = isset( $_REQUEST['tax_input'][ Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ] )
+            ? (array) $_REQUEST['tax_input'][ Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ] : array();
+        if ( isset( $entity_types ) && is_array( $entity_types ) ) {
+            // Save the taxonomies.
+            delete_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            foreach ( $entity_types as $entity_type ) {
+                add_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, (string) $entity_type );
+            }
+        }
+    }
+
+    public function init_ui_and_save_handlers() {
+        $taxonomies = Terms_Compat::get_public_taxonomies();
+        foreach ( $taxonomies as $taxonomy ) {
+            add_action( "${taxonomy}_edit_form_fields", array( $this, 'render_ui' ), 1 );
+            add_action( "edited_${taxonomy}", array( $this, 'save_field' ) );
+        }
+    }
+
+    private function enqueue_script_and_style() {
+
+        Scripts_Helper::enqueue_based_on_wordpress_version( 'wl-vocabulary-term',
+            plugin_dir_url( dirname(  __DIR__ ) ) . '/js/dist/vocabulary-term',
+            array('wp-polyfill')
+        );
+        wp_enqueue_style( 'wl-vocabulary-term',
+            plugin_dir_url( dirname( __DIR__ ) ) . '/js/dist/vocabulary-term.css' );
+    }
 
 }

Spacing +22 added lines, -22 removed lines

@@ -21,7 +21,7 @@ 
 
 		add_action(
 			'init',
-			function () use ( $that ) {
+			function() use ($that) {
 				$that->init_ui_and_save_handlers();
 			}
 		);
@@ -31,16 +31,16 @@ 
 	/**
 	 * @param $term  \WP_Term
 	 */
-	public function render_ui( $term ) {
+	public function render_ui($term) {
 
-		$entity_types_text     = __( 'Entity Types', 'wordlift' );
-		$selected_entity_types = get_term_meta( $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$entity_types_text     = __('Entity Types', 'wordlift');
+		$selected_entity_types = get_term_meta($term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 		/**
 		 * Thing should be the default selected entity type
 		 * when this feature is activated.
 		 */
-		if ( count( $selected_entity_types ) === 0 ) {
+		if (count($selected_entity_types) === 0) {
 			$selected_entity_types[] = 'thing';
 		}
 
@@ -54,7 +54,7 @@ 
 			)
 		);
 
-		$terms_html = Term_Checklist::render( 'tax_input[wl_entity_type]', $types, $selected_entity_types );
+		$terms_html = Term_Checklist::render('tax_input[wl_entity_type]', $types, $selected_entity_types);
 
 		$template = '
         <tr class="form-field term-name-wrap">
@@ -64,42 +64,42 @@ 
             </td>
         </tr>
 ';
-		echo sprintf( $template, esc_html( $entity_types_text ), $terms_html ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo sprintf($template, esc_html($entity_types_text), $terms_html); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
 		$this->enqueue_script_and_style();
 	}
 
-	public function save_field( $term_id ) {
-		if ( ! isset( $_REQUEST['tax_input'] ) ) {
+	public function save_field($term_id) {
+		if ( ! isset($_REQUEST['tax_input'])) {
 			return;
 		}
-		$entity_types = isset( $_REQUEST['tax_input'][ Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ] )
-			? (array) $_REQUEST['tax_input'][ Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ] : array();
-		if ( isset( $entity_types ) && is_array( $entity_types ) ) {
+		$entity_types = isset($_REQUEST['tax_input'][Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME])
+			? (array) $_REQUEST['tax_input'][Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME] : array();
+		if (isset($entity_types) && is_array($entity_types)) {
 			// Save the taxonomies.
-			delete_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			foreach ( $entity_types as $entity_type ) {
-				add_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, (string) $entity_type );
+			delete_term_meta($term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+			foreach ($entity_types as $entity_type) {
+				add_term_meta($term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, (string) $entity_type);
 			}
 		}
 	}
 
 	public function init_ui_and_save_handlers() {
 		$taxonomies = Terms_Compat::get_public_taxonomies();
-		foreach ( $taxonomies as $taxonomy ) {
-			add_action( "${taxonomy}_edit_form_fields", array( $this, 'render_ui' ), 1 );
-			add_action( "edited_${taxonomy}", array( $this, 'save_field' ) );
+		foreach ($taxonomies as $taxonomy) {
+			add_action("${taxonomy}_edit_form_fields", array($this, 'render_ui'), 1);
+			add_action("edited_${taxonomy}", array($this, 'save_field'));
 		}
 	}
 
 	private function enqueue_script_and_style() {
 
-		Scripts_Helper::enqueue_based_on_wordpress_version( 'wl-vocabulary-term',
-			plugin_dir_url( dirname(  __DIR__ ) ) . '/js/dist/vocabulary-term',
+		Scripts_Helper::enqueue_based_on_wordpress_version('wl-vocabulary-term',
+			plugin_dir_url(dirname(__DIR__)).'/js/dist/vocabulary-term',
 			array('wp-polyfill')
 		);
-		wp_enqueue_style( 'wl-vocabulary-term',
-			plugin_dir_url( dirname( __DIR__ ) ) . '/js/dist/vocabulary-term.css' );
+		wp_enqueue_style('wl-vocabulary-term',
+			plugin_dir_url(dirname(__DIR__)).'/js/dist/vocabulary-term.css');
 	}
 
 }

src/wordlift/videoobject/sitemap/class-video-sitemap.php

Indentation +65 added lines, -65 removed lines

@@ -10,76 +10,76 @@
 
 class Video_Sitemap {
 
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $sitemap_cache;
-
-	const XML_CACHE_KEY = 'video_sitemap';
-
-	public function __construct( $sitemap_cache ) {
-		$this->sitemap_cache = $sitemap_cache;
-	}
-
-	public function init() {
-		if ( self::is_video_sitemap_enabled() ) {
-			add_action( 'template_redirect', array( $this, 'print_video_sitemap' ), 1 );
-		}
-		add_action( 'wordlift_videoobject_video_storage_updated', array( $this, 'flush_cache' ) );
-	}
-
-	public function flush_cache() {
-		$this->sitemap_cache->flush();
-	}
-
-	/**
-	 * Print video sitemap.
-	 */
-	public function print_video_sitemap() {
-		global $wp;
-
-		$url = home_url( $wp->request );
-
-		$pattern = '/wl-video-sitemap\.xml$/m';
-
-		if ( preg_match( $pattern, $url ) !== 1 ) {
-			return;
-		}
-
-		header( "Content-type: text/xml" );
-		// set 200 status code.
-		status_header(200);
-
-		$xml = $this->sitemap_cache->get( self::XML_CACHE_KEY );
-
-		if ( ! $xml ) {
-			$xml = $this->get_sitemap_xml();
-			$this->sitemap_cache->put( self::XML_CACHE_KEY, $xml );
-		}
-
-		echo $xml; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		die();
-	}
-
-	public static function is_video_sitemap_enabled() {
-		return intval( get_option( '_wl_video_sitemap_generation', false ) ) === 1;
-	}
-
-	/**
-	 * @return string
-	 */
-	private function get_sitemap_xml() {
-		$sitemap_start_tag = '
+    /**
+     * @var Ttl_Cache
+     */
+    private $sitemap_cache;
+
+    const XML_CACHE_KEY = 'video_sitemap';
+
+    public function __construct( $sitemap_cache ) {
+        $this->sitemap_cache = $sitemap_cache;
+    }
+
+    public function init() {
+        if ( self::is_video_sitemap_enabled() ) {
+            add_action( 'template_redirect', array( $this, 'print_video_sitemap' ), 1 );
+        }
+        add_action( 'wordlift_videoobject_video_storage_updated', array( $this, 'flush_cache' ) );
+    }
+
+    public function flush_cache() {
+        $this->sitemap_cache->flush();
+    }
+
+    /**
+     * Print video sitemap.
+     */
+    public function print_video_sitemap() {
+        global $wp;
+
+        $url = home_url( $wp->request );
+
+        $pattern = '/wl-video-sitemap\.xml$/m';
+
+        if ( preg_match( $pattern, $url ) !== 1 ) {
+            return;
+        }
+
+        header( "Content-type: text/xml" );
+        // set 200 status code.
+        status_header(200);
+
+        $xml = $this->sitemap_cache->get( self::XML_CACHE_KEY );
+
+        if ( ! $xml ) {
+            $xml = $this->get_sitemap_xml();
+            $this->sitemap_cache->put( self::XML_CACHE_KEY, $xml );
+        }
+
+        echo $xml; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        die();
+    }
+
+    public static function is_video_sitemap_enabled() {
+        return intval( get_option( '_wl_video_sitemap_generation', false ) ) === 1;
+    }
+
+    /**
+     * @return string
+     */
+    private function get_sitemap_xml() {
+        $sitemap_start_tag = '
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
         xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
 ';
-		$sitemap_body      = Xml_Generator::get_xml_for_all_posts_with_videos();
+        $sitemap_body      = Xml_Generator::get_xml_for_all_posts_with_videos();
 
-		$sitemap_end_tag = "</urlset>";
+        $sitemap_end_tag = "</urlset>";
 
-		$xml = $sitemap_start_tag . $sitemap_body . $sitemap_end_tag;
+        $xml = $sitemap_start_tag . $sitemap_body . $sitemap_end_tag;
 
-		return $xml;
-	}
+        return $xml;
+    }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -17,15 +17,15 @@ 
 
 	const XML_CACHE_KEY = 'video_sitemap';
 
-	public function __construct( $sitemap_cache ) {
+	public function __construct($sitemap_cache) {
 		$this->sitemap_cache = $sitemap_cache;
 	}
 
 	public function init() {
-		if ( self::is_video_sitemap_enabled() ) {
-			add_action( 'template_redirect', array( $this, 'print_video_sitemap' ), 1 );
+		if (self::is_video_sitemap_enabled()) {
+			add_action('template_redirect', array($this, 'print_video_sitemap'), 1);
 		}
-		add_action( 'wordlift_videoobject_video_storage_updated', array( $this, 'flush_cache' ) );
+		add_action('wordlift_videoobject_video_storage_updated', array($this, 'flush_cache'));
 	}
 
 	public function flush_cache() {
@@ -38,23 +38,23 @@ 
 	public function print_video_sitemap() {
 		global $wp;
 
-		$url = home_url( $wp->request );
+		$url = home_url($wp->request);
 
 		$pattern = '/wl-video-sitemap\.xml$/m';
 
-		if ( preg_match( $pattern, $url ) !== 1 ) {
+		if (preg_match($pattern, $url) !== 1) {
 			return;
 		}
 
-		header( "Content-type: text/xml" );
+		header("Content-type: text/xml");
 		// set 200 status code.
 		status_header(200);
 
-		$xml = $this->sitemap_cache->get( self::XML_CACHE_KEY );
+		$xml = $this->sitemap_cache->get(self::XML_CACHE_KEY);
 
-		if ( ! $xml ) {
+		if ( ! $xml) {
 			$xml = $this->get_sitemap_xml();
-			$this->sitemap_cache->put( self::XML_CACHE_KEY, $xml );
+			$this->sitemap_cache->put(self::XML_CACHE_KEY, $xml);
 		}
 
 		echo $xml; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -62,7 +62,7 @@ 
 	}
 
 	public static function is_video_sitemap_enabled() {
-		return intval( get_option( '_wl_video_sitemap_generation', false ) ) === 1;
+		return intval(get_option('_wl_video_sitemap_generation', false)) === 1;
 	}
 
 	/**
@@ -73,11 +73,11 @@ 
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
         xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
 ';
-		$sitemap_body      = Xml_Generator::get_xml_for_all_posts_with_videos();
+		$sitemap_body = Xml_Generator::get_xml_for_all_posts_with_videos();
 
 		$sitemap_end_tag = "</urlset>";
 
-		$xml = $sitemap_start_tag . $sitemap_body . $sitemap_end_tag;
+		$xml = $sitemap_start_tag.$sitemap_body.$sitemap_end_tag;
 
 		return $xml;
 	}

src/wordlift/videoobject/sitemap/class-xml-generator.php

Indentation +105 added lines, -105 removed lines

@@ -12,110 +12,110 @@ 
 
 class Xml_Generator {
 
-	private static function iso8601_to_seconds( $iso8601_interval_string ) {
-		try {
-			$interval = new \DateInterval( $iso8601_interval_string );
-		} catch ( \Exception $e ) {
-			return 0;
-		}
-
-		$days_to_seconds    = $interval->d * 60 * 60 * 24;
-		$hours_to_seconds   = $interval->h * 60 * 60;
-		$minutes_to_seconds = $interval->i * 60;
-		$seconds            = $interval->s;
-
-		return $days_to_seconds + $hours_to_seconds + $minutes_to_seconds + $seconds;
-
-	}
-
-	public static function get_xml_for_all_posts_with_videos() {
-		/**
-		 * @since 3.31.6
-		 * Filter the query args, add support for all custom public post types.
-		 */
-		$video_sitemap_query_args = apply_filters( 'wl_videoobject_sitemap_query_args', array(
-			'fields'      => 'ids',
-			'numberposts' => - 1,
-			'post_type'   => get_post_types( array( 'public' => true ) ),
-			'meta_query'  => array(
-				array(
-					'key'     => Meta_Storage::META_KEY,
-					'compare' => 'EXISTS'
-				)
-			)
-		) );
-
-		$posts = get_posts( $video_sitemap_query_args );
-
-		$all_posts_xml = "";
-
-		if ( ! $posts ) {
-			return $all_posts_xml;
-		}
-
-		foreach ( $posts as $post_id ) {
-			$all_posts_xml .= self::get_xml_for_single_post( $post_id );
-		}
-
-		return $all_posts_xml;
-
-	}
-
-
-	/**
-	 * @param $post_id
-	 *
-	 * @return string XML string for single post.
-	 */
-	public static function get_xml_for_single_post( $post_id ) {
-		$videos = Video_Storage_Factory::get_storage()->get_all_videos( $post_id );
-		if ( ! $videos ) {
-			return "";
-		}
-		$single_post_xml = "";
-		foreach ( $videos as $video ) {
-			$single_post_xml .= self::get_xml_for_single_video( $video, $post_id );
-		}
-
-		return $single_post_xml;
-
-	}
-
-
-	/**
-	 * @param $video Video
-	 * @param $post_id int
-	 *
-	 * @return string
-	 */
-	public static function get_xml_for_single_video( $video, $post_id ) {
-
-		$permalink     = get_permalink( $post_id );
-		$title         = esc_html( $video->name );
-		$description   = esc_html( $video->description );
-		$thumbnail_url = $video->thumbnail_urls[0];
-
-		// If description is empty use title.
-		if ( ! $description ) {
-			$description = $title;
-		}
-
-		$optional_fields = array(
-			'content_loc' => $video->content_url,
-			'player_loc'  => $video->embed_url,
-			'duration'    => self::iso8601_to_seconds( $video->duration ),
-			'view_count'  => $video->views,
-			'live'        => $video->is_live_video ? 'yes' : 'no'
-		);
-
-		$optional_data = "";
-		foreach ( $optional_fields as $xml_key => $xml_value ) {
-			if ( $xml_value ) {
-				$optional_data .= "<video:${xml_key}>${xml_value}</video:${xml_key}>";
-			}
-		}
-
-		return "
+    private static function iso8601_to_seconds( $iso8601_interval_string ) {
+        try {
+            $interval = new \DateInterval( $iso8601_interval_string );
+        } catch ( \Exception $e ) {
+            return 0;
+        }
+
+        $days_to_seconds    = $interval->d * 60 * 60 * 24;
+        $hours_to_seconds   = $interval->h * 60 * 60;
+        $minutes_to_seconds = $interval->i * 60;
+        $seconds            = $interval->s;
+
+        return $days_to_seconds + $hours_to_seconds + $minutes_to_seconds + $seconds;
+
+    }
+
+    public static function get_xml_for_all_posts_with_videos() {
+        /**
+         * @since 3.31.6
+         * Filter the query args, add support for all custom public post types.
+         */
+        $video_sitemap_query_args = apply_filters( 'wl_videoobject_sitemap_query_args', array(
+            'fields'      => 'ids',
+            'numberposts' => - 1,
+            'post_type'   => get_post_types( array( 'public' => true ) ),
+            'meta_query'  => array(
+                array(
+                    'key'     => Meta_Storage::META_KEY,
+                    'compare' => 'EXISTS'
+                )
+            )
+        ) );
+
+        $posts = get_posts( $video_sitemap_query_args );
+
+        $all_posts_xml = "";
+
+        if ( ! $posts ) {
+            return $all_posts_xml;
+        }
+
+        foreach ( $posts as $post_id ) {
+            $all_posts_xml .= self::get_xml_for_single_post( $post_id );
+        }
+
+        return $all_posts_xml;
+
+    }
+
+
+    /**
+     * @param $post_id
+     *
+     * @return string XML string for single post.
+     */
+    public static function get_xml_for_single_post( $post_id ) {
+        $videos = Video_Storage_Factory::get_storage()->get_all_videos( $post_id );
+        if ( ! $videos ) {
+            return "";
+        }
+        $single_post_xml = "";
+        foreach ( $videos as $video ) {
+            $single_post_xml .= self::get_xml_for_single_video( $video, $post_id );
+        }
+
+        return $single_post_xml;
+
+    }
+
+
+    /**
+     * @param $video Video
+     * @param $post_id int
+     *
+     * @return string
+     */
+    public static function get_xml_for_single_video( $video, $post_id ) {
+
+        $permalink     = get_permalink( $post_id );
+        $title         = esc_html( $video->name );
+        $description   = esc_html( $video->description );
+        $thumbnail_url = $video->thumbnail_urls[0];
+
+        // If description is empty use title.
+        if ( ! $description ) {
+            $description = $title;
+        }
+
+        $optional_fields = array(
+            'content_loc' => $video->content_url,
+            'player_loc'  => $video->embed_url,
+            'duration'    => self::iso8601_to_seconds( $video->duration ),
+            'view_count'  => $video->views,
+            'live'        => $video->is_live_video ? 'yes' : 'no'
+        );
+
+        $optional_data = "";
+        foreach ( $optional_fields as $xml_key => $xml_value ) {
+            if ( $xml_value ) {
+                $optional_data .= "<video:${xml_key}>${xml_value}</video:${xml_key}>";
+            }
+        }
+
+        return "
    <url>
      <loc>${permalink}</loc>
      <video:video>
@@ -127,6 +127,6 @@ 
    </url>
 ";
 
-	}
+    }
 
 }
\ No newline at end of file