Inspection of "Feature/1197 faceted search filter" - insideout10/wordlift-plugin - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1255)

by Naveen

created 2021-01-12 08:56 UTC

Status

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -315,7 +315,7 @@
 block discarded – undo
 
 	/**
 	 * @param $post
-	 * @param $delimiter
+	 * @param string $delimiter
 	 * @param $limit
 	 *
 	 * @param $post_types

Please login to merge, or discard this patch.

Indentation +220 added lines, -220 removed lines patch added patch discarded remove patch

@@ -17,117 +17,117 @@  discard block
 block discarded – undo
  */
 class Wordlift_Faceted_Search_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_faceted_search';
-
-	public function __construct() {
-		parent::__construct();
-		$this->register_block_type();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
-				// Gutenberg is not active.
-				return;
-			}
-
-			register_block_type( 'wordlift/faceted-search', array(
-				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
-					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-					}
-
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-				},
-
-				'attributes'      => $this->get_block_attributes(),
-			) );
-		} );
-	}
-
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 * @since      3.20.0
-	 *
-	 */
-	private function make_shortcode_atts( $atts ) {
-
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'       => __( 'Related articles', 'wordlift' ),
-			'limit'       => apply_filters( 'wl_faceted_search_default_limit', 10 ),
-			'post_id'     => '',
-			'template_id' => '',
-			'uniqid'      => uniqid( 'wl-faceted-widget-' ),
-			'post_types'  => '',
-		), $atts );
-
-		return $shortcode_atts;
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in web mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 * @since 3.20.0
-	 *
-	 */
-	private function web_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
-
-		$post        = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title       = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit       = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
-
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
-		$rest_url            = esc_attr( $rest_url );
-
-
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
-
-		wp_enqueue_script( 'wordlift-cloud' );
-		$json_faceted_id = wp_json_encode( $faceted_id );
-		$template_url    = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
-
-		return <<<HTML
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_faceted_search';
+
+    public function __construct() {
+        parent::__construct();
+        $this->register_block_type();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action( 'init', function () use ( $scope ) {
+            if ( ! function_exists( 'register_block_type' ) ) {
+                // Gutenberg is not active.
+                return;
+            }
+
+            register_block_type( 'wordlift/faceted-search', array(
+                'editor_script'   => 'wl-block-editor',
+                'render_callback' => function ( $attributes ) use ( $scope ) {
+                    $attr_code = '';
+                    foreach ( $attributes as $key => $value ) {
+                        $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                    }
+
+                    return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                },
+
+                'attributes'      => $this->get_block_attributes(),
+            ) );
+        } );
+    }
+
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     * @since      3.20.0
+     *
+     */
+    private function make_shortcode_atts( $atts ) {
+
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'       => __( 'Related articles', 'wordlift' ),
+            'limit'       => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+            'post_id'     => '',
+            'template_id' => '',
+            'uniqid'      => uniqid( 'wl-faceted-widget-' ),
+            'post_types'  => '',
+        ), $atts );
+
+        return $shortcode_atts;
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in web mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     * @since 3.20.0
+     *
+     */
+    private function web_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
+
+        $post        = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
+        $title       = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit       = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
+
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
+        $rest_url            = esc_attr( $rest_url );
+
+
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
+
+        wp_enqueue_script( 'wordlift-cloud' );
+        $json_faceted_id = wp_json_encode( $faceted_id );
+        $template_url    = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
+
+        return <<<HTML
 			<!-- Faceted {$faceted_id} -->
 			<script type="application/javascript">
 				window.wlFaceteds = window.wlFaceteds || []; wlFaceteds.push({$json_faceted_id});
@@ -140,58 +140,58 @@  discard block
 block discarded – undo
 				 data-template-url="{$template_url}"></div>
 			<!-- /Faceted {$faceted_id} -->
 HTML;
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in amp mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 * @since 3.20.0
-	 *
-	 */
-	private function amp_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
-
-		$post        = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title       = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit       = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
-
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
-				'amp',
-				'post_id' => $post->ID,
-				'limit'   => $limit
-			) ) ) : false;
-
-		$rest_url = $post ? rest_url( sprintf( "wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit ) ) : false;
-
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
-
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
-
-		if ( empty( $template_id ) ) {
-			$template_id = "template-" . $faceted_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
-		}
-
-		return <<<HTML
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in amp mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     * @since 3.20.0
+     *
+     */
+    private function amp_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
+
+        $post        = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
+        $title       = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit       = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
+
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
+                'amp',
+                'post_id' => $post->ID,
+                'limit'   => $limit
+            ) ) ) : false;
+
+        $rest_url = $post ? rest_url( sprintf( "wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit ) ) : false;
+
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
+
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+
+        if ( empty( $template_id ) ) {
+            $template_id = "template-" . $faceted_id;
+            wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+        }
+
+        return <<<HTML
 		<div id="{$faceted_id}" class="wl-amp-faceted">
 			<h2 class="wl-headline">{$title}</h2>
 			<amp-state id="referencedPosts">
@@ -274,62 +274,62 @@  discard block
 block discarded – undo
 			</section>
 		</div>
 HTML;
-	}
-
-	public function get_block_attributes() {
-		return array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'template_id' => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'post_id'     => array(
-				'type'    => 'number',
-				'default' => '',
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
-			),
-			'preview'     => array(
-				'type'    => 'boolean',
-				'default' => false,
-			),
-			'preview_src' => array(
-				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
-			),
-			'post_types'  => array(
-				'type'    => 'string',
-				'default' => '',
-			)
-		);
-	}
-
-	/**
-	 * @param $post
-	 * @param $delimiter
-	 * @param $limit
-	 *
-	 * @param $post_types
-	 *
-	 * @return bool|string
-	 */
-	public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
-		$rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
-				'post_id'    => $post->ID,
-				'limit'      => $limit,
-				'post_types' => $post_types
-			) ) ) : false;
-
-		return $rest_url;
-	}
+    }
+
+    public function get_block_attributes() {
+        return array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'template_id' => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'post_id'     => array(
+                'type'    => 'number',
+                'default' => '',
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+            ),
+            'preview'     => array(
+                'type'    => 'boolean',
+                'default' => false,
+            ),
+            'preview_src' => array(
+                'type'    => 'string',
+                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
+            ),
+            'post_types'  => array(
+                'type'    => 'string',
+                'default' => '',
+            )
+        );
+    }
+
+    /**
+     * @param $post
+     * @param $delimiter
+     * @param $limit
+     *
+     * @param $post_types
+     *
+     * @return bool|string
+     */
+    public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
+        $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
+                'post_id'    => $post->ID,
+                'limit'      => $limit,
+                'post_types' => $post_types
+            ) ) ) : false;
+
+        return $rest_url;
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -30,35 +30,35 @@  discard block
 block discarded – undo
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	private function register_block_type() {
 
 		$scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
+		add_action('init', function() use ($scope) {
+			if ( ! function_exists('register_block_type')) {
 				// Gutenberg is not active.
 				return;
 			}
 
-			register_block_type( 'wordlift/faceted-search', array(
+			register_block_type('wordlift/faceted-search', array(
 				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
+				'render_callback' => function($attributes) use ($scope) {
 					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+					foreach ($attributes as $key => $value) {
+						$attr_code .= $key.'="'.htmlentities($value).'" ';
 					}
 
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+					return '['.$scope::SHORTCODE.' '.$attr_code.']';
 				},
 
 				'attributes'      => $this->get_block_attributes(),
-			) );
+			));
 		} );
 	}
 
@@ -72,17 +72,17 @@  discard block
 block discarded – undo
 	 * @since      3.20.0
 	 *
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'       => __( 'Related articles', 'wordlift' ),
-			'limit'       => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'       => __('Related articles', 'wordlift'),
+			'limit'       => apply_filters('wl_faceted_search_default_limit', 10),
 			'post_id'     => '',
 			'template_id' => '',
-			'uniqid'      => uniqid( 'wl-faceted-widget-' ),
+			'uniqid'      => uniqid('wl-faceted-widget-'),
 			'post_types'  => '',
-		), $atts );
+		), $atts);
 
 		return $shortcode_atts;
 	}
@@ -96,36 +96,36 @@  discard block
 block discarded – undo
 	 * @since 3.20.0
 	 *
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post        = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title       = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit       = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
+		$post        = ! empty($shortcode_atts['post_id']) ? get_post(intval(sanitize_text_field($shortcode_atts['post_id']))) : get_post();
+		$title       = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit       = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$faceted_id  = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-faceted-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
-		$rest_url            = esc_attr( $rest_url );
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
+		$rest_url            = $this->get_rest_url($post, $delimiter, $limit, $shortcode_atts['post_types']);
+		$rest_url            = esc_attr($rest_url);
 
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$json_faceted_id = wp_json_encode( $faceted_id );
-		$template_url    = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
+		wp_enqueue_script('wordlift-cloud');
+		$json_faceted_id = wp_json_encode($faceted_id);
+		$template_url    = get_rest_url(null, '/wordlift/v1/faceted-search/template');
 
 		return <<<HTML
 			<!-- Faceted {$faceted_id} -->
@@ -151,44 +151,44 @@  discard block
 block discarded – undo
 	 * @since 3.20.0
 	 *
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post        = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title       = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit       = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
+		$post        = ! empty($shortcode_atts['post_id']) ? get_post(intval(sanitize_text_field($shortcode_atts['post_id']))) : get_post();
+		$title       = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit       = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$faceted_id  = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-faceted-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
+		$rest_url            = $post ? rest_url(WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faceted-search'.$delimiter.build_query(array(
 				'amp',
 				'post_id' => $post->ID,
 				'limit'   => $limit
-			) ) ) : false;
+			))) : false;
 
-		$rest_url = $post ? rest_url( sprintf( "wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit ) ) : false;
+		$rest_url = $post ? rest_url(sprintf("wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit)) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+		$rest_url = str_replace(array('http:', 'https:'), '', $rest_url);
 
-		if ( empty( $template_id ) ) {
-			$template_id = "template-" . $faceted_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+		if (empty($template_id)) {
+			$template_id = "template-".$faceted_id;
+			wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(dirname(__FILE__)).'/css/wordlift-amp-custom.min.css');
 		}
 
 		return <<<HTML
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
 		return array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'template_id' => array(
 				'type'    => 'string',
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
 			),
 			'limit'       => array(
 				'type'    => 'number',
-				'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+				'default' => apply_filters('wl_faceted_search_default_limit', 10),
 			),
 			'preview'     => array(
 				'type'    => 'boolean',
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
 			),
 			'preview_src' => array(
 				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
+				'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/faceted-search.png',
 			),
 			'post_types'  => array(
 				'type'    => 'string',
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool|string
 	 */
-	public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
-		$rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
+	public function get_rest_url($post, $delimiter, $limit, $post_types) {
+		$rest_url = $post ? rest_url(WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faceted-search'.$delimiter.build_query(array(
 				'post_id'    => $post->ID,
 				'limit'      => $limit,
 				'post_types' => $post_types
-			) ) ) : false;
+			))) : false;
 
 		return $rest_url;
 	}

Please login to merge, or discard this patch.

src/shortcodes/wordlift_shortcode_navigator.php 3 patches

Unused Use Statements -1 removed lines patch added patch discarded remove patch

@@ -8,7 +8,6 @@
 block discarded – undo
  */
 
 use Wordlift\Cache\Ttl_Cache;
-use Wordlift\Widgets\Navigator\Filler_Posts;
 use Wordlift\Widgets\Navigator\Filler_Posts\Filler_Posts_Util;
 use Wordlift\Widgets\Navigator\Navigator_Data;
 

Please login to merge, or discard this patch.

Indentation +257 added lines, -257 removed lines patch added patch discarded remove patch

@@ -19,29 +19,29 @@  discard block
 block discarded – undo
  */
 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 );
 
-	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;
 }
 
 /**
@@ -56,234 +56,234 @@  discard block
 block discarded – undo
  */
 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'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'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_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( $filler_posts, $results );
-	}
-
-	// 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 );
-	}
-
-	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'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            '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_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( $filler_posts, $results );
+    }
+
+    // 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 );
+    }
+
+    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 );
-	}
-
-	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 );
+    }
+
+    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. 
@@ -309,8 +309,8 @@  discard block
 block discarded – undo
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
  */
 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 );
 
 }
 
@@ -336,16 +336,16 @@  discard block
 block discarded – undo
  */
 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 ),
+        ),
+    );
 
 }
 
@@ -353,22 +353,22 @@  discard block
 block discarded – undo
  * 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',
+    ) );
 } );
 
 /**
@@ -378,22 +378,22 @@  discard block
 block discarded – undo
  */
 add_action( 'plugins_loaded', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    remove_action( 'plugins_loaded', 'rocket_init' );
+    remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+    remove_action( 'plugins_loaded', 'wpseo_init', 14 );
 }, 0 );
 
 add_action( 'init', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['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 );
 

Please login to merge, or discard this patch.

Spacing +103 added lines, -103 removed lines patch added patch discarded remove patch

@@ -21,25 +21,25 @@  discard block
 block discarded – undo
 
 	// 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);
 
-	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;
 }
@@ -54,29 +54,29 @@  discard block
 block discarded – undo
  * @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;
 
@@ -85,57 +85,57 @@  discard block
 block discarded – undo
 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.
@@ -145,12 +145,12 @@  discard block
 block discarded – undo
 		 *
 		 * @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 ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
 				'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),
 			),
 		);
 
@@ -166,59 +166,59 @@  discard block
 block discarded – undo
 	}
 
 
-	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_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( $filler_posts, $results );
+		$filler_posts_util = new Filler_Posts_Util($current_post_id);
+		$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($filler_posts, $results);
 	}
 
 	// 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);
 	}
 
 	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.
@@ -228,30 +228,30 @@  discard block
 block discarded – undo
 		 *
 		 * @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);
 	}
 
 	return $results;
@@ -266,24 +266,24 @@  discard block
 block discarded – undo
 ) {
 	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. 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -324,12 +324,12 @@  discard block
 block discarded – undo
 
 	// 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
@@ -337,13 +337,13 @@  discard block
 block discarded – undo
 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),
 		),
 	);
 
@@ -352,23 +352,23 @@  discard block
 block discarded – undo
 /**
  * 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',
-	) );
+	));
 } );
 
 /**
@@ -376,24 +376,24 @@  discard block
 block discarded – undo
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
+add_action('plugins_loaded', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['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 () {
+add_action('init', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['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);
 

Please login to merge, or discard this patch.

src/shortcodes/wordlift_shortcode_faceted_search.php 2 patches

Indentation +200 added lines, -200 removed lines patch added patch discarded remove patch

@@ -19,30 +19,30 @@  discard block
 block discarded – undo
  */
 function wl_shortcode_faceted_search( $request ) {
 
-	// Create the cache key.
-	$cache_key = array(
-		'request_params' => $_GET,
-	);
+    // Create the cache key.
+    $cache_key = array(
+        'request_params' => $_GET,
+    );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "faceted-search", 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( "faceted-search", 8 * 60 * 60 ); // 8 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
-		wl_core_send_json( $cache_results );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
+        wl_core_send_json( $cache_results );
 
-		return;
-	}
+        return;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = wl_shortcode_faceted_search_origin( $request );
+    $results = wl_shortcode_faceted_search_origin( $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 );
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 
@@ -53,150 +53,150 @@  discard block
 block discarded – undo
  * @since        3.26.0
  */
 function wl_shortcode_faceted_search_origin( $request ) {
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
-	$faceted_id      = $_GET['uniqid'];
-
-	$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 ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
-
-		return;
-	}
-
-	// If the current post is an entity,
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-
-	$entity_ids = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		$entity_service->get_related_entities( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		/**
-		 * If this function is not called from ajax
-		 * then this should not throw an error.
-		 * Note: Used in scripbox longtail project on json endpoint.
-		 */
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die( 'No entities available' );
-		}
-
-	}
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
-	$amp   = ( isset( $_GET['amp'] ) ) ? true : false;
-
-
-	/**
-	 * see https://github.com/insideout10/wordlift-plugin/issues/1181
-	 * The ordering should be descending by date on default.
-	 */
-	$order_by = 'DESC';
-	if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
-		$order_by = (string) $_GET['sort'];
-	}
-
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit,
-		null,
-		$order_by,
-		$post_types
-	);
-
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-
-	$post_results   = array();
-	$entity_results = array();
-
-	// Populate $post_results
-
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-			'*',
-			null,
-			null,
-			array(),
-			null,
-			$referencing_post_ids
-		);
-
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
-
-			/**
-			 * 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( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ?
-				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_permalink( $post_obj->ID );
-
-			$result         = $post_obj;
-			$post_results[] = $result;
-		}
-	}
-
-	// Add filler posts if needed
-
-	$filler_count = $limit - count( $post_results );
-	if ( $filler_count > 0 ) {
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
-
-		$post_results            = array_merge( $post_results, $filler_posts );
-	}
-	$referencing_post_ids = array_map( function ( $post ) {
-		return $post->ID;
-	}, $post_results );
-
-	// Populate $entity_results
-
-	global $wpdb;
-
-	// Retrieve Wordlift relation instances table name.
-	$table_name = wl_core_get_relation_instances_table_name();
-
-	/*
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
+    $faceted_id      = $_GET['uniqid'];
+
+    $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 ID has to match an existing item.
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
+
+        return;
+    }
+
+    // If the current post is an entity,
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+
+    $entity_ids = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        $entity_service->get_related_entities( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        /**
+         * If this function is not called from ajax
+         * then this should not throw an error.
+         * Note: Used in scripbox longtail project on json endpoint.
+         */
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die( 'No entities available' );
+        }
+
+    }
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
+    $amp   = ( isset( $_GET['amp'] ) ) ? true : false;
+
+
+    /**
+     * see https://github.com/insideout10/wordlift-plugin/issues/1181
+     * The ordering should be descending by date on default.
+     */
+    $order_by = 'DESC';
+    if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
+        $order_by = (string) $_GET['sort'];
+    }
+
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit,
+        null,
+        $order_by,
+        $post_types
+    );
+
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+
+    $post_results   = array();
+    $entity_results = array();
+
+    // Populate $post_results
+
+    $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+        $referencing_posts :
+        Wordlift_Relation_Service::get_instance()->get_article_subjects(
+            wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+            '*',
+            null,
+            null,
+            array(),
+            null,
+            $referencing_post_ids
+        );
+
+    if ( $filtered_posts ) {
+        foreach ( $filtered_posts as $post_obj ) {
+
+            /**
+             * 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( $post_obj, 'medium' );
+            $post_obj->thumbnail = ( $thumbnail ) ?
+                $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+            $post_obj->permalink = get_permalink( $post_obj->ID );
+
+            $result         = $post_obj;
+            $post_results[] = $result;
+        }
+    }
+
+    // Add filler posts if needed
+
+    $filler_count = $limit - count( $post_results );
+    if ( $filler_count > 0 ) {
+        $filler_posts_util       = new Filler_Posts_Util( $current_post_id );
+        $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
+        $filler_posts            = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+
+        $post_results            = array_merge( $post_results, $filler_posts );
+    }
+    $referencing_post_ids = array_map( function ( $post ) {
+        return $post->ID;
+    }, $post_results );
+
+    // Populate $entity_results
+
+    global $wpdb;
+
+    // Retrieve Wordlift relation instances table name.
+    $table_name = wl_core_get_relation_instances_table_name();
+
+    /*
 	 * Make sure we have some referenced post, otherwise the IN parts of
 	 * the SQL will produce an SQL error.
 	 */
-	if ( ! empty( $referencing_post_ids ) ) {
-		$subject_ids = implode( ',', $referencing_post_ids );
+    if ( ! empty( $referencing_post_ids ) ) {
+        $subject_ids = implode( ',', $referencing_post_ids );
 
-		$query = "
+        $query = "
 				SELECT
 					object_id AS ID,
 					count( object_id ) AS counter
@@ -208,60 +208,60 @@  discard block
 block discarded – undo
 				LIMIT $limit;
 			";
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-		$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+        $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
 
-		wl_write_log( 'Entities found ' . count( $entities ) );
+        wl_write_log( 'Entities found ' . count( $entities ) );
 
-		foreach ( $entities as $obj ) {
+        foreach ( $entities as $obj ) {
 
-			$entity = get_post( $obj->ID );
+            $entity = get_post( $obj->ID );
 
-			// Ensure only valid and published entities are returned.
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+            // Ensure only valid and published entities are returned.
+            if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-				$serialized_entity                    = wl_serialize_entity( $entity );
-				$serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title( $obj->ID );
-				$serialized_entity['counter']         = $obj->counter;
-				$serialized_entity['createdAt']       = $entity->post_date;
-				$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-					$obj->ID,
-					'ids',
-					null,
-					null,
-					array(),
-					null,
-					$referencing_post_ids
-				);
-				$entity_results[]                     = $serialized_entity;
-			}
-		}
-	}
+                $serialized_entity                    = wl_serialize_entity( $entity );
+                $serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title( $obj->ID );
+                $serialized_entity['counter']         = $obj->counter;
+                $serialized_entity['createdAt']       = $entity->post_date;
+                $serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+                    $obj->ID,
+                    'ids',
+                    null,
+                    null,
+                    array(),
+                    null,
+                    $referencing_post_ids
+                );
+                $entity_results[]                     = $serialized_entity;
+            }
+        }
+    }
 
