insideout10 / wordlift-plugin

src/wordlift/widgets/navigator/filler-posts/class-filler-posts.php

Doc Comments +1 added lines

@@ -26,6 +26,7 @@
 	 * Filler_Posts constructor.
 	 *
 	 * @param $post_id
+	 * @param string $alternate_post_type
 	 */
 	public function __construct( $post_id, $alternate_post_type = null ) {
 

Indentation +49 added lines, -49 removed lines

@@ -7,55 +7,55 @@
  */
 abstract class Filler_Posts {
 
-	/**
-	 * @var int
-	 */
-	public $filler_count;
-
-	/**
-	 * @var array<int>
-	 */
-	public $post_ids_to_be_excluded;
-
-	/**
-	 * @var $post_id int
-	 */
-	protected $post_id;
-
-	/**
-	 * Filler_Posts constructor.
-	 *
-	 * @param $post_id
-	 */
-	public function __construct( $post_id, $alternate_post_type = null ) {
-
-		$this->post_id = $post_id;
-		$this->alternate_post_type = $alternate_post_type;
-
-	}
-
-	protected function get_posts_config($filler_count, $post_ids_to_be_excluded) {
-
-		return array(
-			'meta_query'          => array(
-				array(
-					'key' => '_thumbnail_id'
-				)
-			),
-			'numberposts'         => $filler_count,
-			'post__not_in'        => $post_ids_to_be_excluded,
-			'ignore_sticky_posts' => 1
-		);
-
-	}
-
-	/**
-	 * @param $filler_count
-	 * @param $post_ids_to_be_excluded
-	 *
-	 * @return array<\WP_Post>
-	 */
-	abstract function get_posts( $filler_count, $post_ids_to_be_excluded );
+    /**
+     * @var int
+     */
+    public $filler_count;
+
+    /**
+     * @var array<int>
+     */
+    public $post_ids_to_be_excluded;
+
+    /**
+     * @var $post_id int
+     */
+    protected $post_id;
+
+    /**
+     * Filler_Posts constructor.
+     *
+     * @param $post_id
+     */
+    public function __construct( $post_id, $alternate_post_type = null ) {
+
+        $this->post_id = $post_id;
+        $this->alternate_post_type = $alternate_post_type;
+
+    }
+
+    protected function get_posts_config($filler_count, $post_ids_to_be_excluded) {
+
+        return array(
+            'meta_query'          => array(
+                array(
+                    'key' => '_thumbnail_id'
+                )
+            ),
+            'numberposts'         => $filler_count,
+            'post__not_in'        => $post_ids_to_be_excluded,
+            'ignore_sticky_posts' => 1
+        );
+
+    }
+
+    /**
+     * @param $filler_count
+     * @param $post_ids_to_be_excluded
+     *
+     * @return array<\WP_Post>
+     */
+    abstract function get_posts( $filler_count, $post_ids_to_be_excluded );
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param $post_id
 	 */
-	public function __construct( $post_id, $alternate_post_type = null ) {
+	public function __construct($post_id, $alternate_post_type = null) {
 
 		$this->post_id = $post_id;
 		$this->alternate_post_type = $alternate_post_type;
@@ -55,7 +55,7 @@ 
 	 *
 	 * @return array<\WP_Post>
 	 */
-	abstract function get_posts( $filler_count, $post_ids_to_be_excluded );
+	abstract function get_posts($filler_count, $post_ids_to_be_excluded);
 
 
 }

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( <<<EOF
+    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( <<<EOF
 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
 EOF
-				, $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( <<<EOF
+                , $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( <<<EOF
 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
 EOF
-				, $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( <<<EOF
+			$wpdb->prepare(<<<EOF
 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
 EOF
-				, $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( <<<EOF
+			$wpdb->prepare(<<<EOF
 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
 EOF
-				, $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     = $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
-
-	$navigator_id = $_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 ),
-				'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 );
-
-	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     = $_GET['post_id'];
+    $current_post        = get_post( $current_post_id );
+
+    $navigator_id = $_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 ),
+                '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 );
+
+    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( <<<EOF
+    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( <<<EOF
 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
 EOF
-			, $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 ) ? $_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 ) ? $_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 ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
+    $action = array_key_exists( 'action', $_REQUEST ) ? $_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     = $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
+	$current_post        = get_post($current_post_id);
 
 	$navigator_id = $_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 ),
+				'permalink' => get_permalink($referencing_post->ID),
+				'title'     => html_entity_decode($referencing_post->post_title),
 				'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 );
+	$results = apply_filters('wl_navigator_results', $results, $navigator_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( <<<EOF
+		$wpdb->prepare(<<<EOF
 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
 EOF
-			, $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 ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('plugins_loaded', function() {
+	$action = array_key_exists('action', $_REQUEST) ? $_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 ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('init', function() {
+	$action = array_key_exists('action', $_REQUEST) ? $_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/filler-posts/class-same-category-filler-posts.php

Indentation +6 added lines, -6 removed lines

@@ -14,12 +14,12 @@
  */
 class Same_Category_Filler_Posts extends Filler_Posts {
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+    function get_posts( $filler_count, $post_ids_to_be_excluded ) {
 
-		$current_post_categories = wp_get_post_categories( $this->post_id );
-		$post_type = $this->alternate_post_type ?: get_post_types();
+        $current_post_categories = wp_get_post_categories( $this->post_id );
+        $post_type = $this->alternate_post_type ?: get_post_types();
 
-		return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => $post_type )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
-	}
+        return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => $post_type )
+                          + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -14,12 +14,12 @@
  */
 class Same_Category_Filler_Posts extends Filler_Posts {
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+	function get_posts($filler_count, $post_ids_to_be_excluded) {
 
-		$current_post_categories = wp_get_post_categories( $this->post_id );
+		$current_post_categories = wp_get_post_categories($this->post_id);
 		$post_type = $this->alternate_post_type ?: get_post_types();
 
-		return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => $post_type )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+		return get_posts(array('category__in' => $current_post_categories, 'post_type' => $post_type)
+		                  + $this->get_posts_config($filler_count, $post_ids_to_be_excluded));
 	}
 }

src/wordlift/widgets/navigator/filler-posts/class-same-post-type-same-category-posts.php

Indentation +9 added lines, -9 removed lines

@@ -8,14 +8,14 @@
 class Same_Post_Type_Same_Category_Posts extends Filler_Posts {
 
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
-		$current_post_categories = wp_get_post_categories( $this->post_id );
-		$post_type = $this->alternate_post_type ?: get_post_type( $this->post_id );
+    function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+        $current_post_categories = wp_get_post_categories( $this->post_id );
+        $post_type = $this->alternate_post_type ?: get_post_type( $this->post_id );
 
-		return get_posts( array(
-			                  'category__in' => $current_post_categories,
-			                  'post_type'    => $post_type
-		                  )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
-	}
+        return get_posts( array(
+                                'category__in' => $current_post_categories,
+                                'post_type'    => $post_type
+                            )
+                          + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -8,14 +8,14 @@
 class Same_Post_Type_Same_Category_Posts extends Filler_Posts {
 
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
-		$current_post_categories = wp_get_post_categories( $this->post_id );
-		$post_type = $this->alternate_post_type ?: get_post_type( $this->post_id );
+	function get_posts($filler_count, $post_ids_to_be_excluded) {
+		$current_post_categories = wp_get_post_categories($this->post_id);
+		$post_type = $this->alternate_post_type ?: get_post_type($this->post_id);
 
-		return get_posts( array(
+		return get_posts(array(
 			                  'category__in' => $current_post_categories,
 			                  'post_type'    => $post_type
 		                  )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+		                  + $this->get_posts_config($filler_count, $post_ids_to_be_excluded));
 	}
 }

src/wordlift/widgets/navigator/filler-posts/class-same-post-type-filler-posts.php

Indentation +8 added lines, -8 removed lines

@@ -7,15 +7,15 @@
  */
 class Same_Post_Type_Filler_Posts extends Filler_Posts {
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+    function get_posts( $filler_count, $post_ids_to_be_excluded ) {
 
-		$post_type = $this->alternate_post_type ?: get_post_type( $this->post_id );
+        $post_type = $this->alternate_post_type ?: get_post_type( $this->post_id );
 
-		if ( $post_type === 'entity' ) {
-			$post_type = 'post';
-		}
+        if ( $post_type === 'entity' ) {
+            $post_type = 'post';
+        }
 
-		return get_posts( array( 'post_type' => $post_type )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
-	}
+        return get_posts( array( 'post_type' => $post_type )
+                          + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -7,15 +7,15 @@
  */
 class Same_Post_Type_Filler_Posts extends Filler_Posts {
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+	function get_posts($filler_count, $post_ids_to_be_excluded) {
 
-		$post_type = $this->alternate_post_type ?: get_post_type( $this->post_id );
+		$post_type = $this->alternate_post_type ?: get_post_type($this->post_id);
 
-		if ( $post_type === 'entity' ) {
+		if ($post_type === 'entity') {
 			$post_type = 'post';
 		}
 
-		return get_posts( array( 'post_type' => $post_type )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+		return get_posts(array('post_type' => $post_type)
+		                  + $this->get_posts_config($filler_count, $post_ids_to_be_excluded));
 	}
 }

src/wordlift/widgets/navigator/filler-posts/class-filler-posts-util.php

Indentation +152 added lines, -152 removed lines

@@ -10,157 +10,157 @@
  */
 class Filler_Posts_Util {
 
-	/**
-	 * @var array<Filler_Posts>
-	 */
-	private $sources = array();
-
-	public function __construct( $post_id, $alternate_post_type = null ) {
-
-		$post_type = $alternate_post_type ?: get_post_type( $post_id );
-
-		if ( $post_type === 'post' || ( is_array( $post_type ) && in_array( 'post', $post_type ) ) ) {
-			$this->sources = array(
-				new Same_Category_Filler_Posts( $post_id ),
-				new Same_Post_Type_Filler_Posts( $post_id ),
-			);
-		} else if ( $post_type === 'product' || ( is_array( $post_type ) && in_array( 'product', $post_type ) ) ) {
-			$this->sources = array(
-				new Same_Post_Type_Same_Category_Posts( $post_id, 'product' ),
-				new Same_Post_Type_Filler_Posts( $post_id, 'product' ),
-			);
-		} else {
-			$this->sources = array(
-				new Same_Post_Type_Filler_Posts( $post_id ),
-			);
-		}
-	}
-
-
-	/**
-	 * @param $posts array<\WP_Post>
-	 *
-	 * @return array<int>
-	 */
-	private function extract_post_ids( $posts ) {
-		return array_map( function ( $post ) {
-			/**
-			 * @var $post \WP_Post
-			 */
-			return $post->ID;
-		}, $posts );
-	}
-
-	public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
-
-		$filler_posts = array();
-
-		foreach ( $this->sources as $source ) {
-
-			if ( $filler_count <= 0 ) {
-				break;
-			}
-			/**
-			 * @var Filler_Posts $source
-			 */
-			$source->post_ids_to_be_excluded = $post_ids_to_be_excluded;
-			$source->filler_count            = $filler_count;
-
-			$posts    = $source->get_posts( $filler_count, $post_ids_to_be_excluded );
-			$post_ids = $this->extract_post_ids( $posts );
-
-			// Update the post ids, filler posts and filler count
-			$post_ids_to_be_excluded = array_merge( $post_ids_to_be_excluded, $post_ids );
-			$filler_count            = $filler_count - count( $posts );
-			$filler_posts            = array_merge( $filler_posts, $posts );
-		}
-		$filler_posts = $this->add_additional_properties_to_filler_posts( $filler_posts );
-
-		return $filler_posts;
-
-	}
-
-	/**
-	 * @param $posts array<\WP_Post>
-	 *
-	 * @return array $posts array<\WP_Post>
-	 */
-	private function add_additional_properties_to_filler_posts( $posts ) {
-		return array_map( function ( $post ) {
-			$post->thumbnail  = get_the_post_thumbnail_url( $post->ID, 'medium' );
-			$post->permalink  = get_permalink( $post->ID );
-			$post->post_title = html_entity_decode( $post->post_title );
-
-			return $post;
-		}, $posts );
-	}
-
-	/**
-	 * Called by wordlift navigator, converts all the posts to response format.
-	 *
-	 * @param $filler_count
-	 * @param $post_ids_to_be_excluded
-	 *
-	 * @return array
-	 */
-	public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
-		$filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
-		// Add thumbnail and permalink to filler posts
-		$filler_response = array();
-		foreach ( $filler_posts as $post_obj ) {
-			$thumbnail         = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$filler_response[] = array(
-				'post'   => array(
-					'id'        => $post_obj->ID,
-					'permalink' => get_permalink( $post_obj->ID ),
-					'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
-					'title'     => get_the_title( $post_obj->ID ),
-					'srcset'    => Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET )
-				),
-				'entity' => array(
-					'id' => 0
-				)
-			);
-		}
-
-		return $filler_response;
-	}
-
-
-	/**
-	 * Called by wordlift navigator, converts all the posts to response format.
-	 *
-	 * @param $filler_count
-	 * @param $post_ids_to_be_excluded
-	 *
-	 * @return array
-	 */
-	public function get_product_navigator_response( $filler_count, $post_ids_to_be_excluded ) {
-		$filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
-		// Add thumbnail and permalink to filler posts
-		$filler_response = array();
-		foreach ( $filler_posts as $post_obj ) {
-			$product           = wc_get_product( $post_obj->ID );
-			$filler_response[] = array(
-				'product' => array(
-					'id'              => $post_obj->ID,
-					'permalink'       => get_permalink( $post_obj->ID ),
-					'title'           => $post_obj->post_title,
-					'thumbnail'       => get_the_post_thumbnail_url( $post_obj->ID, '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(),
-			);
-		}
-
-		return $filler_response;
-	}
+    /**
+     * @var array<Filler_Posts>
+     */
+    private $sources = array();
+
+    public function __construct( $post_id, $alternate_post_type = null ) {
+
+        $post_type = $alternate_post_type ?: get_post_type( $post_id );
+
+        if ( $post_type === 'post' || ( is_array( $post_type ) && in_array( 'post', $post_type ) ) ) {
+            $this->sources = array(
+                new Same_Category_Filler_Posts( $post_id ),
+                new Same_Post_Type_Filler_Posts( $post_id ),
+            );
+        } else if ( $post_type === 'product' || ( is_array( $post_type ) && in_array( 'product', $post_type ) ) ) {
+            $this->sources = array(
+                new Same_Post_Type_Same_Category_Posts( $post_id, 'product' ),
+                new Same_Post_Type_Filler_Posts( $post_id, 'product' ),
+            );
+        } else {
+            $this->sources = array(
+                new Same_Post_Type_Filler_Posts( $post_id ),
+            );
+        }
+    }
+
+
+    /**
+     * @param $posts array<\WP_Post>
+     *
+     * @return array<int>
+     */
+    private function extract_post_ids( $posts ) {
+        return array_map( function ( $post ) {
+            /**
+             * @var $post \WP_Post
+             */
+            return $post->ID;
+        }, $posts );
+    }
+
+    public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
+
+        $filler_posts = array();
+
+        foreach ( $this->sources as $source ) {
+
+            if ( $filler_count <= 0 ) {
+                break;
+            }
+            /**
+             * @var Filler_Posts $source
+             */
+            $source->post_ids_to_be_excluded = $post_ids_to_be_excluded;
+            $source->filler_count            = $filler_count;
+
+            $posts    = $source->get_posts( $filler_count, $post_ids_to_be_excluded );
+            $post_ids = $this->extract_post_ids( $posts );
+
+            // Update the post ids, filler posts and filler count
+            $post_ids_to_be_excluded = array_merge( $post_ids_to_be_excluded, $post_ids );
+            $filler_count            = $filler_count - count( $posts );
+            $filler_posts            = array_merge( $filler_posts, $posts );
+        }
+        $filler_posts = $this->add_additional_properties_to_filler_posts( $filler_posts );
+
+        return $filler_posts;
+
+    }
+
+    /**
+     * @param $posts array<\WP_Post>
+     *
+     * @return array $posts array<\WP_Post>
+     */
+    private function add_additional_properties_to_filler_posts( $posts ) {
+        return array_map( function ( $post ) {
+            $post->thumbnail  = get_the_post_thumbnail_url( $post->ID, 'medium' );
+            $post->permalink  = get_permalink( $post->ID );
+            $post->post_title = html_entity_decode( $post->post_title );
+
+            return $post;
+        }, $posts );
+    }
+
+    /**
+     * Called by wordlift navigator, converts all the posts to response format.
+     *
+     * @param $filler_count
+     * @param $post_ids_to_be_excluded
+     *
+     * @return array
+     */
+    public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
+        $filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+        // Add thumbnail and permalink to filler posts
+        $filler_response = array();
+        foreach ( $filler_posts as $post_obj ) {
+            $thumbnail         = get_the_post_thumbnail_url( $post_obj, 'medium' );
+            $filler_response[] = array(
+                'post'   => array(
+                    'id'        => $post_obj->ID,
+                    'permalink' => get_permalink( $post_obj->ID ),
+                    'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
+                    'title'     => get_the_title( $post_obj->ID ),
+                    'srcset'    => Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET )
+                ),
+                'entity' => array(
+                    'id' => 0
+                )
+            );
+        }
+
+        return $filler_response;
+    }
+
+
+    /**
+     * Called by wordlift navigator, converts all the posts to response format.
+     *
+     * @param $filler_count
+     * @param $post_ids_to_be_excluded
+     *
+     * @return array
+     */
+    public function get_product_navigator_response( $filler_count, $post_ids_to_be_excluded ) {
+        $filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+        // Add thumbnail and permalink to filler posts
+        $filler_response = array();
+        foreach ( $filler_posts as $post_obj ) {
+            $product           = wc_get_product( $post_obj->ID );
+            $filler_response[] = array(
+                'product' => array(
+                    'id'              => $post_obj->ID,
+                    'permalink'       => get_permalink( $post_obj->ID ),
+                    'title'           => $post_obj->post_title,
+                    'thumbnail'       => get_the_post_thumbnail_url( $post_obj->ID, '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(),
+            );
+        }
+
+        return $filler_response;
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -15,23 +15,23 @@ 
 	 */
 	private $sources = array();
 
-	public function __construct( $post_id, $alternate_post_type = null ) {
+	public function __construct($post_id, $alternate_post_type = null) {
 
-		$post_type = $alternate_post_type ?: get_post_type( $post_id );
+		$post_type = $alternate_post_type ?: get_post_type($post_id);
 
-		if ( $post_type === 'post' || ( is_array( $post_type ) && in_array( 'post', $post_type ) ) ) {
+		if ($post_type === 'post' || (is_array($post_type) && in_array('post', $post_type))) {
 			$this->sources = array(
-				new Same_Category_Filler_Posts( $post_id ),
-				new Same_Post_Type_Filler_Posts( $post_id ),
+				new Same_Category_Filler_Posts($post_id),
+				new Same_Post_Type_Filler_Posts($post_id),
 			);
-		} else if ( $post_type === 'product' || ( is_array( $post_type ) && in_array( 'product', $post_type ) ) ) {
+		} else if ($post_type === 'product' || (is_array($post_type) && in_array('product', $post_type))) {
 			$this->sources = array(
-				new Same_Post_Type_Same_Category_Posts( $post_id, 'product' ),
-				new Same_Post_Type_Filler_Posts( $post_id, 'product' ),
+				new Same_Post_Type_Same_Category_Posts($post_id, 'product'),
+				new Same_Post_Type_Filler_Posts($post_id, 'product'),
 			);
 		} else {
 			$this->sources = array(
-				new Same_Post_Type_Filler_Posts( $post_id ),
+				new Same_Post_Type_Filler_Posts($post_id),
 			);
 		}
 	}
@@ -42,22 +42,22 @@ 
 	 *
 	 * @return array<int>
 	 */
-	private function extract_post_ids( $posts ) {
-		return array_map( function ( $post ) {
+	private function extract_post_ids($posts) {
+		return array_map(function($post) {
 			/**
 			 * @var $post \WP_Post
 			 */
 			return $post->ID;
-		}, $posts );
+		}, $posts);
 	}
 
-	public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
+	public function get_filler_posts($filler_count, $post_ids_to_be_excluded) {
 
 		$filler_posts = array();
 
-		foreach ( $this->sources as $source ) {
+		foreach ($this->sources as $source) {
 
-			if ( $filler_count <= 0 ) {
+			if ($filler_count <= 0) {
 				break;
 			}
 			/**
@@ -66,15 +66,15 @@ 
 			$source->post_ids_to_be_excluded = $post_ids_to_be_excluded;
 			$source->filler_count            = $filler_count;
 
-			$posts    = $source->get_posts( $filler_count, $post_ids_to_be_excluded );
-			$post_ids = $this->extract_post_ids( $posts );
+			$posts    = $source->get_posts($filler_count, $post_ids_to_be_excluded);
+			$post_ids = $this->extract_post_ids($posts);
 
 			// Update the post ids, filler posts and filler count
-			$post_ids_to_be_excluded = array_merge( $post_ids_to_be_excluded, $post_ids );
-			$filler_count            = $filler_count - count( $posts );
-			$filler_posts            = array_merge( $filler_posts, $posts );
+			$post_ids_to_be_excluded = array_merge($post_ids_to_be_excluded, $post_ids);
+			$filler_count            = $filler_count - count($posts);
+			$filler_posts            = array_merge($filler_posts, $posts);
 		}
-		$filler_posts = $this->add_additional_properties_to_filler_posts( $filler_posts );
+		$filler_posts = $this->add_additional_properties_to_filler_posts($filler_posts);
 
 		return $filler_posts;
 
@@ -85,14 +85,14 @@ 
 	 *
 	 * @return array $posts array<\WP_Post>
 	 */
-	private function add_additional_properties_to_filler_posts( $posts ) {
-		return array_map( function ( $post ) {
-			$post->thumbnail  = get_the_post_thumbnail_url( $post->ID, 'medium' );
-			$post->permalink  = get_permalink( $post->ID );
-			$post->post_title = html_entity_decode( $post->post_title );
+	private function add_additional_properties_to_filler_posts($posts) {
+		return array_map(function($post) {
+			$post->thumbnail  = get_the_post_thumbnail_url($post->ID, 'medium');
+			$post->permalink  = get_permalink($post->ID);
+			$post->post_title = html_entity_decode($post->post_title);
 
 			return $post;
-		}, $posts );
+		}, $posts);
 	}
 
 	/**
@@ -103,19 +103,19 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
-		$filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+	public function get_filler_response($filler_count, $post_ids_to_be_excluded) {
+		$filler_posts = $this->get_filler_posts($filler_count, $post_ids_to_be_excluded);
 		// Add thumbnail and permalink to filler posts
 		$filler_response = array();
-		foreach ( $filler_posts as $post_obj ) {
-			$thumbnail         = get_the_post_thumbnail_url( $post_obj, 'medium' );
+		foreach ($filler_posts as $post_obj) {
+			$thumbnail         = get_the_post_thumbnail_url($post_obj, 'medium');
 			$filler_response[] = array(
 				'post'   => array(
 					'id'        => $post_obj->ID,
-					'permalink' => get_permalink( $post_obj->ID ),
-					'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
-					'title'     => get_the_title( $post_obj->ID ),
-					'srcset'    => Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET )
+					'permalink' => get_permalink($post_obj->ID),
+					'thumbnail' => ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
+					'title'     => get_the_title($post_obj->ID),
+					'srcset'    => Srcset_Util::get_srcset($post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET)
 				),
 				'entity' => array(
 					'id' => 0
@@ -135,26 +135,26 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_product_navigator_response( $filler_count, $post_ids_to_be_excluded ) {
-		$filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+	public function get_product_navigator_response($filler_count, $post_ids_to_be_excluded) {
+		$filler_posts = $this->get_filler_posts($filler_count, $post_ids_to_be_excluded);
 		// Add thumbnail and permalink to filler posts
 		$filler_response = array();
-		foreach ( $filler_posts as $post_obj ) {
-			$product           = wc_get_product( $post_obj->ID );
+		foreach ($filler_posts as $post_obj) {
+			$product           = wc_get_product($post_obj->ID);
 			$filler_response[] = array(
 				'product' => array(
 					'id'              => $post_obj->ID,
-					'permalink'       => get_permalink( $post_obj->ID ),
+					'permalink'       => get_permalink($post_obj->ID),
 					'title'           => $post_obj->post_title,
-					'thumbnail'       => get_the_post_thumbnail_url( $post_obj->ID, 'medium' ),
+					'thumbnail'       => get_the_post_thumbnail_url($post_obj->ID, '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(),
 			);

src/includes/cache/class-wordlift-cached-entity-uri-service.php

Indentation +208 added lines, -208 removed lines

@@ -14,213 +14,213 @@
  */
 class Wordlift_Cached_Entity_Uri_Service extends Wordlift_Entity_Uri_Service {
 
-	/**
-	 * The {@link Wordlift_Cache_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Cache_Service $cache_service The {@link Wordlift_Cache_Service} instance.
-	 */
-	private $cache_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_Cached_Entity_Uri_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service
-	 * @param \Wordlift_Cache_Service $cache_service
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function __construct( $configuration_service, $cache_service ) {
-		parent::__construct( $configuration_service );
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Add hooks for meta being added/modified/deleted.
-		$this->cache_service = $cache_service;
-
-		add_action( 'add_post_meta', array(
-			$this,
-			'on_before_post_meta_add',
-		), 10, 3 );
-		add_action( 'update_post_meta', array(
-			$this,
-			'on_before_post_meta_change',
-		), 10, 4 );
-		add_action( 'delete_post_meta', array(
-			$this,
-			'on_before_post_meta_change',
-		), 10, 4 );
-
-	}
-
-	/**
-	 * Preload the URIs.
-	 *
-	 * @param array $uris Preload an array of URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function preload_uris( $uris ) {
-
-		// Filter the URIs which aren't yet cached.
-		$cache_service = $this->cache_service;
-		$uris_to_cache = array_filter( (array) $uris, function ( $item ) use ( $cache_service ) {
-			return ! $cache_service->has_cache( $item );
-		} );
-
-		// Preload the URIs.
-		parent::preload_uris( $uris_to_cache );
-
-		// Store them in cache.
-		if ( is_array( $this->uri_to_post ) && ! empty( $this->uri_to_post ) ) {
-			foreach ( $this->uri_to_post as $uri => $post ) {
-				$this->set_cache( $uri, get_post( $post ) );
-			}
-		}
-
-	}
-
-	/**
-	 * Get the entity post for the specified URI.
-	 *
-	 * @param string $uri The URI.
-	 *
-	 * @return null|WP_Post The {@link WP_Post} or null if not found.
-	 * @since 3.16.3
-	 *
-	 */
-	public function get_entity( $uri ) {
-
-		$this->log->trace( "Getting entity for uri $uri..." );
-
-		// Get the cached post for the specified URI.
-		$cache = $this->cache_service->get_cache( $uri );
-
-		// Return the cached data if valid.
-		if ( false !== $cache && is_numeric( $cache ) ) {
-			$this->log->debug( "Cached entity $cache for uri $uri found." );
-
-			return get_post( $cache );
-		}
-
-		// Get the actual result.
-		$post = parent::get_entity( $uri );
-
-		// Cache the result, if a post is not found we cache -1.
-		$this->set_cache( $uri, $post );
-
-		// Return the result.
-		return $post;
-	}
-
-	/**
-	 * Set the cached URI for the specified {@link WP_Post}.
-	 *
-	 * @param string $uri The URI.
-	 * @param WP_Post $post The post.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	private function set_cache( $uri, $post ) {
-		// Cache the result, if a post is not found we cache -1.
-		$this->cache_service->set_cache( $uri, ( null === $post ? - 1 : $post->ID ) );
-
-	}
-
-	/**
-	 * Delete the cache for the specified URIs.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	private function delete_cache( $uris ) {
-
-		// Delete the cache for each URI.
-		foreach ( $uris as $uri ) {
-			// Delete the single cache file.
-			$this->cache_service->delete_cache( $uri );
-		}
-
-	}
-
-	/**
-	 * Before post meta change.
-	 *
-	 * When a post meta is going to be changed, we check if the `meta_key` is
-	 * either the `entity_url` or the `same_as` in which case we delete the cache
-	 * for all the associated URIs.
-	 *
-	 * @param int|array $meta_ids The {@link WP_Post} meta id(s).
-	 * @param int $post_id The {@link WP_Post} id.
-	 * @param string $meta_key The meta key.
-	 * @param mixed $meta_value The meta value(s).
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function on_before_post_meta_change( $meta_ids, $post_id, $meta_key, $meta_value ) {
-
-		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
-			return;
-		}
-
-		$this->log->trace( "Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache..." );
-
-		// The list of existing URIs, plus the list of URIs being deleted/updated.
-		$old_value = get_post_meta( $post_id, $meta_key );
-
-		// We expect an array here from the `get_post_meta` signature. However `get_post_meta` is prone to side effects
-		// because of filters. So if it's not we return an empty array.
-		if ( ! is_array( $old_value ) ) {
-			$old_value = array();
-		}
-		$new_value = isset( $meta_value ) ? (array) $meta_value : array();
-		$uris      = array_merge( $old_value, $new_value );
-
-		// Delete the cache for those URIs.
-		$this->delete_cache( $uris );
-
-	}
-
-	/**
-	 * Hook to meta add for a {@link WP_Post}, will cause the cache to
-	 * invalidate.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 * @param string $meta_key The meta key.
-	 * @param mixed $meta_value The meta value(s).
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function on_before_post_meta_add( $post_id, $meta_key, $meta_value ) {
-
-		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
-			return;
-		}
-
-		$this->log->trace( "Adding $meta_key for post $post_id ($meta_key), invalidating cache..." );
-
-		// Delete the cache for the URIs being added.
-		$this->delete_cache( (array) $meta_value );
-
-	}
+    /**
+     * The {@link Wordlift_Cache_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Cache_Service $cache_service The {@link Wordlift_Cache_Service} instance.
+     */
+    private $cache_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_Cached_Entity_Uri_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service
+     * @param \Wordlift_Cache_Service $cache_service
+     *
+     * @since 3.16.3
+     *
+     */
+    public function __construct( $configuration_service, $cache_service ) {
+        parent::__construct( $configuration_service );
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Add hooks for meta being added/modified/deleted.
+        $this->cache_service = $cache_service;
+
+        add_action( 'add_post_meta', array(
+            $this,
+            'on_before_post_meta_add',
+        ), 10, 3 );
+        add_action( 'update_post_meta', array(
+            $this,
+            'on_before_post_meta_change',
+        ), 10, 4 );
+        add_action( 'delete_post_meta', array(
+            $this,
+            'on_before_post_meta_change',
+        ), 10, 4 );
+
+    }
+
+    /**
+     * Preload the URIs.
+     *
+     * @param array $uris Preload an array of URIs.
+     *
+     * @since 3.16.3
+     *
+     */
+    public function preload_uris( $uris ) {
+
+        // Filter the URIs which aren't yet cached.
+        $cache_service = $this->cache_service;
+        $uris_to_cache = array_filter( (array) $uris, function ( $item ) use ( $cache_service ) {
+            return ! $cache_service->has_cache( $item );
+        } );
+
+        // Preload the URIs.
+        parent::preload_uris( $uris_to_cache );
+
+        // Store them in cache.
+        if ( is_array( $this->uri_to_post ) && ! empty( $this->uri_to_post ) ) {
+            foreach ( $this->uri_to_post as $uri => $post ) {
+                $this->set_cache( $uri, get_post( $post ) );
+            }
+        }
+
+    }
+
+    /**
+     * Get the entity post for the specified URI.
+     *
+     * @param string $uri The URI.
+     *
+     * @return null|WP_Post The {@link WP_Post} or null if not found.
+     * @since 3.16.3
+     *
+     */
+    public function get_entity( $uri ) {
+
+        $this->log->trace( "Getting entity for uri $uri..." );
+
+        // Get the cached post for the specified URI.
+        $cache = $this->cache_service->get_cache( $uri );
+
+        // Return the cached data if valid.
+        if ( false !== $cache && is_numeric( $cache ) ) {
+            $this->log->debug( "Cached entity $cache for uri $uri found." );
+
+            return get_post( $cache );
+        }
+
+        // Get the actual result.
+        $post = parent::get_entity( $uri );
+
+        // Cache the result, if a post is not found we cache -1.
+        $this->set_cache( $uri, $post );
+
+        // Return the result.
+        return $post;
+    }
+
+    /**
+     * Set the cached URI for the specified {@link WP_Post}.
+     *
+     * @param string $uri The URI.
+     * @param WP_Post $post The post.
+     *
+     * @since 3.16.3
+     *
+     */
+    private function set_cache( $uri, $post ) {
+        // Cache the result, if a post is not found we cache -1.
+        $this->cache_service->set_cache( $uri, ( null === $post ? - 1 : $post->ID ) );
+
+    }
+
+    /**
+     * Delete the cache for the specified URIs.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @since 3.16.3
+     *
+     */
+    private function delete_cache( $uris ) {
+
+        // Delete the cache for each URI.
+        foreach ( $uris as $uri ) {
+            // Delete the single cache file.
+            $this->cache_service->delete_cache( $uri );
+        }
+
+    }
+
+    /**
+     * Before post meta change.
+     *
+     * When a post meta is going to be changed, we check if the `meta_key` is
+     * either the `entity_url` or the `same_as` in which case we delete the cache
+     * for all the associated URIs.
+     *
+     * @param int|array $meta_ids The {@link WP_Post} meta id(s).
+     * @param int $post_id The {@link WP_Post} id.
+     * @param string $meta_key The meta key.
+     * @param mixed $meta_value The meta value(s).
+     *
+     * @since 3.16.3
+     *
+     */
+    public function on_before_post_meta_change( $meta_ids, $post_id, $meta_key, $meta_value ) {
+
+        // Bail out if we're not interested in the meta key.
+        if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+            return;
+        }
+
+        $this->log->trace( "Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache..." );
+
+        // The list of existing URIs, plus the list of URIs being deleted/updated.
+        $old_value = get_post_meta( $post_id, $meta_key );
+
+        // We expect an array here from the `get_post_meta` signature. However `get_post_meta` is prone to side effects
+        // because of filters. So if it's not we return an empty array.
+        if ( ! is_array( $old_value ) ) {
+            $old_value = array();
+        }
+        $new_value = isset( $meta_value ) ? (array) $meta_value : array();
+        $uris      = array_merge( $old_value, $new_value );
+
+        // Delete the cache for those URIs.
+        $this->delete_cache( $uris );
+
+    }
+
+    /**
+     * Hook to meta add for a {@link WP_Post}, will cause the cache to
+     * invalidate.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     * @param string $meta_key The meta key.
+     * @param mixed $meta_value The meta value(s).
+     *
+     * @since 3.16.3
+     *
+     */
+    public function on_before_post_meta_add( $post_id, $meta_key, $meta_value ) {
+
+        // Bail out if we're not interested in the meta key.
+        if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+            return;
+        }
+
+        $this->log->trace( "Adding $meta_key for post $post_id ($meta_key), invalidating cache..." );
+
+        // Delete the cache for the URIs being added.
+        $this->delete_cache( (array) $meta_value );
+
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -41,26 +41,26 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function __construct( $configuration_service, $cache_service ) {
-		parent::__construct( $configuration_service );
+	public function __construct($configuration_service, $cache_service) {
+		parent::__construct($configuration_service);
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Add hooks for meta being added/modified/deleted.
 		$this->cache_service = $cache_service;
 
-		add_action( 'add_post_meta', array(
+		add_action('add_post_meta', array(
 			$this,
 			'on_before_post_meta_add',
-		), 10, 3 );
-		add_action( 'update_post_meta', array(
+		), 10, 3);
+		add_action('update_post_meta', array(
 			$this,
 			'on_before_post_meta_change',
-		), 10, 4 );
-		add_action( 'delete_post_meta', array(
+		), 10, 4);
+		add_action('delete_post_meta', array(
 			$this,
 			'on_before_post_meta_change',
-		), 10, 4 );
+		), 10, 4);
 
 	}
 
@@ -72,21 +72,21 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function preload_uris( $uris ) {
+	public function preload_uris($uris) {
 
 		// Filter the URIs which aren't yet cached.
 		$cache_service = $this->cache_service;
-		$uris_to_cache = array_filter( (array) $uris, function ( $item ) use ( $cache_service ) {
-			return ! $cache_service->has_cache( $item );
+		$uris_to_cache = array_filter((array) $uris, function($item) use ($cache_service) {
+			return ! $cache_service->has_cache($item);
 		} );
 
 		// Preload the URIs.
-		parent::preload_uris( $uris_to_cache );
+		parent::preload_uris($uris_to_cache);
 
 		// Store them in cache.
-		if ( is_array( $this->uri_to_post ) && ! empty( $this->uri_to_post ) ) {
-			foreach ( $this->uri_to_post as $uri => $post ) {
-				$this->set_cache( $uri, get_post( $post ) );
+		if (is_array($this->uri_to_post) && ! empty($this->uri_to_post)) {
+			foreach ($this->uri_to_post as $uri => $post) {
+				$this->set_cache($uri, get_post($post));
 			}
 		}
 
@@ -101,25 +101,25 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function get_entity( $uri ) {
+	public function get_entity($uri) {
 
-		$this->log->trace( "Getting entity for uri $uri..." );
+		$this->log->trace("Getting entity for uri $uri...");
 
 		// Get the cached post for the specified URI.
-		$cache = $this->cache_service->get_cache( $uri );
+		$cache = $this->cache_service->get_cache($uri);
 
 		// Return the cached data if valid.
-		if ( false !== $cache && is_numeric( $cache ) ) {
-			$this->log->debug( "Cached entity $cache for uri $uri found." );
+		if (false !== $cache && is_numeric($cache)) {
+			$this->log->debug("Cached entity $cache for uri $uri found.");
 
-			return get_post( $cache );
+			return get_post($cache);
 		}
 
 		// Get the actual result.
-		$post = parent::get_entity( $uri );
+		$post = parent::get_entity($uri);
 
 		// Cache the result, if a post is not found we cache -1.
-		$this->set_cache( $uri, $post );
+		$this->set_cache($uri, $post);
 
 		// Return the result.
 		return $post;
@@ -134,9 +134,9 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	private function set_cache( $uri, $post ) {
+	private function set_cache($uri, $post) {
 		// Cache the result, if a post is not found we cache -1.
-		$this->cache_service->set_cache( $uri, ( null === $post ? - 1 : $post->ID ) );
+		$this->cache_service->set_cache($uri, (null === $post ? -1 : $post->ID));
 
 	}
 
@@ -148,12 +148,12 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	private function delete_cache( $uris ) {
+	private function delete_cache($uris) {
 
 		// Delete the cache for each URI.
-		foreach ( $uris as $uri ) {
+		foreach ($uris as $uri) {
 			// Delete the single cache file.
-			$this->cache_service->delete_cache( $uri );
+			$this->cache_service->delete_cache($uri);
 		}
 
 	}
@@ -173,28 +173,28 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function on_before_post_meta_change( $meta_ids, $post_id, $meta_key, $meta_value ) {
+	public function on_before_post_meta_change($meta_ids, $post_id, $meta_key, $meta_value) {
 
 		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+		if (WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key) {
 			return;
 		}
 
-		$this->log->trace( "Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache..." );
+		$this->log->trace("Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache...");
 
 		// The list of existing URIs, plus the list of URIs being deleted/updated.
-		$old_value = get_post_meta( $post_id, $meta_key );
+		$old_value = get_post_meta($post_id, $meta_key);
 
 		// We expect an array here from the `get_post_meta` signature. However `get_post_meta` is prone to side effects
 		// because of filters. So if it's not we return an empty array.
-		if ( ! is_array( $old_value ) ) {
+		if ( ! is_array($old_value)) {
 			$old_value = array();
 		}
-		$new_value = isset( $meta_value ) ? (array) $meta_value : array();
-		$uris      = array_merge( $old_value, $new_value );
+		$new_value = isset($meta_value) ? (array) $meta_value : array();
+		$uris      = array_merge($old_value, $new_value);
 
 		// Delete the cache for those URIs.
-		$this->delete_cache( $uris );
+		$this->delete_cache($uris);
 
 	}
 
@@ -209,17 +209,17 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function on_before_post_meta_add( $post_id, $meta_key, $meta_value ) {
+	public function on_before_post_meta_add($post_id, $meta_key, $meta_value) {
 
 		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+		if (WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key) {
 			return;
 		}
 
-		$this->log->trace( "Adding $meta_key for post $post_id ($meta_key), invalidating cache..." );
+		$this->log->trace("Adding $meta_key for post $post_id ($meta_key), invalidating cache...");
 
 		// Delete the cache for the URIs being added.
-		$this->delete_cache( (array) $meta_value );
+		$this->delete_cache((array) $meta_value);
 
 	}