insideout10 / wordlift-plugin

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

Indentation +8 added lines, -8 removed lines

@@ -8,13 +8,13 @@
 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 );
+    function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+        $current_post_categories = wp_get_post_categories( $this->post_id );
 
-		return get_posts( array(
-			                  'category__in' => $current_post_categories,
-			                  'post_type'    => get_post_type( $this->post_id )
-		                  )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
-	}
+        return get_posts( array(
+                                'category__in' => $current_post_categories,
+                                'post_type'    => get_post_type( $this->post_id )
+                            )
+                          + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -8,13 +8,13 @@
 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 );
+	function get_posts($filler_count, $post_ids_to_be_excluded) {
+		$current_post_categories = wp_get_post_categories($this->post_id);
 
-		return get_posts( array(
+		return get_posts(array(
 			                  'category__in' => $current_post_categories,
-			                  'post_type'    => get_post_type( $this->post_id )
+			                  'post_type'    => get_post_type($this->post_id)
 		                  )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+		                  + $this->get_posts_config($filler_count, $post_ids_to_be_excluded));
 	}
 }

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

Indentation +227 added lines, -227 removed lines

@@ -4,203 +4,203 @@ 
 
 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(
-					'label'     => $serialized_entity['label'],
-					'mainType'  => $serialized_entity['mainType'],
-					'permalink' => get_permalink( $referencing_post->entity_id ),
-				),
-			);
-
-			$result['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $referencing_post->ID ), $navigator_id );
-			$result['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_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 );
-			$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 );
-		}
-
-
-		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(
+                    'label'     => $serialized_entity['label'],
+                    'mainType'  => $serialized_entity['mainType'],
+                    'permalink' => get_permalink( $referencing_post->entity_id ),
+                ),
+            );
+
+            $result['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $referencing_post->ID ), $navigator_id );
+            $result['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_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 );
+            $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 );
+        }
+
+
+        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. 
@@ -233,33 +233,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
@@ -295,8 +295,8 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-				, $post_id, $limit, $offset, $select, $order_by )
-		);
-	}
+                , $post_id, $limit, $offset, $select, $order_by )
+        );
+    }
 
 }

Spacing +53 added lines, -53 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,106 +51,106 @@ 
 		$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(
 					'label'     => $serialized_entity['label'],
 					'mainType'  => $serialized_entity['mainType'],
-					'permalink' => get_permalink( $referencing_post->entity_id ),
+					'permalink' => get_permalink($referencing_post->entity_id),
 				),
 			);
 
-			$result['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $referencing_post->ID ), $navigator_id );
-			$result['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+			$result['product'] = apply_filters('wl_products_navigator_data_post', $result['product'], intval($referencing_post->ID), $navigator_id);
+			$result['entity']  = apply_filters('wl_products_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 			$results[] = $result;
 
 		}
 
-		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 );
-			$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);
+			$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);
 		}
 
 
 		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'
@@ -163,11 +163,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;
@@ -190,17 +190,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. 
@@ -233,7 +233,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-				, $post_id, $limit, $offset, $select, $order_by )
+				, $post_id, $limit, $offset, $select, $order_by)
 		);
 	}
 
@@ -249,17 +249,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
@@ -295,7 +295,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-				, $post_id, $limit, $offset, $select, $order_by )
+				, $post_id, $limit, $offset, $select, $order_by)
 		);
 	}
 

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

Indentation +151 added lines, -151 removed lines

@@ -9,156 +9,156 @@
  */
 class Filler_Posts_Util {
 
-	/**
-	 * @var array<Filler_Posts>
-	 */
-	private $sources = array();
-
-	public function __construct( $post_id ) {
-
-		$post_type = get_post_type( $post_id );
-
-		if ( $post_type === 'post' ) {
-			$this->sources = array(
-				new Same_Category_Filler_Posts( $post_id ),
-				new Same_Post_Type_Filler_Posts( $post_id ),
-			);
-		} else if ( $post_type === 'product' ) {
-			$this->sources = array(
-				new Same_Post_Type_Same_Category_Posts( $post_id ),
-				new Same_Post_Type_Filler_Posts( $post_id ),
-			);
-		} 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 );
-
-			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 ) {
+
+        $post_type = get_post_type( $post_id );
+
+        if ( $post_type === 'post' ) {
+            $this->sources = array(
+                new Same_Category_Filler_Posts( $post_id ),
+                new Same_Post_Type_Filler_Posts( $post_id ),
+            );
+        } else if ( $post_type === 'product' ) {
+            $this->sources = array(
+                new Same_Post_Type_Same_Category_Posts( $post_id ),
+                new Same_Post_Type_Filler_Posts( $post_id ),
+            );
+        } 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 );
+
+            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 +42 added lines, -42 removed lines

@@ -14,23 +14,23 @@ 
 	 */
 	private $sources = array();
 
-	public function __construct( $post_id ) {
+	public function __construct($post_id) {
 
-		$post_type = get_post_type( $post_id );
+		$post_type = get_post_type($post_id);
 
-		if ( $post_type === 'post' ) {
+		if ($post_type === 'post') {
 			$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' ) {
+		} else if ($post_type === 'product') {
 			$this->sources = array(
-				new Same_Post_Type_Same_Category_Posts( $post_id ),
-				new Same_Post_Type_Filler_Posts( $post_id ),
+				new Same_Post_Type_Same_Category_Posts($post_id),
+				new Same_Post_Type_Filler_Posts($post_id),
 			);
 		} else {
 			$this->sources = array(
-				new Same_Post_Type_Filler_Posts( $post_id ),
+				new Same_Post_Type_Filler_Posts($post_id),
 			);
 		}
 	}
@@ -41,22 +41,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;
 			}
 			/**
@@ -65,15 +65,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;
 
@@ -84,13 +84,13 @@ 
 	 *
 	 * @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 );
+	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);
 
 			return $post;
-		}, $posts );
+		}, $posts);
 	}
 
 	/**
@@ -101,19 +101,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
@@ -133,26 +133,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(),
 			);