-	$post_results   = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
-	$entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
+    $post_results   = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
+    $entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
 
-	return array(
-		'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
-		'entities' => $entity_results
-	);
+    return array(
+        'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
+        'entities' => $entity_results
+    );
 
 }
 
 function wl_shortcode_faceted_search_get_the_title( $post_id ) {
 
-	$title = get_the_title( $post_id );
+    $title = get_the_title( $post_id );
 
-	if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+    if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
+        $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
 
-		if ( count( $alternative_labels ) > 0 ) {
-			$title = $alternative_labels[0];
-		}
-	}
+        if ( count( $alternative_labels ) > 0 ) {
+            $title = $alternative_labels[0];
+        }
+    }
 
-	return remove_accents( $title );
+    return remove_accents( $title );
 
 }
 
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
  * Adding `rest_api_init` action for network faceted-search
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
-		'methods'             => 'GET',
-		'callback'            => 'wl_shortcode_faceted_search',
-		'permission_callback' => '__return_true',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+        'methods'             => 'GET',
+        'callback'            => 'wl_shortcode_faceted_search',
+        'permission_callback' => '__return_true',
+    ) );
 } );

Please login to merge, or discard this patch.

Spacing +69 added lines, -71 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  * @since 3.21.4 fix the cache key by also using the request body.
  * @since 3.21.2 add a caching layer.
  */
-function wl_shortcode_faceted_search( $request ) {
+function wl_shortcode_faceted_search($request) {
 
 	// Create the cache key.
 	$cache_key = array(
@@ -25,24 +25,24 @@  discard block
 block discarded – undo
 	);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("faceted-search", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
-		wl_core_send_json( $cache_results );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
+		wl_core_send_json($cache_results);
 
 		return;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
-	$results = wl_shortcode_faceted_search_origin( $request );
+	$results = wl_shortcode_faceted_search_origin($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);
 
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
@@ -52,27 +52,27 @@  discard block
 block discarded – undo
  * @return array $results
  * @since        3.26.0
  */
-function wl_shortcode_faceted_search_origin( $request ) {
+function wl_shortcode_faceted_search_origin($request) {
 	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 	$faceted_id      = $_GET['uniqid'];
 
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
+	$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));
 
 
 	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -82,25 +82,24 @@  discard block
 block discarded – undo
 	// Otherwise, current post related entities are used.
 	$entity_service = Wordlift_Entity_Service::get_instance();
 
-	$entity_ids = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		$entity_service->get_related_entities( $current_post->ID );
+	$entity_ids = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : $entity_service->get_related_entities($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		/**
 		 * If this function is not called from ajax
 		 * then this should not throw an error.
 		 * Note: Used in scripbox longtail project on json endpoint.
 		 */
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die( 'No entities available' );
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
+			wp_die('No entities available');
 		}
 
 	}
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
-	$amp   = ( isset( $_GET['amp'] ) ) ? true : false;
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
+	$amp   = (isset($_GET['amp'])) ? true : false;
 
 
 	/**
@@ -108,7 +107,7 @@  discard block
 block discarded – undo
 	 * The ordering should be descending by date on default.
 	 */
 	$order_by = 'DESC';
-	if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
+	if (isset($_GET['sort']) && is_string($_GET['sort'])) {
 		$order_by = (string) $_GET['sort'];
 	}
 
@@ -118,7 +117,7 @@  discard block
 block discarded – undo
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit,
 		null,
 		$order_by,
@@ -126,19 +125,18 @@  discard block
 block discarded – undo
 	);
 
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 
 	$post_results   = array();
 	$entity_results = array();
 
 	// Populate $post_results
 
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+	$filtered_posts = (empty($filtering_entity_uris)) ?
+		$referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
+			wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 			'*',
 			null,
 			null,
@@ -147,8 +145,8 @@  discard block
 block discarded – undo
 			$referencing_post_ids
 		);
 
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
+	if ($filtered_posts) {
+		foreach ($filtered_posts as $post_obj) {
 
 			/**
 			 * Use the thumbnail.
@@ -158,10 +156,10 @@  discard block
 block discarded – undo
 			 *
 			 * @since 3.19.3 We're using the medium size image.
 			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ?
+			$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+			$post_obj->thumbnail = ($thumbnail) ?
 				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_permalink( $post_obj->ID );
+			$post_obj->permalink = get_permalink($post_obj->ID);
 
 			$result         = $post_obj;
 			$post_results[] = $result;
@@ -170,17 +168,17 @@  discard block
 block discarded – undo
 
 	// Add filler posts if needed
 
-	$filler_count = $limit - count( $post_results );
-	if ( $filler_count > 0 ) {
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+	$filler_count = $limit - count($post_results);
+	if ($filler_count > 0) {
+		$filler_posts_util       = new Filler_Posts_Util($current_post_id);
+		$post_ids_to_be_excluded = array_merge(array($current_post_id), $referencing_post_ids);
+		$filler_posts            = $filler_posts_util->get_filler_posts($filler_count, $post_ids_to_be_excluded);
 
-		$post_results            = array_merge( $post_results, $filler_posts );
+		$post_results            = array_merge($post_results, $filler_posts);
 	}
-	$referencing_post_ids = array_map( function ( $post ) {
+	$referencing_post_ids = array_map(function($post) {
 		return $post->ID;
-	}, $post_results );
+	}, $post_results);
 
 	// Populate $entity_results
 
@@ -193,8 +191,8 @@  discard block
 block discarded – undo
 	 * Make sure we have some referenced post, otherwise the IN parts of
 	 * the SQL will produce an SQL error.
 	 */
-	if ( ! empty( $referencing_post_ids ) ) {
-		$subject_ids = implode( ',', $referencing_post_ids );
+	if ( ! empty($referencing_post_ids)) {
+		$subject_ids = implode(',', $referencing_post_ids);
 
 		$query = "
 				SELECT
@@ -208,21 +206,21 @@  discard block
 block discarded – undo
 				LIMIT $limit;
 			";
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-		$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+		$entities = $wpdb->get_results($query, OBJECT); // No cache ok.
 
-		wl_write_log( 'Entities found ' . count( $entities ) );
+		wl_write_log('Entities found '.count($entities));
 
-		foreach ( $entities as $obj ) {
+		foreach ($entities as $obj) {
 
-			$entity = get_post( $obj->ID );
+			$entity = get_post($obj->ID);
 
 			// Ensure only valid and published entities are returned.
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+			if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-				$serialized_entity                    = wl_serialize_entity( $entity );
-				$serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title( $obj->ID );
+				$serialized_entity                    = wl_serialize_entity($entity);
+				$serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title($obj->ID);
 				$serialized_entity['counter']         = $obj->counter;
 				$serialized_entity['createdAt']       = $entity->post_date;
 				$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
@@ -234,44 +232,44 @@  discard block
 block discarded – undo
 					null,
 					$referencing_post_ids
 				);
-				$entity_results[]                     = $serialized_entity;
+				$entity_results[] = $serialized_entity;
 			}
 		}
 	}
 
-	$post_results   = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
-	$entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
+	$post_results   = apply_filters('wl_faceted_data_posts', $post_results, $faceted_id);
+	$entity_results = apply_filters('wl_faceted_data_entities', $entity_results, $faceted_id);
 
 	return array(
-		'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
+		'posts'    => $amp ? array(array('values' => $post_results)) : $post_results,
 		'entities' => $entity_results
 	);
 
 }
 
-function wl_shortcode_faceted_search_get_the_title( $post_id ) {
+function wl_shortcode_faceted_search_get_the_title($post_id) {
 
-	$title = get_the_title( $post_id );
+	$title = get_the_title($post_id);
 
-	if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+	if (get_post_type($post_id) !== Wordlift_Entity_Service::TYPE_NAME) {
+		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
 
-		if ( count( $alternative_labels ) > 0 ) {
+		if (count($alternative_labels) > 0) {
 			$title = $alternative_labels[0];
 		}
 	}
 
-	return remove_accents( $title );
+	return remove_accents($title);
 
 }
 
 /**
  * Adding `rest_api_init` action for network faceted-search
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
 		'methods'             => 'GET',
 		'callback'            => 'wl_shortcode_faceted_search',
 		'permission_callback' => '__return_true',
-	) );
+	));
 } );

Please login to merge, or discard this patch.

widgets/navigator/filler-posts/class-same-category-filler-posts.php 2 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -14,11 +14,11 @@
 block discarded – undo
  */
 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 );
 
-		return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => get_post_types() )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
-	}
+        return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => get_post_types() )
+                          + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+    }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -14,11 +14,11 @@
 block discarded – undo
  */
 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);
 
-		return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => get_post_types() )
-		                  + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
+		return get_posts(array('category__in' => $current_post_categories, 'post_type' => get_post_types())
+		                  + $this->get_posts_config($filler_count, $post_ids_to_be_excluded));
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

widgets/navigator/filler-posts/class-same-post-type-filler-posts.php 2 patches

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -7,17 +7,17 @@
 block discarded – undo
  */
 class Same_Post_Type_Filler_Posts extends Filler_Posts {
 
-	public function __construct( $post_id ) {
-		parent::__construct( $post_id );
-	}
+    public function __construct( $post_id ) {
+        parent::__construct( $post_id );
+    }
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
-		$post_type = get_post_type( $this->post_id );
-		if ( $post_type === 'entity' ) {
-			$post_type = 'post';
-		}
+    function get_posts( $filler_count, $post_ids_to_be_excluded ) {
+        $post_type = get_post_type( $this->post_id );
+        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 ) );
+    }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,17 +7,17 @@
 block discarded – undo
  */
 class Same_Post_Type_Filler_Posts extends Filler_Posts {
 
-	public function __construct( $post_id ) {
-		parent::__construct( $post_id );
+	public function __construct($post_id) {
+		parent::__construct($post_id);
 	}
 
-	function get_posts( $filler_count, $post_ids_to_be_excluded ) {
-		$post_type = get_post_type( $this->post_id );
-		if ( $post_type === 'entity' ) {
+	function get_posts($filler_count, $post_ids_to_be_excluded) {
+		$post_type = get_post_type($this->post_id);
+		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));
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -7,54 +7,54 @@
 block discarded – undo
  */
 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 ) {
-
-		$this->post_id = $post_id;
-
-	}
-
-	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 ) {
+
+        $this->post_id = $post_id;
+
+    }
+
+    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 );
 
 
 }

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param $post_id
 	 */
-	public function __construct( $post_id ) {
+	public function __construct($post_id) {
 
 		$this->post_id = $post_id;
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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);
 
 
 }

Please login to merge, or discard this patch.

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

Indentation +94 added lines, -94 removed lines patch added patch discarded remove patch

@@ -7,100 +7,100 @@
 block discarded – undo
  */
 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 {
-			$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 );
-
-
-		}
-
-		return $filler_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 )
-				),
-				'entity' => array(
-					'id' => 0
-				)
-			);
-		}
-
-		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 {
+            $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 );
+
+
+        }
+
+        return $filler_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 )
+                ),
+                'entity' => array(
+                    'id' => 0
+                )
+            );
+        }
+
+        return $filler_response;
+    }
 
 
 }

Please login to merge, or discard this patch.

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -12,18 +12,18 @@  discard block
 block discarded – undo
 	 */
 	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 {
 			$this->sources = array(
-				new Same_Post_Type_Filler_Posts( $post_id ),
+				new Same_Post_Type_Filler_Posts($post_id),
 			);
 		}
 	}
@@ -34,22 +34,22 @@  discard block
 block discarded – undo
 	 *
 	 * @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;
 			}
 			/**
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
 			$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);
 
 
 		}
@@ -80,18 +80,18 @@  discard block
 block discarded – undo
 	 *
 	 * @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 )
+					'permalink' => get_permalink($post_obj->ID),
+					'thumbnail' => ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
+					'title'     => get_the_title($post_obj->ID)
 				),
 				'entity' => array(
 					'id' => 0

Please login to merge, or discard this patch.

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

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -7,39 +7,39 @@  discard block
 block discarded – undo
  */
 class Navigator_Data {
 
-	public static function get_post_types_as_string( $post_types ) {
-		if ( $post_types === array() ) {
-			$post_types = get_post_types();
-		}
-		$post_types = array_map( function ( $post_type ) {
-			return "'" . esc_sql( $post_type ) . "'";
-		}, $post_types );
-
-		return implode( ',', $post_types );
-	}
-
-	public static function post_navigator_get_results(
-		$post_id, $fields = array(
-		'ID',
-		'post_title',
-	), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
-	) {
-
-		$post_types = self::get_post_types_as_string( $post_types );
-		global $wpdb;
-
-		$select = implode( ', ', array_map( function ( $item ) {
-			return "p.$item AS $item";
-		}, (array) $fields ) );
-
-		$order_by = implode( ', ', array_map( function ( $item ) {
-			return "p.$item";
-		}, (array) $order_by ) );
-
-
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare( <<<EOF
+    public static function get_post_types_as_string( $post_types ) {
+        if ( $post_types === array() ) {
+            $post_types = get_post_types();
+        }
+        $post_types = array_map( function ( $post_type ) {
+            return "'" . esc_sql( $post_type ) . "'";
+        }, $post_types );
+
+        return implode( ',', $post_types );
+    }
+
+    public static function post_navigator_get_results(
+        $post_id, $fields = array(
+        'ID',
+        'post_title',
+    ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
+    ) {
+
+        $post_types = self::get_post_types_as_string( $post_types );
+        global $wpdb;
+
+        $select = implode( ', ', array_map( function ( $item ) {
+            return "p.$item AS $item";
+        }, (array) $fields ) );
+
+        $order_by = implode( ', ', array_map( function ( $item ) {
+            return "p.$item";
+        }, (array) $order_by ) );
+
+
+        /** @noinspection SqlNoDataSourceInspection */
+        return $wpdb->get_results(
+            $wpdb->prepare( <<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -73,33 +73,33 @@  discard block
 block discarded – undo
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-				, $post_id, $limit, $offset, $select, $order_by )
-		);
+                , $post_id, $limit, $offset, $select, $order_by )
+        );
 
-	}
+    }
 
 
-	public static function entity_navigator_get_results(
-		$post_id, $fields = array(
-		'ID',
-		'post_title',
-	), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
-	) {
-		global $wpdb;
+    public static function entity_navigator_get_results(
+        $post_id, $fields = array(
+        'ID',
+        'post_title',
+    ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
+    ) {
+        global $wpdb;
 
-		$select = implode( ', ', array_map( function ( $item ) {
-			return "p.$item AS $item";
-		}, (array) $fields ) );
+        $select = implode( ', ', array_map( function ( $item ) {
+            return "p.$item AS $item";
+        }, (array) $fields ) );
 
-		$order_by = implode( ', ', array_map( function ( $item ) {
-			return "p.$item";
-		}, (array) $order_by ) );
+        $order_by = implode( ', ', array_map( function ( $item ) {
+            return "p.$item";
+        }, (array) $order_by ) );
 
-		$post_types = self::get_post_types_as_string( $post_types );
+        $post_types = self::get_post_types_as_string( $post_types );
 
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare( <<<EOF
+        /** @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. 
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-				, $post_id, $limit, $offset, $select, $order_by )
-		);
-	}
+                , $post_id, $limit, $offset, $select, $order_by )
+        );
+    }
 
 
 }

Please login to merge, or discard this patch.

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

src/includes/class-wordlift-relation-service.php 2 patches

Indentation +420 added lines, -420 removed lines patch added patch discarded remove patch

@@ -18,405 +18,405 @@  discard block
 block discarded – undo
  */
 class Wordlift_Relation_Service {
 
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * The relation table name in MySQL, set during instantiation.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var string $relation_table The relation table name.
-	 */
-	private $relation_table;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.3
-	 *
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private static $log;
-
-	/**
-	 * Create a {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since 3.15.0
-	 */
-	public function __construct() {
-
-		self::$log = Wordlift_Log_Service::get_logger( get_class() );
-
-		global $wpdb;
-
-		// The relations table.
-		$this->relation_table = "{$wpdb->prefix}wl_relation_instances";
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return \Wordlift_Relation_Service The {@link Wordlift_Relation_Service}
-	 *                                    singleton instance.
-	 * @since  3.15.0
-	 * @access public
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the articles referencing the specified entity {@link WP_Post}.
-	 *
-	 * @param int|array $object_id The entity {@link WP_Post}'s id.
-	 * @param string $fields The fields to return, 'ids' to only return ids or
-	 *                               '*' to return all fields, by default '*'.
-	 * @param null|string $predicate The predicate (who|what|...), by default all.
-	 * @param null|string $status The status, by default all.
-	 * @param array $excludes An array of ids to exclude from the results.
-	 * @param null|int $limit The maximum number of results, by default
-	 *                               no limit.
-	 * @param null|array $include The {@link WP_Post}s' ids to include.
-	 *
-	 * @param null | string $order_by
-	 *
-	 * @param array $post_types
-	 *
-	 * @return array|object|null Database query results
-	 * @since 3.15.0
-	 */
-	public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array() ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
-
-		$objects = $this->article_id_to_entity_id( $object_id );
-
-		// If there are no related objects, return an empty array.
-		if ( empty( $objects ) ) {
-			self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
-
-			return array();
-		}
-
-		self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
-
-		$sql =
-			"
+    /**
+     * The singleton instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * The relation table name in MySQL, set during instantiation.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var string $relation_table The relation table name.
+     */
+    private $relation_table;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.3
+     *
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private static $log;
+
+    /**
+     * Create a {@link Wordlift_Relation_Service} instance.
+     *
+     * @since 3.15.0
+     */
+    public function __construct() {
+
+        self::$log = Wordlift_Log_Service::get_logger( get_class() );
+
+        global $wpdb;
+
+        // The relations table.
+        $this->relation_table = "{$wpdb->prefix}wl_relation_instances";
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return \Wordlift_Relation_Service The {@link Wordlift_Relation_Service}
+     *                                    singleton instance.
+     * @since  3.15.0
+     * @access public
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the articles referencing the specified entity {@link WP_Post}.
+     *
+     * @param int|array $object_id The entity {@link WP_Post}'s id.
+     * @param string $fields The fields to return, 'ids' to only return ids or
+     *                               '*' to return all fields, by default '*'.
+     * @param null|string $predicate The predicate (who|what|...), by default all.
+     * @param null|string $status The status, by default all.
+     * @param array $excludes An array of ids to exclude from the results.
+     * @param null|int $limit The maximum number of results, by default
+     *                               no limit.
+     * @param null|array $include The {@link WP_Post}s' ids to include.
+     *
+     * @param null | string $order_by
+     *
+     * @param array $post_types
+     *
+     * @return array|object|null Database query results
+     * @since 3.15.0
+     */
+    public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array() ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
+
+        $objects = $this->article_id_to_entity_id( $object_id );
+
+        // If there are no related objects, return an empty array.
+        if ( empty( $objects ) ) {
+            self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
+
+            return array();
+        }
+
+        self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
+
+        $sql =
+            "
 			SELECT DISTINCT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.subject_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_article()
-			. self::where_object_id( $objects )
-			// Since `object_id` can be an article ID we need to exclude it from
-			// the results.
-			. self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
-			. self::and_article_in( $include )
-			. self::and_post_type_in( $post_types )
-			. self::and_predicate( $predicate )
-			. self::order_by( $order_by )
-			. self::limit( $limit );
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * The `post_type IN` clause.
-	 *
-	 * @param array $post_types If the post type is not provided then the valid
-	 * entity post types are used.
-	 *
-	 * @return string The `post_type IN` clause.
-	 * @since 3.15.3
-	 */
-	private static function and_post_type_in( $post_types = array() ) {
-
-		if ( $post_types === array() ) {
-			$post_types = Wordlift_Entity_Service::valid_entity_post_types();
-		}
-
-		return " AND p.post_type IN ( '"
-		       . implode(
-			       "','",
-			       array_map( 'esc_sql', $post_types )
-		       )
-		       . "' )";
-	}
-
-	/**
-	 * Add the limit clause if specified.
-	 *
-	 * @param null|int $limit The maximum number of results.
-	 *
-	 * @return string The limit clause (empty if no limit has been specified).
-	 * @since 3.15.0
-	 *
-	 */
-	private static function limit( $limit = null ) {
-
-		if ( null === $limit ) {
-			return '';
-		}
-
-		return "LIMIT $limit";
-	}
-
-	/**
-	 * @param $order_by string | null
-	 *
-	 * @return string
-	 */
-	private static function order_by( $order_by ) {
-		if ( ! $order_by ) {
-			return '';
-		}
-		$order_by         = (string) $order_by;
-		$order_by_clauses = array( 'DESC', 'ASC' );
-
-		if ( in_array( $order_by, $order_by_clauses, true ) ) {
-			return " ORDER BY p.post_modified ${order_by} ";
-		} else {
-			return ' ORDER BY p.post_modified DESC ';
-		}
-	}
-
-	/**
-	 * Map the provided ids into entities (i.e. return the id if it's an entity
-	 * or get the entities if it's a post).
-	 *
-	 * @param int|array $object_id An array of posts/entities' ids.
-	 *
-	 * @return array An array of entities' ids.
-	 * @since 3.15.0
-	 *
-	 */
-	private function article_id_to_entity_id( $object_id ) {
-
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		$relation_service = $this;
-
-		return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
-			if ( $entity_service->is_entity( $item ) ) {
-				return array_merge( $carry, (array) $item );
-			}
-
-			return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
-		}, array() );
-
-	}
-
-	/**
-	 * Add the WHERE clause.
-	 *
-	 * @param int|array $object_id An array of {@link WP_Post}s' ids.
-	 *
-	 * @return string The WHERE clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function where_object_id( $object_id ) {
-
-		if ( empty( $object_id ) ) {
-			// self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
-
-			return ' WHERE 1 = 1';
-		}
-
-		return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
-	}
-
-	/**
-	 * Add the exclude clause.
-	 *
-	 * @param int|array $exclude An array of {@link WP_Post}s' ids to exclude.
-	 *
-	 * @return string The exclude clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function and_article_not_in( $exclude ) {
-
-		return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
-	}
-
-	/**
-	 * Add the include clause.
-	 *
-	 * @param null|int|array $include An array of {@link WP_Post}s' ids.
-	 *
-	 * @return string An empty string if $include is null otherwise the include
-	 *                clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function and_article_in( $include = null ) {
-
-		if ( null === $include ) {
-			return '';
-		}
-
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
-	}
-
-	/**
-	 * Get the entities' {@link WP_Post}s' ids referencing the specified {@link WP_Post}.
-	 *
-	 * @param int $object_id The object {@link WP_Post}'s id.
-	 * @param string $fields The fields to return, 'ids' to only return ids or
-	 *                               '*' to return all fields, by default '*'.
-	 * @param null|string $status The status, by default all.
-	 *
-	 * @return array|object|null Database query results
-	 * @since 3.15.0
-	 *
-	 */
-	public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$sql = $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_article()
+            . self::where_object_id( $objects )
+            // Since `object_id` can be an article ID we need to exclude it from
+            // the results.
+            . self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
+            . self::and_article_in( $include )
+            . self::and_post_type_in( $post_types )
+            . self::and_predicate( $predicate )
+            . self::order_by( $order_by )
+            . self::limit( $limit );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * The `post_type IN` clause.
+     *
+     * @param array $post_types If the post type is not provided then the valid
+     * entity post types are used.
+     *
+     * @return string The `post_type IN` clause.
+     * @since 3.15.3
+     */
+    private static function and_post_type_in( $post_types = array() ) {
+
+        if ( $post_types === array() ) {
+            $post_types = Wordlift_Entity_Service::valid_entity_post_types();
+        }
+
+        return " AND p.post_type IN ( '"
+                . implode(
+                    "','",
+                    array_map( 'esc_sql', $post_types )
+                )
+                . "' )";
+    }
+
+    /**
+     * Add the limit clause if specified.
+     *
+     * @param null|int $limit The maximum number of results.
+     *
+     * @return string The limit clause (empty if no limit has been specified).
+     * @since 3.15.0
+     *
+     */
+    private static function limit( $limit = null ) {
+
+        if ( null === $limit ) {
+            return '';
+        }
+
+        return "LIMIT $limit";
+    }
+
+    /**
+     * @param $order_by string | null
+     *
+     * @return string
+     */
+    private static function order_by( $order_by ) {
+        if ( ! $order_by ) {
+            return '';
+        }
+        $order_by         = (string) $order_by;
+        $order_by_clauses = array( 'DESC', 'ASC' );
+
+        if ( in_array( $order_by, $order_by_clauses, true ) ) {
+            return " ORDER BY p.post_modified ${order_by} ";
+        } else {
+            return ' ORDER BY p.post_modified DESC ';
+        }
+    }
+
+    /**
+     * Map the provided ids into entities (i.e. return the id if it's an entity
+     * or get the entities if it's a post).
+     *
+     * @param int|array $object_id An array of posts/entities' ids.
+     *
+     * @return array An array of entities' ids.
+     * @since 3.15.0
+     *
+     */
+    private function article_id_to_entity_id( $object_id ) {
+
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        $relation_service = $this;
+
+        return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
+            if ( $entity_service->is_entity( $item ) ) {
+                return array_merge( $carry, (array) $item );
+            }
+
+            return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
+        }, array() );
+
+    }
+
+    /**
+     * Add the WHERE clause.
+     *
+     * @param int|array $object_id An array of {@link WP_Post}s' ids.
+     *
+     * @return string The WHERE clause.
+     * @since 3.15.0
+     *
+     */
+    private static function where_object_id( $object_id ) {
+
+        if ( empty( $object_id ) ) {
+            // self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
+
+            return ' WHERE 1 = 1';
+        }
+
+        return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
+    }
+
+    /**
+     * Add the exclude clause.
+     *
+     * @param int|array $exclude An array of {@link WP_Post}s' ids to exclude.
+     *
+     * @return string The exclude clause.
+     * @since 3.15.0
+     *
+     */
+    private static function and_article_not_in( $exclude ) {
+
+        return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
+    }
+
+    /**
+     * Add the include clause.
+     *
+     * @param null|int|array $include An array of {@link WP_Post}s' ids.
+     *
+     * @return string An empty string if $include is null otherwise the include
+     *                clause.
+     * @since 3.15.0
+     *
+     */
+    private static function and_article_in( $include = null ) {
+
+        if ( null === $include ) {
+            return '';
+        }
+
+        return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
+    }
+
+    /**
+     * Get the entities' {@link WP_Post}s' ids referencing the specified {@link WP_Post}.
+     *
+     * @param int $object_id The object {@link WP_Post}'s id.
+     * @param string $fields The fields to return, 'ids' to only return ids or
+     *                               '*' to return all fields, by default '*'.
+     * @param null|string $status The status, by default all.
+     *
+     * @return array|object|null Database query results
+     * @since 3.15.0
+     *
+     */
+    public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $sql = $wpdb->prepare(
+            "
 			SELECT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.subject_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_not_article()
-			. " WHERE r.object_id = %d "
-			. self::and_post_type_in()
-			,
-			$object_id
-		);
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Get the entities referenced by the specified {@link WP_Post}.
-	 *
-	 * @param int $subject_id The {@link WP_Post}'s id.
-	 * @param string $fields The fields to return, 'ids' to only return ids or
-	 *                                '*' to return all fields, by default '*'.
-	 * @param null|string $predicate The predicate (who|what|...), by default all.
-	 * @param null|string $status The status, by default all.
-	 *
-	 * @return array|object|null Database query results
-	 * @since 3.15.0
-	 *
-	 */
-	public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$sql = $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_not_article()
+            . " WHERE r.object_id = %d "
+            . self::and_post_type_in()
+            ,
+            $object_id
+        );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Get the entities referenced by the specified {@link WP_Post}.
+     *
+     * @param int $subject_id The {@link WP_Post}'s id.
+     * @param string $fields The fields to return, 'ids' to only return ids or
+     *                                '*' to return all fields, by default '*'.
+     * @param null|string $predicate The predicate (who|what|...), by default all.
+     * @param null|string $status The status, by default all.
+     *
+     * @return array|object|null Database query results
+     * @since 3.15.0
+     *
+     */
+    public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $sql = $wpdb->prepare(
+            "
 			SELECT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.object_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_not_article()
-			. " WHERE r.subject_id = %d "
-			. self::and_post_type_in()
-			. self::and_predicate( $predicate )
-			,
-			$subject_id
-		);
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Add the `post_status` clause.
-	 *
-	 * @param null|string|array $status The status values.
-	 *
-	 * @return string An empty string if $status is null, otherwise the status clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function and_status( $status = null ) {
-
-		if ( null === $status ) {
-			return '';
-		}
-
-		return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
-	}
-
-	/**
-	 * Add the `predicate` clause.
-	 *
-	 * @param null|string|array $predicate An array of predicates.
-	 *
-	 * @return string An empty string if $predicate is null otherwise the predicate
-	 *                clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function and_predicate( $predicate = null ) {
-
-		if ( null === $predicate ) {
-			return '';
-		}
-
-		return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
-	}
-
-	/**
-	 * The select fields.
-	 *
-	 * @param string $fields Either 'ids' or '*', by default '*'.
-	 *
-	 * @return string The `id` field if `ids` otherwise `*`.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function fields( $fields = '*' ) {
-
-		// The output fields.
-		return 'ids' === $fields ? 'id' : '*';
-	}
-
-	/**
-	 * The inner join clause for articles.
-	 *
-	 * @return string The articles inner join clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function inner_join_is_article() {
-		global $wpdb;
-
-		return $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_not_article()
+            . " WHERE r.subject_id = %d "
+            . self::and_post_type_in()
+            . self::and_predicate( $predicate )
+            ,
+            $subject_id
+        );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Add the `post_status` clause.
+     *
+     * @param null|string|array $status The status values.
+     *
+     * @return string An empty string if $status is null, otherwise the status clause.
+     * @since 3.15.0
+     *
+     */
+    private static function and_status( $status = null ) {
+
+        if ( null === $status ) {
+            return '';
+        }
+
+        return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
+    }
+
+    /**
+     * Add the `predicate` clause.
+     *
+     * @param null|string|array $predicate An array of predicates.
+     *
+     * @return string An empty string if $predicate is null otherwise the predicate
+     *                clause.
+     * @since 3.15.0
+     *
+     */
+    private static function and_predicate( $predicate = null ) {
+
+        if ( null === $predicate ) {
+            return '';
+        }
+
+        return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
+    }
+
+    /**
+     * The select fields.
+     *
+     * @param string $fields Either 'ids' or '*', by default '*'.
+     *
+     * @return string The `id` field if `ids` otherwise `*`.
+     * @since 3.15.0
+     *
+     */
+    private static function fields( $fields = '*' ) {
+
+        // The output fields.
+        return 'ids' === $fields ? 'id' : '*';
+    }
+
+    /**
+     * The inner join clause for articles.
+     *
+     * @return string The articles inner join clause.
+     * @since 3.15.0
+     *
+     */
+    private static function inner_join_is_article() {
+        global $wpdb;
+
+        return $wpdb->prepare(
+            "
 			INNER JOIN $wpdb->term_relationships tr
 			 ON p.id = tr.object_id
 			INNER JOIN $wpdb->term_taxonomy tt
@@ -426,23 +426,23 @@  discard block
 block discarded – undo
 			 ON t.term_id = tt.term_id
 			  AND t.slug = %s
 			",
-			'wl_entity_type',
-			'article'
-		);
-	}
-
-	/**
-	 * The inner join clause for non-articles.
-	 *
-	 * @return string The non-articles inner join clause.
-	 * @since 3.15.0
-	 *
-	 */
-	private static function inner_join_is_not_article() {
-		global $wpdb;
-
-		return $wpdb->prepare(
-			"
+            'wl_entity_type',
+            'article'
+        );
+    }
+
+    /**
+     * The inner join clause for non-articles.
+     *
+     * @return string The non-articles inner join clause.
+     * @since 3.15.0
+     *
+     */
+    private static function inner_join_is_not_article() {
+        global $wpdb;
+
+        return $wpdb->prepare(
+            "
 			INNER JOIN $wpdb->term_relationships tr
 			 ON p.id = tr.object_id
 			INNER JOIN $wpdb->term_taxonomy tt
@@ -452,29 +452,29 @@  discard block
 block discarded – undo
 			 ON t.term_id = tt.term_id
 			  AND NOT t.slug = %s
 			",
-			'wl_entity_type',
-			'article'
-		);
-	}
-
-	/**
-	 * Find all the subject IDs and their referenced/related object IDs. The
-	 * object IDs are returned as comma separated IDs in the `object_ids` key.
-	 *
-	 * @return mixed Database query results
-	 * @since 3.18.0
-	 */
-	public function find_all_grouped_by_subject_id() {
-		global $wpdb;
-
-		return $wpdb->get_results(
-			"
+            'wl_entity_type',
+            'article'
+        );
+    }
+
+    /**
+     * Find all the subject IDs and their referenced/related object IDs. The
+     * object IDs are returned as comma separated IDs in the `object_ids` key.
+     *
+     * @return mixed Database query results
+     * @since 3.18.0
+     */
+    public function find_all_grouped_by_subject_id() {
+        global $wpdb;
+
+        return $wpdb->get_results(
+            "
 			SELECT subject_id, GROUP_CONCAT( DISTINCT object_id ORDER BY object_id SEPARATOR ',' ) AS object_ids
 			FROM $this->relation_table
 			GROUP BY subject_id
 			"
-		);
+        );
 
-	}
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -52,7 +52,7 @@  discard block
 block discarded – undo
 	 */
 	public function __construct() {
 
-		self::$log = Wordlift_Log_Service::get_logger( get_class() );
+		self::$log = Wordlift_Log_Service::get_logger(get_class());
 
 		global $wpdb;
 
@@ -96,24 +96,24 @@  discard block
 block discarded – undo
 	 * @return array|object|null Database query results
 	 * @since 3.15.0
 	 */
-	public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array() ) {
+	public function get_article_subjects($object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array()) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
-		self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
+		self::$log->trace('Getting article subjects for object '.implode(', ', (array) $object_id).'...');
 
-		$objects = $this->article_id_to_entity_id( $object_id );
+		$objects = $this->article_id_to_entity_id($object_id);
 
 		// If there are no related objects, return an empty array.
-		if ( empty( $objects ) ) {
-			self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
+		if (empty($objects)) {
+			self::$log->debug('No entities found for object '.implode(', ', (array) $object_id).'.');
 
 			return array();
 		}
 
-		self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
+		self::$log->debug(count($objects).' entity id(s) found for object '.implode(', ', (array) $object_id).'.');
 
 		$sql =
 			"
@@ -123,19 +123,19 @@  discard block
 block discarded – undo
 				ON p.id = r.subject_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_article()
-			. self::where_object_id( $objects )
+			. self::where_object_id($objects)
 			// Since `object_id` can be an article ID we need to exclude it from
 			// the results.
-			. self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
-			. self::and_article_in( $include )
-			. self::and_post_type_in( $post_types )
-			. self::and_predicate( $predicate )
-			. self::order_by( $order_by )
-			. self::limit( $limit );
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+			. self::and_article_not_in(array_merge($excludes, (array) $object_id))
+			. self::and_article_in($include)
+			. self::and_post_type_in($post_types)
+			. self::and_predicate($predicate)
+			. self::order_by($order_by)
+			. self::limit($limit);
+
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -147,16 +147,16 @@  discard block
 block discarded – undo
 	 * @return string The `post_type IN` clause.
 	 * @since 3.15.3
 	 */
-	private static function and_post_type_in( $post_types = array() ) {
+	private static function and_post_type_in($post_types = array()) {
 
-		if ( $post_types === array() ) {
+		if ($post_types === array()) {
 			$post_types = Wordlift_Entity_Service::valid_entity_post_types();
 		}
 
 		return " AND p.post_type IN ( '"
 		       . implode(
 			       "','",
-			       array_map( 'esc_sql', $post_types )
+			       array_map('esc_sql', $post_types)
 		       )
 		       . "' )";
 	}
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function limit( $limit = null ) {
+	private static function limit($limit = null) {
 
-		if ( null === $limit ) {
+		if (null === $limit) {
 			return '';
 		}
 
@@ -184,14 +184,14 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	private static function order_by( $order_by ) {
-		if ( ! $order_by ) {
+	private static function order_by($order_by) {
+		if ( ! $order_by) {
 			return '';
 		}
 		$order_by         = (string) $order_by;
-		$order_by_clauses = array( 'DESC', 'ASC' );
+		$order_by_clauses = array('DESC', 'ASC');
 
-		if ( in_array( $order_by, $order_by_clauses, true ) ) {
+		if (in_array($order_by, $order_by_clauses, true)) {
 			return " ORDER BY p.post_modified ${order_by} ";
 		} else {
 			return ' ORDER BY p.post_modified DESC ';
@@ -208,19 +208,19 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private function article_id_to_entity_id( $object_id ) {
+	private function article_id_to_entity_id($object_id) {
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
 		$relation_service = $this;
 
-		return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
-			if ( $entity_service->is_entity( $item ) ) {
-				return array_merge( $carry, (array) $item );
+		return array_reduce((array) $object_id, function($carry, $item) use ($entity_service, $relation_service) {
+			if ($entity_service->is_entity($item)) {
+				return array_merge($carry, (array) $item);
 			}
 
-			return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
-		}, array() );
+			return array_merge($carry, $relation_service->get_objects($item, 'ids'));
+		}, array());
 
 	}
 
@@ -233,15 +233,15 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function where_object_id( $object_id ) {
+	private static function where_object_id($object_id) {
 
-		if ( empty( $object_id ) ) {
+		if (empty($object_id)) {
 			// self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
 
 			return ' WHERE 1 = 1';
 		}
 
-		return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
+		return ' WHERE r.object_id IN ( '.implode(',', wp_parse_id_list((array) $object_id)).' )';
 	}
 
 	/**
@@ -253,9 +253,9 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function and_article_not_in( $exclude ) {
+	private static function and_article_not_in($exclude) {
 
-		return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
+		return ' AND NOT p.ID IN ( '.implode(',', wp_parse_id_list((array) $exclude)).' )';
 	}
 
 	/**
@@ -268,13 +268,13 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function and_article_in( $include = null ) {
+	private static function and_article_in($include = null) {
 
-		if ( null === $include ) {
+		if (null === $include) {
 			return '';
 		}
 
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
+		return ' AND p.ID IN ( '.implode(',', wp_parse_id_list((array) $include)).' )';
 	}
 
 	/**
@@ -289,11 +289,11 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
+	public function get_non_article_subjects($object_id, $fields = '*', $status = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
 		$sql = $wpdb->prepare(
 			"
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 				ON p.id = r.subject_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_not_article()
 			. " WHERE r.object_id = %d "
 			. self::and_post_type_in()
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
 			$object_id
 		);
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -327,11 +327,11 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
+	public function get_objects($subject_id, $fields = '*', $predicate = null, $status = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
 		$sql = $wpdb->prepare(
 			"
@@ -341,16 +341,16 @@  discard block
 block discarded – undo
 				ON p.id = r.object_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_not_article()
 			. " WHERE r.subject_id = %d "
 			. self::and_post_type_in()
-			. self::and_predicate( $predicate )
+			. self::and_predicate($predicate)
 			,
 			$subject_id
 		);
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -362,13 +362,13 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function and_status( $status = null ) {
+	private static function and_status($status = null) {
 
-		if ( null === $status ) {
+		if (null === $status) {
 			return '';
 		}
 
-		return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
+		return " AND p.post_status IN ('".implode("', '", array_map('esc_sql', (array) $status))."')";
 	}
 
 	/**
@@ -381,13 +381,13 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function and_predicate( $predicate = null ) {
+	private static function and_predicate($predicate = null) {
 
-		if ( null === $predicate ) {
+		if (null === $predicate) {
 			return '';
 		}
 
-		return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
+		return " AND r.predicate IN ('".implode("', '", array_map('esc_sql', (array) $predicate))."')";
 	}
 
 	/**
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
 	 * @since 3.15.0
 	 *
 	 */
-	private static function fields( $fields = '*' ) {
+	private static function fields($fields = '*') {
 
 		// The output fields.
 		return 'ids' === $fields ? 'id' : '*';

Please login to merge, or discard this patch.

		@@ -315,7 +315,7 @@
		block discarded – undo
315	315
316	316	/**
317	317	* @param $post
318		- * @param $delimiter
	318	+ * @param string $delimiter
319	319	* @param $limit
320	320	*
321	321	* @param $post_types

		@@ -17,117 +17,117 @@ discard block
		block discarded – undo
17	17	*/
18	18	class Wordlift_Faceted_Search_Shortcode extends Wordlift_Shortcode {
19	19
20		- /**
21		- * {@inheritdoc}
22		- */
23		- const SHORTCODE = 'wl_faceted_search';
24		-
25		- public function __construct() {
26		- parent::__construct();
27		- $this->register_block_type();
28		- }
29		-
30		- /**
31		- * {@inheritdoc}
32		- */
33		- public function render( $atts ) {
34		-
35		- return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
36		- : $this->web_shortcode( $atts );
37		- }
38		-
39		- private function register_block_type() {
40		-
41		- $scope = $this;
42		-
43		- add_action( 'init', function () use ( $scope ) {
44		- if ( ! function_exists( 'register_block_type' ) ) {
45		- // Gutenberg is not active.
46		- return;
47		- }
48		-
49		- register_block_type( 'wordlift/faceted-search', array(
50		- 'editor_script' => 'wl-block-editor',
51		- 'render_callback' => function ( $attributes ) use ( $scope ) {
52		- $attr_code = '';
53		- foreach ( $attributes as $key => $value ) {
54		- $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
55		- }
56		-
57		- return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
58		- },
59		-
60		- 'attributes' => $this->get_block_attributes(),
61		- ) );
62		- } );
63		- }
64		-
65		- /**
66		- * Shared function used by web_shortcode and amp_shortcode
67		- * Bootstrap logic for attributes extraction and boolean filtering
68		- *
69		- * @param array $atts Shortcode attributes.
70		- *
71		- * @return array $shortcode_atts
72		- * @since 3.20.0
73		- *
74		- */
75		- private function make_shortcode_atts( $atts ) {
76		-
77		- // Extract attributes and set default values.
78		- $shortcode_atts = shortcode_atts( array(
79		- 'title' => __( 'Related articles', 'wordlift' ),
80		- 'limit' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
81		- 'post_id' => '',
82		- 'template_id' => '',
83		- 'uniqid' => uniqid( 'wl-faceted-widget-' ),
84		- 'post_types' => '',
85		- ), $atts );
86		-
87		- return $shortcode_atts;
88		- }
89		-
90		- /**
91		- * Function in charge of diplaying the [wl-faceted-search] in web mode.
92		- *
93		- * @param array $atts Shortcode attributes.
94		- *
95		- * @return string Shortcode HTML for web
96		- * @since 3.20.0
97		- *
98		- */
99		- private function web_shortcode( $atts ) {
100		-
101		- // attributes extraction and boolean filtering
102		- $shortcode_atts = $this->make_shortcode_atts( $atts );
103		-
104		- // avoid building the widget when no post_id is specified and there is a list of posts.
105		- if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
106		- return;
107		- }
108		-
109		- $post = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
110		- $title = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
111		- $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
112		- $limit = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
113		- $faceted_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
114		-
115		- $permalink_structure = get_option( 'permalink_structure' );
116		- $delimiter = empty( $permalink_structure ) ? '&' : '?';
117		- $rest_url = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
118		- $rest_url = esc_attr( $rest_url );
119		-
120		-
121		- // avoid building the widget when no valid $rest_url
122		- if ( ! $rest_url ) {
123		- return;
124		- }
125		-
126		- wp_enqueue_script( 'wordlift-cloud' );
127		- $json_faceted_id = wp_json_encode( $faceted_id );
128		- $template_url = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
129		-
130		- return <<<HTML
	20	+ /**
	21	+ * {@inheritdoc}
	22	+ */
	23	+ const SHORTCODE = 'wl_faceted_search';
	24	+
	25	+ public function __construct() {
	26	+ parent::__construct();
	27	+ $this->register_block_type();
	28	+ }
	29	+
	30	+ /**
	31	+ * {@inheritdoc}
	32	+ */
	33	+ public function render( $atts ) {
	34	+
	35	+ return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
	36	+ : $this->web_shortcode( $atts );
	37	+ }
	38	+
	39	+ private function register_block_type() {
	40	+
	41	+ $scope = $this;
	42	+
	43	+ add_action( 'init', function () use ( $scope ) {
	44	+ if ( ! function_exists( 'register_block_type' ) ) {
	45	+ // Gutenberg is not active.
	46	+ return;
	47	+ }
	48	+
	49	+ register_block_type( 'wordlift/faceted-search', array(
	50	+ 'editor_script' => 'wl-block-editor',
	51	+ 'render_callback' => function ( $attributes ) use ( $scope ) {
	52	+ $attr_code = '';
	53	+ foreach ( $attributes as $key => $value ) {
	54	+ $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
	55	+ }
	56	+
	57	+ return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
	58	+ },
	59	+
	60	+ 'attributes' => $this->get_block_attributes(),
	61	+ ) );
	62	+ } );
	63	+ }
	64	+
	65	+ /**
	66	+ * Shared function used by web_shortcode and amp_shortcode
	67	+ * Bootstrap logic for attributes extraction and boolean filtering
	68	+ *
	69	+ * @param array $atts Shortcode attributes.
	70	+ *
	71	+ * @return array $shortcode_atts
	72	+ * @since 3.20.0
	73	+ *
	74	+ */
	75	+ private function make_shortcode_atts( $atts ) {
	76	+
	77	+ // Extract attributes and set default values.
	78	+ $shortcode_atts = shortcode_atts( array(
	79	+ 'title' => __( 'Related articles', 'wordlift' ),
	80	+ 'limit' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
	81	+ 'post_id' => '',
	82	+ 'template_id' => '',
	83	+ 'uniqid' => uniqid( 'wl-faceted-widget-' ),
	84	+ 'post_types' => '',
	85	+ ), $atts );
	86	+
	87	+ return $shortcode_atts;
	88	+ }
	89	+
	90	+ /**
	91	+ * Function in charge of diplaying the [wl-faceted-search] in web mode.
	92	+ *
	93	+ * @param array $atts Shortcode attributes.
	94	+ *
	95	+ * @return string Shortcode HTML for web
	96	+ * @since 3.20.0
	97	+ *
	98	+ */
	99	+ private function web_shortcode( $atts ) {
	100	+
	101	+ // attributes extraction and boolean filtering
	102	+ $shortcode_atts = $this->make_shortcode_atts( $atts );
	103	+
	104	+ // avoid building the widget when no post_id is specified and there is a list of posts.
	105	+ if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
	106	+ return;
	107	+ }
	108	+
	109	+ $post = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
	110	+ $title = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
	111	+ $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
	112	+ $limit = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
	113	+ $faceted_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
	114	+
	115	+ $permalink_structure = get_option( 'permalink_structure' );
	116	+ $delimiter = empty( $permalink_structure ) ? '&' : '?';
	117	+ $rest_url = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
	118	+ $rest_url = esc_attr( $rest_url );
	119	+
	120	+
	121	+ // avoid building the widget when no valid $rest_url
	122	+ if ( ! $rest_url ) {
	123	+ return;
	124	+ }
	125	+
	126	+ wp_enqueue_script( 'wordlift-cloud' );
	127	+ $json_faceted_id = wp_json_encode( $faceted_id );
	128	+ $template_url = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
	129	+
	130	+ return <<<HTML
131	131	<!-- Faceted {$faceted_id} -->
132	132	<script type="application/javascript">
133	133	window.wlFaceteds = window.wlFaceteds \|\| []; wlFaceteds.push({$json_faceted_id});
		@@ -140,58 +140,58 @@ discard block
		block discarded – undo
140	140	data-template-url="{$template_url}"></div>
141	141	<!-- /Faceted {$faceted_id} -->
142	142	HTML;
143		- }
144		-
145		- /**
146		- * Function in charge of diplaying the [wl-faceted-search] in amp mode.
147		- *
148		- * @param array $atts Shortcode attributes.
149		- *
150		- * @return string Shortcode HTML for amp
151		- * @since 3.20.0
152		- *
153		- */
154		- private function amp_shortcode( $atts ) {
155		-
156		- // attributes extraction and boolean filtering
157		- $shortcode_atts = $this->make_shortcode_atts( $atts );
158		-
159		- // avoid building the widget when no post_id is specified and there is a list of posts.
160		- if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
161		- return;
162		- }
163		-
164		- $post = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
165		- $title = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
166		- $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
167		- $limit = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
168		- $faceted_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
169		-
170		- $permalink_structure = get_option( 'permalink_structure' );
171		- $delimiter = empty( $permalink_structure ) ? '&' : '?';
172		- $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
173		- 'amp',
174		- 'post_id' => $post->ID,
175		- 'limit' => $limit
176		- ) ) ) : false;
177		-
178		- $rest_url = $post ? rest_url( sprintf( "wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit ) ) : false;
179		-
180		- // avoid building the widget when no valid $rest_url
181		- if ( ! $rest_url ) {
182		- return;
183		- }
184		-
185		- // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
186		- // This is a hackish way, but this works for http and https URLs
187		- $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
188		-
189		- if ( empty( $template_id ) ) {
190		- $template_id = "template-" . $faceted_id;
191		- wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
192		- }
193		-
194		- return <<<HTML
	143	+ }
	144	+
	145	+ /**
	146	+ * Function in charge of diplaying the [wl-faceted-search] in amp mode.
	147	+ *
	148	+ * @param array $atts Shortcode attributes.
	149	+ *
	150	+ * @return string Shortcode HTML for amp
	151	+ * @since 3.20.0
	152	+ *
	153	+ */
	154	+ private function amp_shortcode( $atts ) {
	155	+
	156	+ // attributes extraction and boolean filtering
	157	+ $shortcode_atts = $this->make_shortcode_atts( $atts );
	158	+
	159	+ // avoid building the widget when no post_id is specified and there is a list of posts.
	160	+ if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
	161	+ return;
	162	+ }
	163	+
	164	+ $post = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
	165	+ $title = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
	166	+ $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
	167	+ $limit = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
	168	+ $faceted_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
	169	+
	170	+ $permalink_structure = get_option( 'permalink_structure' );
	171	+ $delimiter = empty( $permalink_structure ) ? '&' : '?';
	172	+ $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
	173	+ 'amp',
	174	+ 'post_id' => $post->ID,
	175	+ 'limit' => $limit
	176	+ ) ) ) : false;
	177	+
	178	+ $rest_url = $post ? rest_url( sprintf( "wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit ) ) : false;
	179	+
	180	+ // avoid building the widget when no valid $rest_url
	181	+ if ( ! $rest_url ) {
	182	+ return;
	183	+ }
	184	+
	185	+ // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
	186	+ // This is a hackish way, but this works for http and https URLs
	187	+ $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
	188	+
	189	+ if ( empty( $template_id ) ) {
	190	+ $template_id = "template-" . $faceted_id;
	191	+ wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
	192	+ }
	193	+
	194	+ return <<<HTML
195	195	<div id="{$faceted_id}" class="wl-amp-faceted">
196	196	<h2 class="wl-headline">{$title}</h2>
197	197	<amp-state id="referencedPosts">
		@@ -274,62 +274,62 @@ discard block
		block discarded – undo
274	274	</section>
275	275	</div>
276	276	HTML;
277		- }
278		-
279		- public function get_block_attributes() {
280		- return array(
281		- 'title' => array(
282		- 'type' => 'string',
283		- 'default' => __( 'Related articles', 'wordlift' ),
284		- ),
285		- 'template_id' => array(
286		- 'type' => 'string',
287		- 'default' => '',
288		- ),
289		- 'post_id' => array(
290		- 'type' => 'number',
291		- 'default' => '',
292		- ),
293		- 'uniqid' => array(
294		- 'type' => 'string',
295		- 'default' => '',
296		- ),
297		- 'limit' => array(
298		- 'type' => 'number',
299		- 'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
300		- ),
301		- 'preview' => array(
302		- 'type' => 'boolean',
303		- 'default' => false,
304		- ),
305		- 'preview_src' => array(
306		- 'type' => 'string',
307		- 'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
308		- ),
309		- 'post_types' => array(
310		- 'type' => 'string',
311		- 'default' => '',
312		- )
313		- );
314		- }
315		-
316		- /**
317		- * @param $post
318		- * @param $delimiter
319		- * @param $limit
320		- *
321		- * @param $post_types
322		- *
323		- * @return bool\|string
324		- */
325		- public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
326		- $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
327		- 'post_id' => $post->ID,
328		- 'limit' => $limit,
329		- 'post_types' => $post_types
330		- ) ) ) : false;
331		-
332		- return $rest_url;
333		- }
	277	+ }
	278	+
	279	+ public function get_block_attributes() {
	280	+ return array(
	281	+ 'title' => array(
	282	+ 'type' => 'string',
	283	+ 'default' => __( 'Related articles', 'wordlift' ),
	284	+ ),
	285	+ 'template_id' => array(
	286	+ 'type' => 'string',
	287	+ 'default' => '',
	288	+ ),
	289	+ 'post_id' => array(
	290	+ 'type' => 'number',
	291	+ 'default' => '',
	292	+ ),
	293	+ 'uniqid' => array(
	294	+ 'type' => 'string',
	295	+ 'default' => '',
	296	+ ),
	297	+ 'limit' => array(
	298	+ 'type' => 'number',
	299	+ 'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
	300	+ ),
	301	+ 'preview' => array(
	302	+ 'type' => 'boolean',
	303	+ 'default' => false,
	304	+ ),
	305	+ 'preview_src' => array(
	306	+ 'type' => 'string',
	307	+ 'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
	308	+ ),
	309	+ 'post_types' => array(
	310	+ 'type' => 'string',
	311	+ 'default' => '',
	312	+ )
	313	+ );
	314	+ }
	315	+
	316	+ /**
	317	+ * @param $post
	318	+ * @param $delimiter
	319	+ * @param $limit
	320	+ *
	321	+ * @param $post_types
	322	+ *
	323	+ * @return bool\|string
	324	+ */
	325	+ public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
	326	+ $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
	327	+ 'post_id' => $post->ID,
	328	+ 'limit' => $limit,
	329	+ 'post_types' => $post_types
	330	+ ) ) ) : false;
	331	+
	332	+ return $rest_url;
	333	+ }
334	334
335	335	}

		@@ -30,35 +30,35 @@ discard block
		block discarded – undo
30	30	/**
31	31	* {@inheritdoc}
32	32	*/
33		- public function render( $atts ) {
	33	+ public function render($atts) {
34	34
35		- return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
36		- : $this->web_shortcode( $atts );
	35	+ return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
	36	+ : $this->web_shortcode($atts);
37	37	}
38	38
39	39	private function register_block_type() {
40	40
41	41	$scope = $this;
42	42
43		- add_action( 'init', function () use ( $scope ) {
44		- if ( ! function_exists( 'register_block_type' ) ) {
	43	+ add_action('init', function() use ($scope) {
	44	+ if ( ! function_exists('register_block_type')) {
45	45	// Gutenberg is not active.
46	46	return;
47	47	}
48	48
49		- register_block_type( 'wordlift/faceted-search', array(
	49	+ register_block_type('wordlift/faceted-search', array(
50	50	'editor_script' => 'wl-block-editor',
51		- 'render_callback' => function ( $attributes ) use ( $scope ) {
	51	+ 'render_callback' => function($attributes) use ($scope) {
52	52	$attr_code = '';
53		- foreach ( $attributes as $key => $value ) {
54		- $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
	53	+ foreach ($attributes as $key => $value) {
	54	+ $attr_code .= $key.'="'.htmlentities($value).'" ';
55	55	}
56	56
57		- return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
	57	+ return '['.$scope::SHORTCODE.' '.$attr_code.']';
58	58	},
59	59
60	60	'attributes' => $this->get_block_attributes(),
61		- ) );
	61	+ ));
62	62	} );
63	63	}
64	64
		@@ -72,17 +72,17 @@ discard block
		block discarded – undo
72	72	* @since 3.20.0
73	73	*
74	74	*/
75		- private function make_shortcode_atts( $atts ) {
	75	+ private function make_shortcode_atts($atts) {
76	76
77	77	// Extract attributes and set default values.
78		- $shortcode_atts = shortcode_atts( array(
79		- 'title' => __( 'Related articles', 'wordlift' ),
80		- 'limit' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
	78	+ $shortcode_atts = shortcode_atts(array(
	79	+ 'title' => __('Related articles', 'wordlift'),
	80	+ 'limit' => apply_filters('wl_faceted_search_default_limit', 10),
81	81	'post_id' => '',
82	82	'template_id' => '',
83		- 'uniqid' => uniqid( 'wl-faceted-widget-' ),
	83	+ 'uniqid' => uniqid('wl-faceted-widget-'),
84	84	'post_types' => '',
85		- ), $atts );
	85	+ ), $atts);
86	86
87	87	return $shortcode_atts;
88	88	}
		@@ -96,36 +96,36 @@ discard block
		block discarded – undo
96	96	* @since 3.20.0
97	97	*
98	98	*/
99		- private function web_shortcode( $atts ) {
	99	+ private function web_shortcode($atts) {
100	100
101	101	// attributes extraction and boolean filtering
102		- $shortcode_atts = $this->make_shortcode_atts( $atts );
	102	+ $shortcode_atts = $this->make_shortcode_atts($atts);
103	103
104	104	// avoid building the widget when no post_id is specified and there is a list of posts.
105		- if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
	105	+ if (empty($shortcode_atts['post_id']) && ! is_singular()) {
106	106	return;
107	107	}
108	108
109		- $post = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
110		- $title = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
111		- $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
112		- $limit = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
113		- $faceted_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
	109	+ $post = ! empty($shortcode_atts['post_id']) ? get_post(intval(sanitize_text_field($shortcode_atts['post_id']))) : get_post();
	110	+ $title = esc_attr(sanitize_text_field($shortcode_atts['title']));
	111	+ $template_id = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
	112	+ $limit = esc_attr(sanitize_text_field($shortcode_atts['limit']));
	113	+ $faceted_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-faceted-widget-');
114	114
115		- $permalink_structure = get_option( 'permalink_structure' );
116		- $delimiter = empty( $permalink_structure ) ? '&' : '?';
117		- $rest_url = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
118		- $rest_url = esc_attr( $rest_url );
	115	+ $permalink_structure = get_option('permalink_structure');
	116	+ $delimiter = empty($permalink_structure) ? '&' : '?';
	117	+ $rest_url = $this->get_rest_url($post, $delimiter, $limit, $shortcode_atts['post_types']);
	118	+ $rest_url = esc_attr($rest_url);
119	119
120	120
121	121	// avoid building the widget when no valid $rest_url
122		- if ( ! $rest_url ) {
	122	+ if ( ! $rest_url) {
123	123	return;
124	124	}
125	125
126		- wp_enqueue_script( 'wordlift-cloud' );
127		- $json_faceted_id = wp_json_encode( $faceted_id );
128		- $template_url = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
	126	+ wp_enqueue_script('wordlift-cloud');
	127	+ $json_faceted_id = wp_json_encode($faceted_id);
	128	+ $template_url = get_rest_url(null, '/wordlift/v1/faceted-search/template');
129	129
130	130	return <<<HTML
131	131	<!-- Faceted {$faceted_id} -->
		@@ -151,44 +151,44 @@ discard block
		block discarded – undo
151	151	* @since 3.20.0
152	152	*
153	153	*/
154		- private function amp_shortcode( $atts ) {
	154	+ private function amp_shortcode($atts) {
155	155
156	156	// attributes extraction and boolean filtering
157		- $shortcode_atts = $this->make_shortcode_atts( $atts );
	157	+ $shortcode_atts = $this->make_shortcode_atts($atts);
158	158
159	159	// avoid building the widget when no post_id is specified and there is a list of posts.
160		- if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
	160	+ if (empty($shortcode_atts['post_id']) && ! is_singular()) {
161	161	return;
162	162	}
163	163
164		- $post = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
165		- $title = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
166		- $template_id = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
167		- $limit = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
168		- $faceted_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
	164	+ $post = ! empty($shortcode_atts['post_id']) ? get_post(intval(sanitize_text_field($shortcode_atts['post_id']))) : get_post();
	165	+ $title = esc_attr(sanitize_text_field($shortcode_atts['title']));
	166	+ $template_id = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
	167	+ $limit = esc_attr(sanitize_text_field($shortcode_atts['limit']));
	168	+ $faceted_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-faceted-widget-');
169	169
170		- $permalink_structure = get_option( 'permalink_structure' );
171		- $delimiter = empty( $permalink_structure ) ? '&' : '?';
172		- $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
	170	+ $permalink_structure = get_option('permalink_structure');
	171	+ $delimiter = empty($permalink_structure) ? '&' : '?';
	172	+ $rest_url = $post ? rest_url(WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faceted-search'.$delimiter.build_query(array(
173	173	'amp',
174	174	'post_id' => $post->ID,
175	175	'limit' => $limit
176		- ) ) ) : false;
	176	+ ))) : false;
177	177
178		- $rest_url = $post ? rest_url( sprintf( "wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit ) ) : false;
	178	+ $rest_url = $post ? rest_url(sprintf("wordlift/v1/faceted-search?amp&post_id=%s&limit=%s", $post->ID, $limit)) : false;
179	179
180	180	// avoid building the widget when no valid $rest_url
181		- if ( ! $rest_url ) {
	181	+ if ( ! $rest_url) {
182	182	return;
183	183	}
184	184
185	185	// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
186	186	// This is a hackish way, but this works for http and https URLs
187		- $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
	187	+ $rest_url = str_replace(array('http:', 'https:'), '', $rest_url);
188	188
189		- if ( empty( $template_id ) ) {
190		- $template_id = "template-" . $faceted_id;
191		- wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
	189	+ if (empty($template_id)) {
	190	+ $template_id = "template-".$faceted_id;
	191	+ wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(dirname(__FILE__)).'/css/wordlift-amp-custom.min.css');
192	192	}
193	193
194	194	return <<<HTML
		@@ -280,7 +280,7 @@ discard block
		block discarded – undo
280	280	return array(
281	281	'title' => array(
282	282	'type' => 'string',
283		- 'default' => __( 'Related articles', 'wordlift' ),
	283	+ 'default' => __('Related articles', 'wordlift'),
284	284	),
285	285	'template_id' => array(
286	286	'type' => 'string',
		@@ -296,7 +296,7 @@ discard block
		block discarded – undo
296	296	),
297	297	'limit' => array(
298	298	'type' => 'number',
299		- 'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
	299	+ 'default' => apply_filters('wl_faceted_search_default_limit', 10),
300	300	),
301	301	'preview' => array(
302	302	'type' => 'boolean',
		@@ -304,7 +304,7 @@ discard block
		block discarded – undo
304	304	),
305	305	'preview_src' => array(
306	306	'type' => 'string',
307		- 'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
	307	+ 'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/faceted-search.png',
308	308	),
309	309	'post_types' => array(
310	310	'type' => 'string',
		@@ -322,12 +322,12 @@ discard block
		block discarded – undo
322	322	*
323	323	* @return bool\|string
324	324	*/
325		- public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
326		- $rest_url = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query( array(
	325	+ public function get_rest_url($post, $delimiter, $limit, $post_types) {
	326	+ $rest_url = $post ? rest_url(WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faceted-search'.$delimiter.build_query(array(
327	327	'post_id' => $post->ID,
328	328	'limit' => $limit,
329	329	'post_types' => $post_types
330		- ) ) ) : false;
	330	+ ))) : false;
331	331
332	332	return $rest_url;
333	333	}

		@@ -8,7 +8,6 @@
		block discarded – undo
8	8	*/
9	9
10	10	use Wordlift\Cache\Ttl_Cache;
11		-use Wordlift\Widgets\Navigator\Filler_Posts;
12	11	use Wordlift\Widgets\Navigator\Filler_Posts\Filler_Posts_Util;
13	12	use Wordlift\Widgets\Navigator\Navigator_Data;
14	13

		@@ -21,25 +21,25 @@ discard block
		block discarded – undo
21	21
22	22	// Create the cache key.
23	23	$cache_key_params = $_REQUEST;
24		- unset( $cache_key_params['uniqid'] );
25		- $cache_key = array( 'request_params' => $cache_key_params );
	24	+ unset($cache_key_params['uniqid']);
	25	+ $cache_key = array('request_params' => $cache_key_params);
26	26
27	27	// Create the TTL cache and try to get the results.
28		- $cache = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
29		- $cache_results = $cache->get( $cache_key );
	28	+ $cache = new Ttl_Cache("navigator", 8 * 60 * 60); // 8 hours.
	29	+ $cache_results = $cache->get($cache_key);
30	30
31		- if ( isset( $cache_results ) ) {
32		- header( 'X-WordLift-Cache: HIT' );
	31	+ if (isset($cache_results)) {
	32	+ header('X-WordLift-Cache: HIT');
33	33
34	34	return $cache_results;
35	35	}
36	36
37		- header( 'X-WordLift-Cache: MISS' );
	37	+ header('X-WordLift-Cache: MISS');
38	38
39	39	$results = _wl_navigator_get_data();
40	40
41	41	// Put the result before sending the json to the client, since sending the json will terminate us.
42		- $cache->put( $cache_key, $results );
	42	+ $cache->put($cache_key, $results);
43	43
44	44	return $results;
45	45	}
		@@ -54,29 +54,29 @@ discard block
		block discarded – undo
54	54	* @since 3.22.6
55	55	*
56	56	*/
57		-function wl_network_navigator_wp_json( $request ) {
	57	+function wl_network_navigator_wp_json($request) {
58	58
59	59	// Create the cache key.
60	60	$cache_key_params = $_REQUEST;
61		- unset( $cache_key_params['uniqid'] );
62		- $cache_key = array( 'request_params' => $cache_key_params );
	61	+ unset($cache_key_params['uniqid']);
	62	+ $cache_key = array('request_params' => $cache_key_params);
63	63
64	64	// Create the TTL cache and try to get the results.
65		- $cache = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
66		- $cache_results = $cache->get( $cache_key );
	65	+ $cache = new Ttl_Cache("network-navigator", 8 * 60 * 60); // 8 hours.
	66	+ $cache_results = $cache->get($cache_key);
67	67
68		- if ( isset( $cache_results ) ) {
69		- header( 'X-WordLift-Cache: HIT' );
	68	+ if (isset($cache_results)) {
	69	+ header('X-WordLift-Cache: HIT');
70	70
71	71	return $cache_results;
72	72	}
73	73
74		- header( 'X-WordLift-Cache: MISS' );
	74	+ header('X-WordLift-Cache: MISS');
75	75
76		- $results = _wl_network_navigator_get_data( $request );
	76	+ $results = _wl_network_navigator_get_data($request);
77	77
78	78	// Put the result before sending the json to the client, since sending the json will terminate us.
79		- $cache->put( $cache_key, $results );
	79	+ $cache->put($cache_key, $results);
80	80
81	81	return $results;
82	82
		@@ -85,57 +85,57 @@ discard block
		block discarded – undo
85	85	function _wl_navigator_get_data() {
86	86
87	87	// Post ID must be defined
88		- if ( ! isset( $_GET['post_id'] ) ) {
89		- wp_send_json_error( 'No post_id given' );
	88	+ if ( ! isset($_GET['post_id'])) {
	89	+ wp_send_json_error('No post_id given');
90	90
91	91	return array();
92	92	}
93	93
94	94	// Post ID must be defined
95		- if ( ! isset( $_GET['uniqid'] ) ) {
96		- wp_send_json_error( 'No uniqid given' );
	95	+ if ( ! isset($_GET['uniqid'])) {
	96	+ wp_send_json_error('No uniqid given');
97	97
98	98	return array();
99	99	}
100	100
101	101	// Limit the results (defaults to 4)
102		- $navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
103		- $navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
104		- $order_by = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
105		- $post_types = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
106		- $post_types = explode( ',', $post_types );
	102	+ $navigator_length = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
	103	+ $navigator_offset = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
	104	+ $order_by = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
	105	+ $post_types = isset($_GET['post_types']) ? (string) $_GET['post_types'] : '';
	106	+ $post_types = explode(',', $post_types);
107	107	$existing_post_types = get_post_types();
108		- $post_types = array_values( array_intersect( $existing_post_types, $post_types ) );
	108	+ $post_types = array_values(array_intersect($existing_post_types, $post_types));
109	109	$current_post_id = $_GET['post_id'];
110		- $current_post = get_post( $current_post_id );
	110	+ $current_post = get_post($current_post_id);
111	111
112	112	$navigator_id = $_GET['uniqid'];
113	113
114	114	// Post ID has to match an existing item
115		- if ( null === $current_post ) {
116		- wp_send_json_error( 'No valid post_id given' );
	115	+ if (null === $current_post) {
	116	+ wp_send_json_error('No valid post_id given');
117	117
118	118	return array();
119	119	}
120	120
121	121	// Determine navigator type and call respective _get_results
122		- if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
	122	+ if (get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME) {
123	123
124		- $referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
	124	+ $referencing_posts = Navigator_Data::entity_navigator_get_results($current_post_id, array(
125	125	'ID',
126	126	'post_title',
127		- ), $order_by, $navigator_length, $navigator_offset, $post_types );
	127	+ ), $order_by, $navigator_length, $navigator_offset, $post_types);
128	128	} else {
129		- $referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
	129	+ $referencing_posts = Navigator_Data::post_navigator_get_results($current_post_id, array(
130	130	'ID',
131	131	'post_title',
132		- ), $order_by, $navigator_length, $navigator_offset, $post_types );
	132	+ ), $order_by, $navigator_length, $navigator_offset, $post_types);
133	133	}
134	134
135	135	// loop over them and take the first one which is not already in the $related_posts
136	136	$results = array();
137		- foreach ( $referencing_posts as $referencing_post ) {
138		- $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
	137	+ foreach ($referencing_posts as $referencing_post) {
	138	+ $serialized_entity = wl_serialize_entity($referencing_post->entity_id);
139	139
140	140	/**
141	141	* Use the thumbnail.
		@@ -145,12 +145,12 @@ discard block
		block discarded – undo
145	145	*
146	146	* @since 3.19.3 We're using the medium size image.
147	147	*/
148		- $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
	148	+ $thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
149	149
150	150	$result = array(
151	151	'post' => array(
152	152	'id' => $referencing_post->ID,
153		- 'permalink' => get_permalink( $referencing_post->ID ),
	153	+ 'permalink' => get_permalink($referencing_post->ID),
154	154	'title' => $referencing_post->post_title,
155	155	'thumbnail' => $thumbnail,
156	156	),
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	'id' => $referencing_post->entity_id,
159	159	'label' => $serialized_entity['label'],
160	160	'mainType' => $serialized_entity['mainType'],
161		- 'permalink' => get_permalink( $referencing_post->entity_id ),
	161	+ 'permalink' => get_permalink($referencing_post->entity_id),
162	162	),
163	163	);
164	164
		@@ -166,59 +166,59 @@ discard block
		block discarded – undo
166	166	}
167	167
168	168
169		- if ( count( $results ) < $navigator_length ) {
170		- $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
	169	+ if (count($results) < $navigator_length) {
	170	+ $results = apply_filters('wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
171	171	}
172	172
173	173	// Add filler posts if needed
174		- $filler_count = $navigator_length - count( $results );
175		- if ( $filler_count > 0 ) {
176		- $referencing_post_ids = array_map( function ( $p ) {
	174	+ $filler_count = $navigator_length - count($results);
	175	+ if ($filler_count > 0) {
	176	+ $referencing_post_ids = array_map(function($p) {
177	177	return $p->ID;
178		- }, $referencing_posts );
	178	+ }, $referencing_posts);
179	179	/**
180	180	* @since 3.27.8
181	181	* Filler posts are fetched using this util.
182	182	*/
183		- $filler_posts_util = new Filler_Posts_Util( $current_post_id );
184		- $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
185		- $filler_posts = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
186		- $results = array_merge( $filler_posts, $results );
	183	+ $filler_posts_util = new Filler_Posts_Util($current_post_id);
	184	+ $post_ids_to_be_excluded = array_merge(array($current_post_id), $referencing_post_ids);
	185	+ $filler_posts = $filler_posts_util->get_filler_response($filler_count, $post_ids_to_be_excluded);
	186	+ $results = array_merge($filler_posts, $results);
187	187	}
188	188
189	189	// Apply filters after fillers are added
190		- foreach ( $results as $result_index => $result ) {
191		- $results[ $result_index ]['post'] = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
192		- $results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
	190	+ foreach ($results as $result_index => $result) {
	191	+ $results[$result_index]['post'] = apply_filters('wl_navigator_data_post', $result['post'], intval($result['post']['id']), $navigator_id);
	192	+ $results[$result_index]['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($result['entity']['id']), $navigator_id);
193	193	}
194	194
195	195	return $results;
196	196	}
197	197
198		-function _wl_network_navigator_get_data( $request ) {
	198	+function _wl_network_navigator_get_data($request) {
199	199
200	200	// Limit the results (defaults to 4)
201		- $navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
202		- $navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
	201	+ $navigator_length = isset($request['limit']) ? intval($request['limit']) : 4;
	202	+ $navigator_offset = isset($request['offset']) ? intval($request['offset']) : 0;
203	203	$navigator_id = $request['uniqid'];
204		- $order_by = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
	204	+ $order_by = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
205	205
206	206	$entities = $request['entities'];
207	207
208	208	// Post ID has to match an existing item
209		- if ( ! isset( $entities ) \|\| empty( $entities ) ) {
210		- wp_send_json_error( 'No valid entities provided' );
	209	+ if ( ! isset($entities) \|\| empty($entities)) {
	210	+ wp_send_json_error('No valid entities provided');
211	211	}
212	212
213		- $referencing_posts = _wl_network_navigator_get_results( $entities, array(
	213	+ $referencing_posts = _wl_network_navigator_get_results($entities, array(
214	214	'ID',
215	215	'post_title',
216		- ), $order_by, $navigator_length, $navigator_offset );
	216	+ ), $order_by, $navigator_length, $navigator_offset);
217	217
218	218	// loop over them and take the first one which is not already in the $related_posts
219	219	$results = array();
220		- foreach ( $referencing_posts as $referencing_post ) {
221		- $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
	220	+ foreach ($referencing_posts as $referencing_post) {
	221	+ $serialized_entity = wl_serialize_entity($referencing_post->entity_id);
222	222
223	223	/**
224	224	* Use the thumbnail.
		@@ -228,30 +228,30 @@ discard block
		block discarded – undo
228	228	*
229	229	* @since 3.19.3 We're using the medium size image.
230	230	*/
231		- $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
	231	+ $thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
232	232
233	233	$result = array(
234	234	'post' => array(
235		- 'permalink' => get_permalink( $referencing_post->ID ),
	235	+ 'permalink' => get_permalink($referencing_post->ID),
236	236	'title' => $referencing_post->post_title,
237	237	'thumbnail' => $thumbnail,
238	238	),
239	239	'entity' => array(
240	240	'label' => $serialized_entity['label'],
241	241	'mainType' => $serialized_entity['mainType'],
242		- 'permalink' => get_permalink( $referencing_post->entity_id ),
	242	+ 'permalink' => get_permalink($referencing_post->entity_id),
243	243	),
244	244	);
245	245
246		- $result['post'] = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
247		- $result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
	246	+ $result['post'] = apply_filters('wl_network_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
	247	+ $result['entity'] = apply_filters('wl_network_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
248	248
249	249	$results[] = $result;
250	250
251	251	}
252	252
253		- if ( count( $results ) < $navigator_length ) {
254		- $results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
	253	+ if (count($results) < $navigator_length) {
	254	+ $results = apply_filters('wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
255	255	}
256	256
257	257	return $results;
		@@ -266,24 +266,24 @@ discard block
		block discarded – undo
266	266	) {
267	267	global $wpdb;
268	268
269		- $select = implode( ', ', array_map( function ( $item ) {
	269	+ $select = implode(', ', array_map(function($item) {
270	270	return "p.$item AS $item";
271		- }, (array) $fields ) );
	271	+ }, (array) $fields));
272	272
273		- $order_by = implode( ', ', array_map( function ( $item ) {
	273	+ $order_by = implode(', ', array_map(function($item) {
274	274	return "p.$item";
275		- }, (array) $order_by ) );
	275	+ }, (array) $order_by));
276	276
277		- $entities_in = implode( ',', array_map( function ( $item ) {
278		- $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
279		- if ( isset( $entity ) ) {
	277	+ $entities_in = implode(',', array_map(function($item) {
	278	+ $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
	279	+ if (isset($entity)) {
280	280	return $entity->ID;
281	281	}
282		- }, $entities ) );
	282	+ }, $entities));
283	283
284	284	/** @noinspection SqlNoDataSourceInspection */
285	285	return $wpdb->get_results(
286		- $wpdb->prepare( <<<EOF
	286	+ $wpdb->prepare(<<<EOF
287	287	SELECT %3\$s, p2.ID as entity_id
288	288	FROM {$wpdb->prefix}wl_relation_instances r1
289	289	-- get the ID of the post entity in common between the object and the subject 2.
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	LIMIT %1\$d
310	310	OFFSET %2\$d
311	311	EOF
312		- , $limit, $offset, $select, $order_by )
	312	+ , $limit, $offset, $select, $order_by)
313	313	);
314	314
315	315	}
		@@ -324,12 +324,12 @@ discard block
		block discarded – undo
324	324
325	325	// Temporary blocking the Navigator.
326	326	$results = wl_shortcode_navigator_data();
327		- wl_core_send_json( $results );
	327	+ wl_core_send_json($results);
328	328
329	329	}
330	330
331		-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
332		-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
	331	+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
	332	+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
333	333
334	334	/**
335	335	* wp-json call for the navigator widget
		@@ -337,13 +337,13 @@ discard block
		block discarded – undo
337	337	function wl_shortcode_navigator_wp_json() {
338	338
339	339	$results = wl_shortcode_navigator_data();
340		- if ( ob_get_contents() ) {
	340	+ if (ob_get_contents()) {
341	341	ob_clean();
342	342	}
343	343
344	344	return array(
345	345	'items' => array(
346		- array( 'values' => $results ),
	346	+ array('values' => $results),
347	347	),
348	348	);
349	349
		@@ -352,23 +352,23 @@ discard block
		block discarded – undo
352	352	/**
353	353	* Adding `rest_api_init` action for amp backend of navigator
354	354	*/
355		-add_action( 'rest_api_init', function () {
356		- register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
	355	+add_action('rest_api_init', function() {
	356	+ register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
357	357	'methods' => 'GET',
358	358	'permission_callback' => '__return_true',
359	359	'callback' => 'wl_shortcode_navigator_wp_json'
360		- ) );
	360	+ ));
361	361	} );
362	362
363	363	/**
364	364	* Adding `rest_api_init` action for backend of network navigator
365	365	*/
366		-add_action( 'rest_api_init', function () {
367		- register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
	366	+add_action('rest_api_init', function() {
	367	+ register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
368	368	'methods' => 'GET',
369	369	'callback' => 'wl_network_navigator_wp_json',
370	370	'permission_callback' => '__return_true',
371		- ) );
	371	+ ));
372	372	} );
373	373
374	374	/**
		@@ -376,24 +376,24 @@ discard block
		block discarded – undo
376	376	*
377	377	* @since 2.2.0
378	378	*/
379		-add_action( 'plugins_loaded', function () {
	379	+add_action('plugins_loaded', function() {
380	380
381		- if ( ! defined( 'DOING_AJAX' ) \|\| ! DOING_AJAX \|\| 'wl_navigator' !== $_REQUEST['action'] ) {
	381	+ if ( ! defined('DOING_AJAX') \|\| ! DOING_AJAX \|\| 'wl_navigator' !== $_REQUEST['action']) {
382	382	return;
383	383	}
384	384
385		- remove_action( 'plugins_loaded', 'rocket_init' );
386		- remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
387		- remove_action( 'plugins_loaded', 'wpseo_init', 14 );
388		-}, 0 );
	385	+ remove_action('plugins_loaded', 'rocket_init');
	386	+ remove_action('plugins_loaded', 'wpseo_premium_init', 14);
	387	+ remove_action('plugins_loaded', 'wpseo_init', 14);
	388	+}, 0);
389	389
390		-add_action( 'init', function () {
	390	+add_action('init', function() {
391	391
392		- if ( ! defined( 'DOING_AJAX' ) \|\| ! DOING_AJAX \|\| 'wl_navigator' !== $_REQUEST['action'] ) {
	392	+ if ( ! defined('DOING_AJAX') \|\| ! DOING_AJAX \|\| 'wl_navigator' !== $_REQUEST['action']) {
393	393	return;
394	394	}
395	395
396		- remove_action( 'init', 'wp_widgets_init', 1 );
397		- remove_action( 'init', 'gglcptch_init' );
398		-}, 0 );
	396	+ remove_action('init', 'wp_widgets_init', 1);
	397	+ remove_action('init', 'gglcptch_init');
	398	+}, 0);
399	399

		@@ -19,30 +19,30 @@ discard block
		block discarded – undo
19	19	*/
20	20	function wl_shortcode_faceted_search( $request ) {
21	21
22		- // Create the cache key.
23		- $cache_key = array(
24		- 'request_params' => $_GET,
25		- );
	22	+ // Create the cache key.
	23	+ $cache_key = array(
	24	+ 'request_params' => $_GET,
	25	+ );
26	26
27		- // Create the TTL cache and try to get the results.
28		- $cache = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
29		- $cache_results = $cache->get( $cache_key );
	27	+ // Create the TTL cache and try to get the results.
	28	+ $cache = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
	29	+ $cache_results = $cache->get( $cache_key );
30	30
31		- if ( isset( $cache_results ) ) {
32		- header( 'X-WordLift-Cache: HIT' );
33		- wl_core_send_json( $cache_results );
	31	+ if ( isset( $cache_results ) ) {
	32	+ header( 'X-WordLift-Cache: HIT' );
	33	+ wl_core_send_json( $cache_results );
34	34
35		- return;
36		- }
	35	+ return;
	36	+ }
37	37
38		- header( 'X-WordLift-Cache: MISS' );
	38	+ header( 'X-WordLift-Cache: MISS' );
39	39
40		- $results = wl_shortcode_faceted_search_origin( $request );
	40	+ $results = wl_shortcode_faceted_search_origin( $request );
41	41
42		- // Put the result before sending the json to the client, since sending the json will terminate us.
43		- $cache->put( $cache_key, $results );
	42	+ // Put the result before sending the json to the client, since sending the json will terminate us.
	43	+ $cache->put( $cache_key, $results );
44	44
45		- wl_core_send_json( $results );
	45	+ wl_core_send_json( $results );
46	46
47	47	}
48	48
		@@ -53,150 +53,150 @@ discard block
		block discarded – undo
53	53	* @since 3.26.0
54	54	*/
55	55	function wl_shortcode_faceted_search_origin( $request ) {
56		- // Post ID must be defined.
57		- if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
58		- wp_die( 'No post_id given' );
59		-
60		- return;
61		- }
62		-
63		- $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
64		- $current_post = get_post( $current_post_id );
65		- $faceted_id = $_GET['uniqid'];
66		-
67		- $post_types = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
68		- $post_types = explode( ',', $post_types );
69		- $existing_post_types = get_post_types();
70		- $post_types = array_values( array_intersect( $existing_post_types, $post_types ) );
71		-
72		-
73		- // Post ID has to match an existing item.
74		- if ( null === $current_post ) {
75		- wp_die( 'No valid post_id given' );
76		-
77		- return;
78		- }
79		-
80		- // If the current post is an entity,
81		- // the current post is used as main entity.
82		- // Otherwise, current post related entities are used.
83		- $entity_service = Wordlift_Entity_Service::get_instance();
84		-
85		- $entity_ids = $entity_service->is_entity( $current_post->ID ) ?
86		- array( $current_post->ID ) :
87		- $entity_service->get_related_entities( $current_post->ID );
88		-
89		- // If there are no entities we cannot render the widget.
90		- if ( 0 === count( $entity_ids ) ) {
91		- /**
92		- * If this function is not called from ajax
93		- * then this should not throw an error.
94		- * Note: Used in scripbox longtail project on json endpoint.
95		- */
96		- if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
97		- wp_die( 'No entities available' );
98		- }
99		-
100		- }
101		-
102		- $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
103		- $amp = ( isset( $_GET['amp'] ) ) ? true : false;
104		-
105		-
106		- /**
107		- * see https://github.com/insideout10/wordlift-plugin/issues/1181
108		- * The ordering should be descending by date on default.
109		- */
110		- $order_by = 'DESC';
111		- if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
112		- $order_by = (string) $_GET['sort'];
113		- }
114		-
115		-
116		- $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
117		- $entity_ids,
118		- '*',
119		- null,
120		- 'publish',
121		- array( $current_post_id ),
122		- $limit,
123		- null,
124		- $order_by,
125		- $post_types
126		- );
127		-
128		-
129		- $referencing_post_ids = array_map( function ( $p ) {
130		- return $p->ID;
131		- }, $referencing_posts );
132		-
133		- $post_results = array();
134		- $entity_results = array();
135		-
136		- // Populate $post_results
137		-
138		- $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
139		- $referencing_posts :
140		- Wordlift_Relation_Service::get_instance()->get_article_subjects(
141		- wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
142		- '*',
143		- null,
144		- null,
145		- array(),
146		- null,
147		- $referencing_post_ids
148		- );
149		-
150		- if ( $filtered_posts ) {
151		- foreach ( $filtered_posts as $post_obj ) {
152		-
153		- /**
154		- * Use the thumbnail.
155		- *
156		- * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
157		- * @see https://github.com/insideout10/wordlift-plugin/issues/837
158		- *
159		- * @since 3.19.3 We're using the medium size image.
160		- */
161		- $thumbnail = get_the_post_thumbnail_url( $post_obj, 'medium' );
162		- $post_obj->thumbnail = ( $thumbnail ) ?
163		- $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
164		- $post_obj->permalink = get_permalink( $post_obj->ID );
165		-
166		- $result = $post_obj;
167		- $post_results[] = $result;
168		- }
169		- }
170		-
171		- // Add filler posts if needed
172		-
173		- $filler_count = $limit - count( $post_results );
174		- if ( $filler_count > 0 ) {
175		- $filler_posts_util = new Filler_Posts_Util( $current_post_id );
176		- $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
177		- $filler_posts = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
178		-
179		- $post_results = array_merge( $post_results, $filler_posts );
180		- }
181		- $referencing_post_ids = array_map( function ( $post ) {
182		- return $post->ID;
183		- }, $post_results );
184		-
185		- // Populate $entity_results
186		-
187		- global $wpdb;
188		-
189		- // Retrieve Wordlift relation instances table name.
190		- $table_name = wl_core_get_relation_instances_table_name();
191		-
192		- /*
	56	+ // Post ID must be defined.
	57	+ if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
	58	+ wp_die( 'No post_id given' );
	59	+
	60	+ return;
	61	+ }
	62	+
	63	+ $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
	64	+ $current_post = get_post( $current_post_id );
	65	+ $faceted_id = $_GET['uniqid'];
	66	+
	67	+ $post_types = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
	68	+ $post_types = explode( ',', $post_types );
	69	+ $existing_post_types = get_post_types();
	70	+ $post_types = array_values( array_intersect( $existing_post_types, $post_types ) );
	71	+
	72	+
	73	+ // Post ID has to match an existing item.
	74	+ if ( null === $current_post ) {
	75	+ wp_die( 'No valid post_id given' );
	76	+
	77	+ return;
	78	+ }
	79	+
	80	+ // If the current post is an entity,
	81	+ // the current post is used as main entity.
	82	+ // Otherwise, current post related entities are used.
	83	+ $entity_service = Wordlift_Entity_Service::get_instance();
	84	+
	85	+ $entity_ids = $entity_service->is_entity( $current_post->ID ) ?
	86	+ array( $current_post->ID ) :
	87	+ $entity_service->get_related_entities( $current_post->ID );
	88	+
	89	+ // If there are no entities we cannot render the widget.
	90	+ if ( 0 === count( $entity_ids ) ) {
	91	+ /**
	92	+ * If this function is not called from ajax
	93	+ * then this should not throw an error.
	94	+ * Note: Used in scripbox longtail project on json endpoint.
	95	+ */
	96	+ if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
	97	+ wp_die( 'No entities available' );
	98	+ }
	99	+
	100	+ }
	101	+
	102	+ $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
	103	+ $amp = ( isset( $_GET['amp'] ) ) ? true : false;
	104	+
	105	+
	106	+ /**
	107	+ * see https://github.com/insideout10/wordlift-plugin/issues/1181
	108	+ * The ordering should be descending by date on default.
	109	+ */
	110	+ $order_by = 'DESC';
	111	+ if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
	112	+ $order_by = (string) $_GET['sort'];
	113	+ }
	114	+
	115	+
	116	+ $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
	117	+ $entity_ids,
	118	+ '*',
	119	+ null,
	120	+ 'publish',
	121	+ array( $current_post_id ),
	122	+ $limit,
	123	+ null,
	124	+ $order_by,
	125	+ $post_types
	126	+ );
	127	+
	128	+
	129	+ $referencing_post_ids = array_map( function ( $p ) {
	130	+ return $p->ID;
	131	+ }, $referencing_posts );
	132	+
	133	+ $post_results = array();
	134	+ $entity_results = array();
	135	+
	136	+ // Populate $post_results
	137	+
	138	+ $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
	139	+ $referencing_posts :
	140	+ Wordlift_Relation_Service::get_instance()->get_article_subjects(
	141	+ wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
	142	+ '*',
	143	+ null,
	144	+ null,
	145	+ array(),
	146	+ null,
	147	+ $referencing_post_ids
	148	+ );
	149	+
	150	+ if ( $filtered_posts ) {
	151	+ foreach ( $filtered_posts as $post_obj ) {
	152	+
	153	+ /**
	154	+ * Use the thumbnail.
	155	+ *
	156	+ * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
	157	+ * @see https://github.com/insideout10/wordlift-plugin/issues/837
	158	+ *
	159	+ * @since 3.19.3 We're using the medium size image.
	160	+ */
	161	+ $thumbnail = get_the_post_thumbnail_url( $post_obj, 'medium' );
	162	+ $post_obj->thumbnail = ( $thumbnail ) ?
	163	+ $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
	164	+ $post_obj->permalink = get_permalink( $post_obj->ID );
	165	+
	166	+ $result = $post_obj;
	167	+ $post_results[] = $result;
	168	+ }
	169	+ }
	170	+
	171	+ // Add filler posts if needed
	172	+
	173	+ $filler_count = $limit - count( $post_results );
	174	+ if ( $filler_count > 0 ) {
	175	+ $filler_posts_util = new Filler_Posts_Util( $current_post_id );
	176	+ $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
	177	+ $filler_posts = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
	178	+
	179	+ $post_results = array_merge( $post_results, $filler_posts );
	180	+ }
	181	+ $referencing_post_ids = array_map( function ( $post ) {
	182	+ return $post->ID;
	183	+ }, $post_results );
	184	+
	185	+ // Populate $entity_results
	186	+
	187	+ global $wpdb;
	188	+
	189	+ // Retrieve Wordlift relation instances table name.
	190	+ $table_name = wl_core_get_relation_instances_table_name();
	191	+
	192	+ /*
193	193	* Make sure we have some referenced post, otherwise the IN parts of
194	194	* the SQL will produce an SQL error.
195	195	*/
196		- if ( ! empty( $referencing_post_ids ) ) {
197		- $subject_ids = implode( ',', $referencing_post_ids );
	196	+ if ( ! empty( $referencing_post_ids ) ) {
	197	+ $subject_ids = implode( ',', $referencing_post_ids );
198	198
199		- $query = "
	199	+ $query = "
200	200	SELECT
201	201	object_id AS ID,
202	202	count( object_id ) AS counter
		@@ -208,60 +208,60 @@ discard block
		block discarded – undo
208	208	LIMIT $limit;
209	209	";
210	210
211		- wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
	211	+ wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
212	212
213		- $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
	213	+ $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
214	214
215		- wl_write_log( 'Entities found ' . count( $entities ) );
	215	+ wl_write_log( 'Entities found ' . count( $entities ) );
216	216
217		- foreach ( $entities as $obj ) {
	217	+ foreach ( $entities as $obj ) {
218	218
219		- $entity = get_post( $obj->ID );
	219	+ $entity = get_post( $obj->ID );
220	220
221		- // Ensure only valid and published entities are returned.
222		- if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
	221	+ // Ensure only valid and published entities are returned.
	222	+ if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
223	223
224		- $serialized_entity = wl_serialize_entity( $entity );
225		- $serialized_entity['label'] = wl_shortcode_faceted_search_get_the_title( $obj->ID );
226		- $serialized_entity['counter'] = $obj->counter;
227		- $serialized_entity['createdAt'] = $entity->post_date;
228		- $serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
229		- $obj->ID,
230		- 'ids',
231		- null,
232		- null,
233		- array(),
234		- null,
235		- $referencing_post_ids
236		- );
237		- $entity_results[] = $serialized_entity;
238		- }
239		- }
240		- }
	224	+ $serialized_entity = wl_serialize_entity( $entity );
	225	+ $serialized_entity['label'] = wl_shortcode_faceted_search_get_the_title( $obj->ID );
	226	+ $serialized_entity['counter'] = $obj->counter;
	227	+ $serialized_entity['createdAt'] = $entity->post_date;
	228	+ $serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
	229	+ $obj->ID,
	230	+ 'ids',
	231	+ null,
	232	+ null,
	233	+ array(),
	234	+ null,
	235	+ $referencing_post_ids
	236	+ );
	237	+ $entity_results[] = $serialized_entity;
	238	+ }
	239	+ }
	240	+ }
241	241
242		- $post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
243		- $entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
	242	+ $post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
	243	+ $entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
244	244
245		- return array(
246		- 'posts' => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
247		- 'entities' => $entity_results
248		- );
	245	+ return array(
	246	+ 'posts' => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
	247	+ 'entities' => $entity_results
	248	+ );
249	249
250	250	}
251	251
252	252	function wl_shortcode_faceted_search_get_the_title( $post_id ) {
253	253
254		- $title = get_the_title( $post_id );
	254	+ $title = get_the_title( $post_id );
255	255
256		- if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
257		- $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
	256	+ if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
	257	+ $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
258	258
259		- if ( count( $alternative_labels ) > 0 ) {
260		- $title = $alternative_labels[0];
261		- }
262		- }
	259	+ if ( count( $alternative_labels ) > 0 ) {
	260	+ $title = $alternative_labels[0];
	261	+ }
	262	+ }
263	263
264		- return remove_accents( $title );
	264	+ return remove_accents( $title );
265	265
266	266	}
267	267
		@@ -269,9 +269,9 @@ discard block
		block discarded – undo
269	269	* Adding `rest_api_init` action for network faceted-search
270	270	*/
271	271	add_action( 'rest_api_init', function () {
272		- register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
273		- 'methods' => 'GET',
274		- 'callback' => 'wl_shortcode_faceted_search',
275		- 'permission_callback' => '__return_true',
276		- ) );
	272	+ register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
	273	+ 'methods' => 'GET',
	274	+ 'callback' => 'wl_shortcode_faceted_search',
	275	+ 'permission_callback' => '__return_true',
	276	+ ) );
277	277	} );

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	* @since 3.21.4 fix the cache key by also using the request body.
18	18	* @since 3.21.2 add a caching layer.
19	19	*/
20		-function wl_shortcode_faceted_search( $request ) {
	20	+function wl_shortcode_faceted_search($request) {
21	21
22	22	// Create the cache key.
23	23	$cache_key = array(
		@@ -25,24 +25,24 @@ discard block
		block discarded – undo
25	25	);
26	26
27	27	// Create the TTL cache and try to get the results.
28		- $cache = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
29		- $cache_results = $cache->get( $cache_key );
	28	+ $cache = new Ttl_Cache("faceted-search", 8 * 60 * 60); // 8 hours.
	29	+ $cache_results = $cache->get($cache_key);
30	30
31		- if ( isset( $cache_results ) ) {
32		- header( 'X-WordLift-Cache: HIT' );
33		- wl_core_send_json( $cache_results );
	31	+ if (isset($cache_results)) {
	32	+ header('X-WordLift-Cache: HIT');
	33	+ wl_core_send_json($cache_results);
34	34
35	35	return;
36	36	}
37	37
38		- header( 'X-WordLift-Cache: MISS' );
	38	+ header('X-WordLift-Cache: MISS');
39	39
40		- $results = wl_shortcode_faceted_search_origin( $request );
	40	+ $results = wl_shortcode_faceted_search_origin($request);
41	41
42	42	// Put the result before sending the json to the client, since sending the json will terminate us.
43		- $cache->put( $cache_key, $results );
	43	+ $cache->put($cache_key, $results);
44	44
45		- wl_core_send_json( $results );
	45	+ wl_core_send_json($results);
46	46
47	47	}
48	48
		@@ -52,27 +52,27 @@ discard block
		block discarded – undo
52	52	* @return array $results
53	53	* @since 3.26.0
54	54	*/
55		-function wl_shortcode_faceted_search_origin( $request ) {
	55	+function wl_shortcode_faceted_search_origin($request) {
56	56	// Post ID must be defined.
57		- if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
58		- wp_die( 'No post_id given' );
	57	+ if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
	58	+ wp_die('No post_id given');
59	59
60	60	return;
61	61	}
62	62
63	63	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
64		- $current_post = get_post( $current_post_id );
	64	+ $current_post = get_post($current_post_id);
65	65	$faceted_id = $_GET['uniqid'];
66	66
67		- $post_types = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
68		- $post_types = explode( ',', $post_types );
	67	+ $post_types = isset($_GET['post_types']) ? (string) $_GET['post_types'] : '';
	68	+ $post_types = explode(',', $post_types);
69	69	$existing_post_types = get_post_types();
70		- $post_types = array_values( array_intersect( $existing_post_types, $post_types ) );
	70	+ $post_types = array_values(array_intersect($existing_post_types, $post_types));
71	71
72	72
73	73	// Post ID has to match an existing item.
74		- if ( null === $current_post ) {
75		- wp_die( 'No valid post_id given' );
	74	+ if (null === $current_post) {
	75	+ wp_die('No valid post_id given');
76	76
77	77	return;
78	78	}
		@@ -82,25 +82,24 @@ discard block
		block discarded – undo
82	82	// Otherwise, current post related entities are used.
83	83	$entity_service = Wordlift_Entity_Service::get_instance();
84	84
85		- $entity_ids = $entity_service->is_entity( $current_post->ID ) ?
86		- array( $current_post->ID ) :
87		- $entity_service->get_related_entities( $current_post->ID );
	85	+ $entity_ids = $entity_service->is_entity($current_post->ID) ?
	86	+ array($current_post->ID) : $entity_service->get_related_entities($current_post->ID);
88	87
89	88	// If there are no entities we cannot render the widget.
90		- if ( 0 === count( $entity_ids ) ) {
	89	+ if (0 === count($entity_ids)) {
91	90	/**
92	91	* If this function is not called from ajax
93	92	* then this should not throw an error.
94	93	* Note: Used in scripbox longtail project on json endpoint.
95	94	*/
96		- if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
97		- wp_die( 'No entities available' );
	95	+ if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
	96	+ wp_die('No entities available');
98	97	}
99	98
100	99	}
101	100
102		- $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
103		- $amp = ( isset( $_GET['amp'] ) ) ? true : false;
	101	+ $limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
	102	+ $amp = (isset($_GET['amp'])) ? true : false;
104	103
105	104
106	105	/**
		@@ -108,7 +107,7 @@ discard block
		block discarded – undo
108	107	* The ordering should be descending by date on default.
109	108	*/
110	109	$order_by = 'DESC';
111		- if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
	110	+ if (isset($_GET['sort']) && is_string($_GET['sort'])) {
112	111	$order_by = (string) $_GET['sort'];
113	112	}
114	113
		@@ -118,7 +117,7 @@ discard block
		block discarded – undo
118	117	'*',
119	118	null,
120	119	'publish',
121		- array( $current_post_id ),
	120	+ array($current_post_id),
122	121	$limit,
123	122	null,
124	123	$order_by,
		@@ -126,19 +125,18 @@ discard block
		block discarded – undo
126	125	);
127	126
128	127
129		- $referencing_post_ids = array_map( function ( $p ) {
	128	+ $referencing_post_ids = array_map(function($p) {
130	129	return $p->ID;
131		- }, $referencing_posts );
	130	+ }, $referencing_posts);
132	131
133	132	$post_results = array();
134	133	$entity_results = array();
135	134
136	135	// Populate $post_results
137	136
138		- $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
139		- $referencing_posts :
140		- Wordlift_Relation_Service::get_instance()->get_article_subjects(
141		- wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
	137	+ $filtered_posts = (empty($filtering_entity_uris)) ?
	138	+ $referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
	139	+ wl_get_entity_post_ids_by_uris($filtering_entity_uris),
142	140	'*',
143	141	null,
144	142	null,
		@@ -147,8 +145,8 @@ discard block
		block discarded – undo
147	145	$referencing_post_ids
148	146	);
149	147
150		- if ( $filtered_posts ) {
151		- foreach ( $filtered_posts as $post_obj ) {
	148	+ if ($filtered_posts) {
	149	+ foreach ($filtered_posts as $post_obj) {
152	150
153	151	/**
154	152	* Use the thumbnail.
		@@ -158,10 +156,10 @@ discard block
		block discarded – undo
158	156	*
159	157	* @since 3.19.3 We're using the medium size image.
160	158	*/
161		- $thumbnail = get_the_post_thumbnail_url( $post_obj, 'medium' );
162		- $post_obj->thumbnail = ( $thumbnail ) ?
	159	+ $thumbnail = get_the_post_thumbnail_url($post_obj, 'medium');
	160	+ $post_obj->thumbnail = ($thumbnail) ?
163	161	$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
164		- $post_obj->permalink = get_permalink( $post_obj->ID );
	162	+ $post_obj->permalink = get_permalink($post_obj->ID);
165	163
166	164	$result = $post_obj;
167	165	$post_results[] = $result;
		@@ -170,17 +168,17 @@ discard block
		block discarded – undo
170	168
171	169	// Add filler posts if needed
172	170
173		- $filler_count = $limit - count( $post_results );
174		- if ( $filler_count > 0 ) {
175		- $filler_posts_util = new Filler_Posts_Util( $current_post_id );
176		- $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
177		- $filler_posts = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
	171	+ $filler_count = $limit - count($post_results);
	172	+ if ($filler_count > 0) {
	173	+ $filler_posts_util = new Filler_Posts_Util($current_post_id);
	174	+ $post_ids_to_be_excluded = array_merge(array($current_post_id), $referencing_post_ids);
	175	+ $filler_posts = $filler_posts_util->get_filler_posts($filler_count, $post_ids_to_be_excluded);
178	176
179		- $post_results = array_merge( $post_results, $filler_posts );
	177	+ $post_results = array_merge($post_results, $filler_posts);
180	178	}
181		- $referencing_post_ids = array_map( function ( $post ) {
	179	+ $referencing_post_ids = array_map(function($post) {
182	180	return $post->ID;
183		- }, $post_results );
	181	+ }, $post_results);
184	182
185	183	// Populate $entity_results
186	184
		@@ -193,8 +191,8 @@ discard block
		block discarded – undo
193	191	* Make sure we have some referenced post, otherwise the IN parts of
194	192	* the SQL will produce an SQL error.
195	193	*/
196		- if ( ! empty( $referencing_post_ids ) ) {
197		- $subject_ids = implode( ',', $referencing_post_ids );
	194	+ if ( ! empty($referencing_post_ids)) {
	195	+ $subject_ids = implode(',', $referencing_post_ids);
198	196
199	197	$query = "
200	198	SELECT
		@@ -208,21 +206,21 @@ discard block
		block discarded – undo
208	206	LIMIT $limit;
209	207	";
210	208
211		- wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
	209	+ wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
212	210
213		- $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
	211	+ $entities = $wpdb->get_results($query, OBJECT); // No cache ok.
214	212
215		- wl_write_log( 'Entities found ' . count( $entities ) );
	213	+ wl_write_log('Entities found '.count($entities));
216	214
217		- foreach ( $entities as $obj ) {
	215	+ foreach ($entities as $obj) {
218	216
219		- $entity = get_post( $obj->ID );
	217	+ $entity = get_post($obj->ID);
220	218
221	219	// Ensure only valid and published entities are returned.
222		- if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
	220	+ if ((null !== $entity) && ('publish' === $entity->post_status)) {
223	221
224		- $serialized_entity = wl_serialize_entity( $entity );
225		- $serialized_entity['label'] = wl_shortcode_faceted_search_get_the_title( $obj->ID );
	222	+ $serialized_entity = wl_serialize_entity($entity);
	223	+ $serialized_entity['label'] = wl_shortcode_faceted_search_get_the_title($obj->ID);
226	224	$serialized_entity['counter'] = $obj->counter;
227	225	$serialized_entity['createdAt'] = $entity->post_date;
228	226	$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
		@@ -234,44 +232,44 @@ discard block
		block discarded – undo
234	232	null,
235	233	$referencing_post_ids
236	234	);
237		- $entity_results[] = $serialized_entity;
	235	+ $entity_results[] = $serialized_entity;
238	236	}
239	237	}
240	238	}
241	239
242		- $post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
243		- $entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
	240	+ $post_results = apply_filters('wl_faceted_data_posts', $post_results, $faceted_id);
	241	+ $entity_results = apply_filters('wl_faceted_data_entities', $entity_results, $faceted_id);
244	242
245	243	return array(
246		- 'posts' => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
	244	+ 'posts' => $amp ? array(array('values' => $post_results)) : $post_results,
247	245	'entities' => $entity_results
248	246	);
249	247
250	248	}
251	249
252		-function wl_shortcode_faceted_search_get_the_title( $post_id ) {
	250	+function wl_shortcode_faceted_search_get_the_title($post_id) {
253	251
254		- $title = get_the_title( $post_id );
	252	+ $title = get_the_title($post_id);
255	253
256		- if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
257		- $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
	254	+ if (get_post_type($post_id) !== Wordlift_Entity_Service::TYPE_NAME) {
	255	+ $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
258	256
259		- if ( count( $alternative_labels ) > 0 ) {
	257	+ if (count($alternative_labels) > 0) {
260	258	$title = $alternative_labels[0];
261	259	}
262	260	}
263	261
264		- return remove_accents( $title );
	262	+ return remove_accents($title);
265	263
266	264	}
267	265
268	266	/**
269	267	* Adding `rest_api_init` action for network faceted-search
270	268	*/
271		-add_action( 'rest_api_init', function () {
272		- register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
	269	+add_action('rest_api_init', function() {
	270	+ register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
273	271	'methods' => 'GET',
274	272	'callback' => 'wl_shortcode_faceted_search',
275	273	'permission_callback' => '__return_true',
276		- ) );
	274	+ ));
277	275	} );

		@@ -14,11 +14,11 @@
		block discarded – undo
14	14	*/
15	15	class Same_Category_Filler_Posts extends Filler_Posts {
16	16
17		- function get_posts( $filler_count, $post_ids_to_be_excluded ) {
	17	+ function get_posts( $filler_count, $post_ids_to_be_excluded ) {
18	18
19		- $current_post_categories = wp_get_post_categories( $this->post_id );
	19	+ $current_post_categories = wp_get_post_categories( $this->post_id );
20	20
21		- return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => get_post_types() )
22		- + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
23		- }
	21	+ return get_posts( array( 'category__in' => $current_post_categories, 'post_type' => get_post_types() )
	22	+ + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
	23	+ }
24	24	}
25	25	\ No newline at end of file

		@@ -7,17 +7,17 @@
		block discarded – undo
7	7	*/
8	8	class Same_Post_Type_Filler_Posts extends Filler_Posts {
9	9
10		- public function __construct( $post_id ) {
11		- parent::__construct( $post_id );
12		- }
	10	+ public function __construct( $post_id ) {
	11	+ parent::__construct( $post_id );
	12	+ }
13	13
14		- function get_posts( $filler_count, $post_ids_to_be_excluded ) {
15		- $post_type = get_post_type( $this->post_id );
16		- if ( $post_type === 'entity' ) {
17		- $post_type = 'post';
18		- }
	14	+ function get_posts( $filler_count, $post_ids_to_be_excluded ) {
	15	+ $post_type = get_post_type( $this->post_id );
	16	+ if ( $post_type === 'entity' ) {
	17	+ $post_type = 'post';
	18	+ }
19	19
20		- return get_posts( array( 'post_type' => $post_type )
21		- + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
22		- }
	20	+ return get_posts( array( 'post_type' => $post_type )
	21	+ + $this->get_posts_config( $filler_count, $post_ids_to_be_excluded ) );
	22	+ }
23	23	}
24	24	\ No newline at end of file

		@@ -7,54 +7,54 @@
		block discarded – undo
7	7	*/
8	8	abstract class Filler_Posts {
9	9
10		- /**
11		- * @var int
12		- */
13		- public $filler_count;
14		-
15		- /**
16		- * @var array<int>
17		- */
18		- public $post_ids_to_be_excluded;
19		-
20		- /**
21		- * @var $post_id int
22		- */
23		- protected $post_id;
24		-
25		- /**
26		- * Filler_Posts constructor.
27		- *
28		- * @param $post_id
29		- */
30		- public function __construct( $post_id ) {
31		-
32		- $this->post_id = $post_id;
33		-
34		- }
35		-
36		- protected function get_posts_config($filler_count, $post_ids_to_be_excluded) {
37		-
38		- return array(
39		- 'meta_query' => array(
40		- array(
41		- 'key' => '_thumbnail_id'
42		- )
43		- ),
44		- 'numberposts' => $filler_count,
45		- 'post__not_in' => $post_ids_to_be_excluded,
46		- 'ignore_sticky_posts' => 1
47		- );
48		-
49		- }
50		-
51		- /**
52		- * @param $filler_count
53		- * @param $post_ids_to_be_excluded
54		- *
55		- * @return array<\WP_Post>
56		- */
57		- abstract function get_posts( $filler_count, $post_ids_to_be_excluded );
	10	+ /**
	11	+ * @var int
	12	+ */
	13	+ public $filler_count;
	14	+
	15	+ /**
	16	+ * @var array<int>
	17	+ */
	18	+ public $post_ids_to_be_excluded;
	19	+
	20	+ /**
	21	+ * @var $post_id int
	22	+ */
	23	+ protected $post_id;
	24	+
	25	+ /**
	26	+ * Filler_Posts constructor.
	27	+ *
	28	+ * @param $post_id
	29	+ */
	30	+ public function __construct( $post_id ) {
	31	+
	32	+ $this->post_id = $post_id;
	33	+
	34	+ }
	35	+
	36	+ protected function get_posts_config($filler_count, $post_ids_to_be_excluded) {
	37	+
	38	+ return array(
	39	+ 'meta_query' => array(
	40	+ array(
	41	+ 'key' => '_thumbnail_id'
	42	+ )
	43	+ ),
	44	+ 'numberposts' => $filler_count,
	45	+ 'post__not_in' => $post_ids_to_be_excluded,
	46	+ 'ignore_sticky_posts' => 1
	47	+ );
	48	+
	49	+ }
	50	+
	51	+ /**
	52	+ * @param $filler_count
	53	+ * @param $post_ids_to_be_excluded
	54	+ *
	55	+ * @return array<\WP_Post>
	56	+ */
	57	+ abstract function get_posts( $filler_count, $post_ids_to_be_excluded );
58	58
59	59
60	60	}

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	*
28	28	* @param $post_id
29	29	*/
30		- public function __construct( $post_id ) {
	30	+ public function __construct($post_id) {
31	31
32	32	$this->post_id = $post_id;
33	33
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	*
55	55	* @return array<\WP_Post>
56	56	*/
57		- abstract function get_posts( $filler_count, $post_ids_to_be_excluded );
	57	+ abstract function get_posts($filler_count, $post_ids_to_be_excluded);
58	58
59	59
60	60	}

		@@ -7,100 +7,100 @@
		block discarded – undo
7	7	*/
8	8	class Filler_Posts_Util {
9	9
10		- /**
11		- * @var array<Filler_Posts>
12		- */
13		- private $sources = array();
14		-
15		- public function __construct( $post_id ) {
16		-
17		- $post_type = get_post_type( $post_id );
18		-
19		- if ( $post_type === 'post' ) {
20		- $this->sources = array(
21		- new Same_Category_Filler_Posts( $post_id ),
22		- new Same_Post_Type_Filler_Posts( $post_id ),
23		- );
24		- } else {
25		- $this->sources = array(
26		- new Same_Post_Type_Filler_Posts( $post_id ),
27		- );
28		- }
29		- }
30		-
31		-
32		- /**
33		- * @param $posts array<\WP_Post>
34		- *
35		- * @return array<int>
36		- */
37		- private function extract_post_ids( $posts ) {
38		- return array_map( function ( $post ) {
39		- /**
40		- * @var $post \WP_Post
41		- */
42		- return $post->ID;
43		- }, $posts );
44		- }
45		-
46		- public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
47		-
48		- $filler_posts = array();
49		-
50		- foreach ( $this->sources as $source ) {
51		-
52		- if ( $filler_count <= 0 ) {
53		- break;
54		- }
55		- /**
56		- * @var Filler_Posts $source
57		- */
58		- $source->post_ids_to_be_excluded = $post_ids_to_be_excluded;
59		- $source->filler_count = $filler_count;
60		-
61		- $posts = $source->get_posts( $filler_count, $post_ids_to_be_excluded );
62		- $post_ids = $this->extract_post_ids( $posts );
63		-
64		- // Update the post ids, filler posts and filler count
65		- $post_ids_to_be_excluded = array_merge( $post_ids_to_be_excluded, $post_ids );
66		- $filler_count = $filler_count - count( $posts );
67		- $filler_posts = array_merge( $filler_posts, $posts );
68		-
69		-
70		- }
71		-
72		- return $filler_posts;
73		-
74		- }
75		-
76		- /**
77		- * Called by wordlift navigator, converts all the posts to response format.
78		- * @param $filler_count
79		- * @param $post_ids_to_be_excluded
80		- *
81		- * @return array
82		- */
83		- public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
84		- $filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
85		- // Add thumbnail and permalink to filler posts
86		- $filler_response = array();
87		- foreach ( $filler_posts as $post_obj ) {
88		- $thumbnail = get_the_post_thumbnail_url( $post_obj, 'medium' );
89		- $filler_response[] = array(
90		- 'post' => array(
91		- 'id' => $post_obj->ID,
92		- 'permalink' => get_permalink( $post_obj->ID ),
93		- 'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
94		- 'title' => get_the_title( $post_obj->ID )
95		- ),
96		- 'entity' => array(
97		- 'id' => 0
98		- )
99		- );
100		- }
101		-
102		- return $filler_response;
103		- }
	10	+ /**
	11	+ * @var array<Filler_Posts>
	12	+ */
	13	+ private $sources = array();
	14	+
	15	+ public function __construct( $post_id ) {
	16	+
	17	+ $post_type = get_post_type( $post_id );
	18	+
	19	+ if ( $post_type === 'post' ) {
	20	+ $this->sources = array(
	21	+ new Same_Category_Filler_Posts( $post_id ),
	22	+ new Same_Post_Type_Filler_Posts( $post_id ),
	23	+ );
	24	+ } else {
	25	+ $this->sources = array(
	26	+ new Same_Post_Type_Filler_Posts( $post_id ),
	27	+ );
	28	+ }
	29	+ }
	30	+
	31	+
	32	+ /**
	33	+ * @param $posts array<\WP_Post>
	34	+ *
	35	+ * @return array<int>
	36	+ */
	37	+ private function extract_post_ids( $posts ) {
	38	+ return array_map( function ( $post ) {
	39	+ /**
	40	+ * @var $post \WP_Post
	41	+ */
	42	+ return $post->ID;
	43	+ }, $posts );
	44	+ }
	45	+
	46	+ public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
	47	+
	48	+ $filler_posts = array();
	49	+
	50	+ foreach ( $this->sources as $source ) {
	51	+
	52	+ if ( $filler_count <= 0 ) {
	53	+ break;
	54	+ }
	55	+ /**
	56	+ * @var Filler_Posts $source
	57	+ */
	58	+ $source->post_ids_to_be_excluded = $post_ids_to_be_excluded;
	59	+ $source->filler_count = $filler_count;
	60	+
	61	+ $posts = $source->get_posts( $filler_count, $post_ids_to_be_excluded );
	62	+ $post_ids = $this->extract_post_ids( $posts );
	63	+
	64	+ // Update the post ids, filler posts and filler count
	65	+ $post_ids_to_be_excluded = array_merge( $post_ids_to_be_excluded, $post_ids );
	66	+ $filler_count = $filler_count - count( $posts );
	67	+ $filler_posts = array_merge( $filler_posts, $posts );
	68	+
	69	+
	70	+ }
	71	+
	72	+ return $filler_posts;
	73	+
	74	+ }
	75	+
	76	+ /**
	77	+ * Called by wordlift navigator, converts all the posts to response format.
	78	+ * @param $filler_count
	79	+ * @param $post_ids_to_be_excluded
	80	+ *
	81	+ * @return array
	82	+ */
	83	+ public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
	84	+ $filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
	85	+ // Add thumbnail and permalink to filler posts
	86	+ $filler_response = array();
	87	+ foreach ( $filler_posts as $post_obj ) {
	88	+ $thumbnail = get_the_post_thumbnail_url( $post_obj, 'medium' );
	89	+ $filler_response[] = array(
	90	+ 'post' => array(
	91	+ 'id' => $post_obj->ID,
	92	+ 'permalink' => get_permalink( $post_obj->ID ),
	93	+ 'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
	94	+ 'title' => get_the_title( $post_obj->ID )
	95	+ ),
	96	+ 'entity' => array(
	97	+ 'id' => 0
	98	+ )
	99	+ );
	100	+ }
	101	+
	102	+ return $filler_response;
	103	+ }
104	104
105	105
106	106	}

		@@ -12,18 +12,18 @@ discard block
		block discarded – undo
12	12	*/
13	13	private $sources = array();
14	14
15		- public function __construct( $post_id ) {
	15	+ public function __construct($post_id) {
16	16
17		- $post_type = get_post_type( $post_id );
	17	+ $post_type = get_post_type($post_id);
18	18
19		- if ( $post_type === 'post' ) {
	19	+ if ($post_type === 'post') {
20	20	$this->sources = array(
21		- new Same_Category_Filler_Posts( $post_id ),
22		- new Same_Post_Type_Filler_Posts( $post_id ),
	21	+ new Same_Category_Filler_Posts($post_id),
	22	+ new Same_Post_Type_Filler_Posts($post_id),
23	23	);
24	24	} else {
25	25	$this->sources = array(
26		- new Same_Post_Type_Filler_Posts( $post_id ),
	26	+ new Same_Post_Type_Filler_Posts($post_id),
27	27	);
28	28	}
29	29	}
		@@ -34,22 +34,22 @@ discard block
		block discarded – undo
34	34	*
35	35	* @return array<int>
36	36	*/
37		- private function extract_post_ids( $posts ) {
38		- return array_map( function ( $post ) {
	37	+ private function extract_post_ids($posts) {
	38	+ return array_map(function($post) {
39	39	/**
40	40	* @var $post \WP_Post
41	41	*/
42	42	return $post->ID;
43		- }, $posts );
	43	+ }, $posts);
44	44	}
45	45
46		- public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
	46	+ public function get_filler_posts($filler_count, $post_ids_to_be_excluded) {
47	47
48	48	$filler_posts = array();
49	49
50		- foreach ( $this->sources as $source ) {
	50	+ foreach ($this->sources as $source) {
51	51
52		- if ( $filler_count <= 0 ) {
	52	+ if ($filler_count <= 0) {
53	53	break;
54	54	}
55	55	/**
		@@ -58,13 +58,13 @@ discard block
		block discarded – undo
58	58	$source->post_ids_to_be_excluded = $post_ids_to_be_excluded;
59	59	$source->filler_count = $filler_count;
60	60
61		- $posts = $source->get_posts( $filler_count, $post_ids_to_be_excluded );
62		- $post_ids = $this->extract_post_ids( $posts );
	61	+ $posts = $source->get_posts($filler_count, $post_ids_to_be_excluded);
	62	+ $post_ids = $this->extract_post_ids($posts);
63	63
64	64	// Update the post ids, filler posts and filler count
65		- $post_ids_to_be_excluded = array_merge( $post_ids_to_be_excluded, $post_ids );
66		- $filler_count = $filler_count - count( $posts );
67		- $filler_posts = array_merge( $filler_posts, $posts );
	65	+ $post_ids_to_be_excluded = array_merge($post_ids_to_be_excluded, $post_ids);
	66	+ $filler_count = $filler_count - count($posts);
	67	+ $filler_posts = array_merge($filler_posts, $posts);
68	68
69	69
70	70	}
		@@ -80,18 +80,18 @@ discard block
		block discarded – undo
80	80	*
81	81	* @return array
82	82	*/
83		- public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
84		- $filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
	83	+ public function get_filler_response($filler_count, $post_ids_to_be_excluded) {
	84	+ $filler_posts = $this->get_filler_posts($filler_count, $post_ids_to_be_excluded);
85	85	// Add thumbnail and permalink to filler posts
86	86	$filler_response = array();
87		- foreach ( $filler_posts as $post_obj ) {
88		- $thumbnail = get_the_post_thumbnail_url( $post_obj, 'medium' );
	87	+ foreach ($filler_posts as $post_obj) {
	88	+ $thumbnail = get_the_post_thumbnail_url($post_obj, 'medium');
89	89	$filler_response[] = array(
90	90	'post' => array(
91	91	'id' => $post_obj->ID,
92		- 'permalink' => get_permalink( $post_obj->ID ),
93		- 'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
94		- 'title' => get_the_title( $post_obj->ID )
	92	+ 'permalink' => get_permalink($post_obj->ID),
	93	+ 'thumbnail' => ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
	94	+ 'title' => get_the_title($post_obj->ID)
95	95	),
96	96	'entity' => array(
97	97	'id' => 0

		@@ -7,39 +7,39 @@ discard block
		block discarded – undo
7	7	*/
8	8	class Navigator_Data {
9	9
10		- public static function get_post_types_as_string( $post_types ) {
11		- if ( $post_types === array() ) {
12		- $post_types = get_post_types();
13		- }
14		- $post_types = array_map( function ( $post_type ) {
15		- return "'" . esc_sql( $post_type ) . "'";
16		- }, $post_types );
17		-
18		- return implode( ',', $post_types );
19		- }
20		-
21		- public static function post_navigator_get_results(
22		- $post_id, $fields = array(
23		- 'ID',
24		- 'post_title',
25		- ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
26		- ) {
27		-
28		- $post_types = self::get_post_types_as_string( $post_types );
29		- global $wpdb;
30		-
31		- $select = implode( ', ', array_map( function ( $item ) {
32		- return "p.$item AS $item";
33		- }, (array) $fields ) );
34		-
35		- $order_by = implode( ', ', array_map( function ( $item ) {
36		- return "p.$item";
37		- }, (array) $order_by ) );
38		-
39		-
40		- /** @noinspection SqlNoDataSourceInspection */
41		- return $wpdb->get_results(
42		- $wpdb->prepare( <<<EOF
	10	+ public static function get_post_types_as_string( $post_types ) {
	11	+ if ( $post_types === array() ) {
	12	+ $post_types = get_post_types();
	13	+ }
	14	+ $post_types = array_map( function ( $post_type ) {
	15	+ return "'" . esc_sql( $post_type ) . "'";
	16	+ }, $post_types );
	17	+
	18	+ return implode( ',', $post_types );
	19	+ }
	20	+
	21	+ public static function post_navigator_get_results(
	22	+ $post_id, $fields = array(
	23	+ 'ID',
	24	+ 'post_title',
	25	+ ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
	26	+ ) {
	27	+
	28	+ $post_types = self::get_post_types_as_string( $post_types );
	29	+ global $wpdb;
	30	+
	31	+ $select = implode( ', ', array_map( function ( $item ) {
	32	+ return "p.$item AS $item";
	33	+ }, (array) $fields ) );
	34	+
	35	+ $order_by = implode( ', ', array_map( function ( $item ) {
	36	+ return "p.$item";
	37	+ }, (array) $order_by ) );
	38	+
	39	+
	40	+ /** @noinspection SqlNoDataSourceInspection */
	41	+ return $wpdb->get_results(
	42	+ $wpdb->prepare( <<<EOF
43	43	SELECT %4\$s, p2.ID as entity_id
44	44	FROM {$wpdb->prefix}wl_relation_instances r1
45	45	INNER JOIN {$wpdb->prefix}wl_relation_instances r2
		@@ -73,33 +73,33 @@ discard block
		block discarded – undo
73	73	LIMIT %2\$d
74	74	OFFSET %3\$d
75	75	EOF
76		- , $post_id, $limit, $offset, $select, $order_by )
77		- );
	76	+ , $post_id, $limit, $offset, $select, $order_by )
	77	+ );
78	78
79		- }
	79	+ }
80	80
81	81
82		- public static function entity_navigator_get_results(
83		- $post_id, $fields = array(
84		- 'ID',
85		- 'post_title',
86		- ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
87		- ) {
88		- global $wpdb;
	82	+ public static function entity_navigator_get_results(
	83	+ $post_id, $fields = array(
	84	+ 'ID',
	85	+ 'post_title',
	86	+ ), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
	87	+ ) {
	88	+ global $wpdb;
89	89
90		- $select = implode( ', ', array_map( function ( $item ) {
91		- return "p.$item AS $item";
92		- }, (array) $fields ) );
	90	+ $select = implode( ', ', array_map( function ( $item ) {
	91	+ return "p.$item AS $item";
	92	+ }, (array) $fields ) );
93	93
94		- $order_by = implode( ', ', array_map( function ( $item ) {
95		- return "p.$item";
96		- }, (array) $order_by ) );
	94	+ $order_by = implode( ', ', array_map( function ( $item ) {
	95	+ return "p.$item";
	96	+ }, (array) $order_by ) );
97	97
98		- $post_types = self::get_post_types_as_string( $post_types );
	98	+ $post_types = self::get_post_types_as_string( $post_types );
99	99
100		- /** @noinspection SqlNoDataSourceInspection */
101		- return $wpdb->get_results(
102		- $wpdb->prepare( <<<EOF
	100	+ /** @noinspection SqlNoDataSourceInspection */
	101	+ return $wpdb->get_results(
	102	+ $wpdb->prepare( <<<EOF
103	103	SELECT %4\$s, p2.ID as entity_id
104	104	FROM {$wpdb->prefix}wl_relation_instances r1
105	105	-- get the ID of the post entity in common between the object and the subject 2.
		@@ -130,9 +130,9 @@ discard block
		block discarded – undo
130	130	LIMIT %2\$d
131	131	OFFSET %3\$d
132	132	EOF
133		- , $post_id, $limit, $offset, $select, $order_by )
134		- );
135		- }
	133	+ , $post_id, $limit, $offset, $select, $order_by )
	134	+ );
	135	+ }
136	136
137	137
138	138	}

		@@ -7,15 +7,15 @@ discard block
		block discarded – undo
7	7	*/
8	8	class Navigator_Data {
9	9
10		- public static function get_post_types_as_string( $post_types ) {
11		- if ( $post_types === array() ) {
	10	+ public static function get_post_types_as_string($post_types) {
	11	+ if ($post_types === array()) {
12	12	$post_types = get_post_types();
13	13	}
14		- $post_types = array_map( function ( $post_type ) {
15		- return "'" . esc_sql( $post_type ) . "'";
16		- }, $post_types );
	14	+ $post_types = array_map(function($post_type) {
	15	+ return "'".esc_sql($post_type)."'";
	16	+ }, $post_types);
17	17
18		- return implode( ',', $post_types );
	18	+ return implode(',', $post_types);
19	19	}
20	20
21	21	public static function post_navigator_get_results(
		@@ -25,21 +25,21 @@ discard block
		block discarded – undo
25	25	), $order_by = 'ID DESC', $limit = 10, $offset = 0, $post_types = array()
26	26	) {
27	27
28		- $post_types = self::get_post_types_as_string( $post_types );
	28	+ $post_types = self::get_post_types_as_string($post_types);
29	29	global $wpdb;
30	30
31		- $select = implode( ', ', array_map( function ( $item ) {
	31	+ $select = implode(', ', array_map(function($item) {
32	32	return "p.$item AS $item";
33		- }, (array) $fields ) );
	33	+ }, (array) $fields));
34	34
35		- $order_by = implode( ', ', array_map( function ( $item ) {
	35	+ $order_by = implode(', ', array_map(function($item) {
36	36	return "p.$item";
37		- }, (array) $order_by ) );
	37	+ }, (array) $order_by));
38	38
39	39
40	40	/** @noinspection SqlNoDataSourceInspection */
41	41	return $wpdb->get_results(
42		- $wpdb->prepare( <<<EOF
	42	+ $wpdb->prepare(<<<EOF
43	43	SELECT %4\$s, p2.ID as entity_id
44	44	FROM {$wpdb->prefix}wl_relation_instances r1
45	45	INNER JOIN {$wpdb->prefix}wl_relation_instances r2
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	LIMIT %2\$d
74	74	OFFSET %3\$d
75	75	EOF
76		- , $post_id, $limit, $offset, $select, $order_by )
	76	+ , $post_id, $limit, $offset, $select, $order_by)
77	77	);
78	78
79	79	}
		@@ -87,19 +87,19 @@ discard block
		block discarded – undo
87	87	) {
88	88	global $wpdb;
89	89
90		- $select = implode( ', ', array_map( function ( $item ) {
	90	+ $select = implode(', ', array_map(function($item) {
91	91	return "p.$item AS $item";
92		- }, (array) $fields ) );
	92	+ }, (array) $fields));
93	93
94		- $order_by = implode( ', ', array_map( function ( $item ) {
	94	+ $order_by = implode(', ', array_map(function($item) {
95	95	return "p.$item";
96		- }, (array) $order_by ) );
	96	+ }, (array) $order_by));
97	97
98		- $post_types = self::get_post_types_as_string( $post_types );
	98	+ $post_types = self::get_post_types_as_string($post_types);
99	99
100	100	/** @noinspection SqlNoDataSourceInspection */
101	101	return $wpdb->get_results(
102		- $wpdb->prepare( <<<EOF
	102	+ $wpdb->prepare(<<<EOF
103	103	SELECT %4\$s, p2.ID as entity_id
104	104	FROM {$wpdb->prefix}wl_relation_instances r1
105	105	-- get the ID of the post entity in common between the object and the subject 2.
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	LIMIT %2\$d
131	131	OFFSET %3\$d
132	132	EOF
133		- , $post_id, $limit, $offset, $select, $order_by )
	133	+ , $post_id, $limit, $offset, $select, $order_by)
134	134	);
135	135	}
136	136

		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	*/
53	53	public function __construct() {
54	54
55		- self::$log = Wordlift_Log_Service::get_logger( get_class() );
	55	+ self::$log = Wordlift_Log_Service::get_logger(get_class());
56	56
57	57	global $wpdb;
58	58
		@@ -96,24 +96,24 @@ discard block
		block discarded – undo
96	96	* @return array\|object\|null Database query results
97	97	* @since 3.15.0
98	98	*/
99		- public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array() ) {
	99	+ public function get_article_subjects($object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array()) {
100	100	global $wpdb;
101	101
102	102	// The output fields.
103		- $actual_fields = self::fields( $fields );
	103	+ $actual_fields = self::fields($fields);
104	104
105		- self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
	105	+ self::$log->trace('Getting article subjects for object '.implode(', ', (array) $object_id).'...');
106	106
107		- $objects = $this->article_id_to_entity_id( $object_id );
	107	+ $objects = $this->article_id_to_entity_id($object_id);
108	108
109	109	// If there are no related objects, return an empty array.
110		- if ( empty( $objects ) ) {
111		- self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
	110	+ if (empty($objects)) {
	111	+ self::$log->debug('No entities found for object '.implode(', ', (array) $object_id).'.');
112	112
113	113	return array();
114	114	}
115	115
116		- self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
	116	+ self::$log->debug(count($objects).' entity id(s) found for object '.implode(', ', (array) $object_id).'.');
117	117
118	118	$sql =
119	119	"
		@@ -123,19 +123,19 @@ discard block
		block discarded – undo
123	123	ON p.id = r.subject_id
124	124	"
125	125	// Add the status clause.
126		- . self::and_status( $status )
	126	+ . self::and_status($status)
127	127	. self::inner_join_is_article()
128		- . self::where_object_id( $objects )
	128	+ . self::where_object_id($objects)
129	129	// Since `object_id` can be an article ID we need to exclude it from
130	130	// the results.
131		- . self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
132		- . self::and_article_in( $include )
133		- . self::and_post_type_in( $post_types )
134		- . self::and_predicate( $predicate )
135		- . self::order_by( $order_by )
136		- . self::limit( $limit );
137		-
138		- return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
	131	+ . self::and_article_not_in(array_merge($excludes, (array) $object_id))
	132	+ . self::and_article_in($include)
	133	+ . self::and_post_type_in($post_types)
	134	+ . self::and_predicate($predicate)
	135	+ . self::order_by($order_by)
	136	+ . self::limit($limit);
	137	+
	138	+ return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
139	139	}
140	140
141	141	/**
		@@ -147,16 +147,16 @@ discard block
		block discarded – undo
147	147	* @return string The `post_type IN` clause.
148	148	* @since 3.15.3
149	149	*/
150		- private static function and_post_type_in( $post_types = array() ) {
	150	+ private static function and_post_type_in($post_types = array()) {
151	151
152		- if ( $post_types === array() ) {
	152	+ if ($post_types === array()) {
153	153	$post_types = Wordlift_Entity_Service::valid_entity_post_types();
154	154	}
155	155
156	156	return " AND p.post_type IN ( '"
157	157	. implode(
158	158	"','",
159		- array_map( 'esc_sql', $post_types )
	159	+ array_map('esc_sql', $post_types)
160	160	)
161	161	. "' )";
162	162	}
		@@ -170,9 +170,9 @@ discard block
		block discarded – undo
170	170	* @since 3.15.0
171	171	*
172	172	*/
173		- private static function limit( $limit = null ) {
	173	+ private static function limit($limit = null) {
174	174
175		- if ( null === $limit ) {
	175	+ if (null === $limit) {
176	176	return '';
177	177	}
178	178
		@@ -184,14 +184,14 @@ discard block
		block discarded – undo
184	184	*
185	185	* @return string
186	186	*/
187		- private static function order_by( $order_by ) {
188		- if ( ! $order_by ) {
	187	+ private static function order_by($order_by) {
	188	+ if ( ! $order_by) {
189	189	return '';
190	190	}
191	191	$order_by = (string) $order_by;
192		- $order_by_clauses = array( 'DESC', 'ASC' );
	192	+ $order_by_clauses = array('DESC', 'ASC');
193	193
194		- if ( in_array( $order_by, $order_by_clauses, true ) ) {
	194	+ if (in_array($order_by, $order_by_clauses, true)) {
195	195	return " ORDER BY p.post_modified ${order_by} ";
196	196	} else {
197	197	return ' ORDER BY p.post_modified DESC ';
		@@ -208,19 +208,19 @@ discard block
		block discarded – undo
208	208	* @since 3.15.0
209	209	*
210	210	*/
211		- private function article_id_to_entity_id( $object_id ) {
	211	+ private function article_id_to_entity_id($object_id) {
212	212
213	213	$entity_service = Wordlift_Entity_Service::get_instance();
214	214
215	215	$relation_service = $this;
216	216
217		- return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
218		- if ( $entity_service->is_entity( $item ) ) {
219		- return array_merge( $carry, (array) $item );
	217	+ return array_reduce((array) $object_id, function($carry, $item) use ($entity_service, $relation_service) {
	218	+ if ($entity_service->is_entity($item)) {
	219	+ return array_merge($carry, (array) $item);
220	220	}
221	221
222		- return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
223		- }, array() );
	222	+ return array_merge($carry, $relation_service->get_objects($item, 'ids'));
	223	+ }, array());
224	224
225	225	}
226	226
		@@ -233,15 +233,15 @@ discard block
		block discarded – undo
233	233	* @since 3.15.0
234	234	*
235	235	*/
236		- private static function where_object_id( $object_id ) {
	236	+ private static function where_object_id($object_id) {
237	237
238		- if ( empty( $object_id ) ) {
	238	+ if (empty($object_id)) {
239	239	// self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
240	240
241	241	return ' WHERE 1 = 1';
242	242	}
243	243
244		- return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
	244	+ return ' WHERE r.object_id IN ( '.implode(',', wp_parse_id_list((array) $object_id)).' )';
245	245	}
246	246
247	247	/**
		@@ -253,9 +253,9 @@ discard block
		block discarded – undo
253	253	* @since 3.15.0
254	254	*
255	255	*/
256		- private static function and_article_not_in( $exclude ) {
	256	+ private static function and_article_not_in($exclude) {
257	257
258		- return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
	258	+ return ' AND NOT p.ID IN ( '.implode(',', wp_parse_id_list((array) $exclude)).' )';
259	259	}
260	260
261	261	/**
		@@ -268,13 +268,13 @@ discard block
		block discarded – undo
268	268	* @since 3.15.0
269	269	*
270	270	*/
271		- private static function and_article_in( $include = null ) {
	271	+ private static function and_article_in($include = null) {
272	272
273		- if ( null === $include ) {
	273	+ if (null === $include) {
274	274	return '';
275	275	}
276	276
277		- return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
	277	+ return ' AND p.ID IN ( '.implode(',', wp_parse_id_list((array) $include)).' )';
278	278	}
279	279
280	280	/**
		@@ -289,11 +289,11 @@ discard block
		block discarded – undo
289	289	* @since 3.15.0
290	290	*
291	291	*/
292		- public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
	292	+ public function get_non_article_subjects($object_id, $fields = '*', $status = null) {
293	293	global $wpdb;
294	294
295	295	// The output fields.
296		- $actual_fields = self::fields( $fields );
	296	+ $actual_fields = self::fields($fields);
297	297
298	298	$sql = $wpdb->prepare(
299	299	"
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	ON p.id = r.subject_id
304	304	"
305	305	// Add the status clause.
306		- . self::and_status( $status )
	306	+ . self::and_status($status)
307	307	. self::inner_join_is_not_article()
308	308	. " WHERE r.object_id = %d "
309	309	. self::and_post_type_in()
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	$object_id
312	312	);
313	313
314		- return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
	314	+ return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
315	315	}
316	316
317	317	/**
		@@ -327,11 +327,11 @@ discard block
		block discarded – undo
327	327	* @since 3.15.0
328	328	*
329	329	*/
330		- public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
	330	+ public function get_objects($subject_id, $fields = '*', $predicate = null, $status = null) {
331	331	global $wpdb;
332	332
333	333	// The output fields.
334		- $actual_fields = self::fields( $fields );
	334	+ $actual_fields = self::fields($fields);
335	335
336	336	$sql = $wpdb->prepare(
337	337	"
		@@ -341,16 +341,16 @@ discard block
		block discarded – undo
341	341	ON p.id = r.object_id
342	342	"
343	343	// Add the status clause.
344		- . self::and_status( $status )
	344	+ . self::and_status($status)
345	345	. self::inner_join_is_not_article()
346	346	. " WHERE r.subject_id = %d "
347	347	. self::and_post_type_in()
348		- . self::and_predicate( $predicate )
	348	+ . self::and_predicate($predicate)
349	349	,
350	350	$subject_id
351	351	);
352	352
353		- return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
	353	+ return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
354	354	}
355	355
356	356	/**
		@@ -362,13 +362,13 @@ discard block
		block discarded – undo
362	362	* @since 3.15.0
363	363	*
364	364	*/
365		- private static function and_status( $status = null ) {
	365	+ private static function and_status($status = null) {
366	366
367		- if ( null === $status ) {
	367	+ if (null === $status) {
368	368	return '';
369	369	}
370	370
371		- return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
	371	+ return " AND p.post_status IN ('".implode("', '", array_map('esc_sql', (array) $status))."')";
372	372	}
373	373
374	374	/**
		@@ -381,13 +381,13 @@ discard block
		block discarded – undo
381	381	* @since 3.15.0
382	382	*
383	383	*/
384		- private static function and_predicate( $predicate = null ) {
	384	+ private static function and_predicate($predicate = null) {
385	385
386		- if ( null === $predicate ) {
	386	+ if (null === $predicate) {
387	387	return '';
388	388	}
389	389
390		- return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
	390	+ return " AND r.predicate IN ('".implode("', '", array_map('esc_sql', (array) $predicate))."')";
391	391	}
392	392
393	393	/**
		@@ -399,7 +399,7 @@ discard block
		block discarded – undo
399	399	* @since 3.15.0
400	400	*
401	401	*/
402		- private static function fields( $fields = '*' ) {
	402	+ private static function fields($fields = '*') {
403	403
404	404	// The output fields.
405	405	return 'ids' === $fields ? 'id' : '*';

insideout10 / wordlift-plugin

Pull Request — develop (#1255)

Status

Category

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +220 added lines, -220 removed lines patch added patch discarded remove patch

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

Unused Use Statements -1 removed lines patch added patch discarded remove patch

Indentation +257 added lines, -257 removed lines patch added patch discarded remove patch

Spacing +103 added lines, -103 removed lines patch added patch discarded remove patch

Indentation +200 added lines, -200 removed lines patch added patch discarded remove patch

Spacing +69 added lines, -71 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +94 added lines, -94 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +56 added lines, -56 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +420 added lines, -420 removed lines patch added patch discarded remove patch

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch