insideout10 / wordlift-plugin

src/shortcodes/wordlift_shortcode_navigator.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
  */
 
 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;
 use Wordlift\Widgets\Srcset_Util;

Indentation +262 added lines, -262 removed lines

@@ -20,29 +20,29 @@ 
  */
 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;
 }
 
 /**
@@ -57,236 +57,236 @@ 
  */
 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,
-				'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
-			),
-			'entity' => array(
-				'id'        => $referencing_post->entity_id,
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$results[] = $result;
-	}
-
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	// Add filler posts if needed
-	$filler_count = $navigator_length - count( $results );
-	if ( $filler_count > 0 ) {
-		$referencing_post_ids = array_map( function ( $p ) {
-			return $p->ID;
-		}, $referencing_posts );
-		/**
-		 * @since 3.27.8
-		 * Filler posts are fetched using this util.
-		 */
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
-		$results                 = array_merge( $results, $filler_posts );
-	}
-
-	// Apply filters after fillers are added
-	foreach ( $results as $result_index => $result ) {
-		$results[ $result_index ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
-		$results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
-	}
-
-	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,
+                'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
+            ),
+            'entity' => array(
+                'id'        => $referencing_post->entity_id,
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $results[] = $result;
+    }
+
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    // Add filler posts if needed
+    $filler_count = $navigator_length - count( $results );
+    if ( $filler_count > 0 ) {
+        $referencing_post_ids = array_map( function ( $p ) {
+            return $p->ID;
+        }, $referencing_posts );
+        /**
+         * @since 3.27.8
+         * Filler posts are fetched using this util.
+         */
+        $filler_posts_util       = new Filler_Posts_Util( $current_post_id );
+        $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
+        $filler_posts            = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
+        $results                 = array_merge( $results, $filler_posts );
+    }
+
+    // Apply filters after fillers are added
+    foreach ( $results as $result_index => $result ) {
+        $results[ $result_index ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
+        $results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+    }
+
+    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. 
@@ -312,8 +312,8 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -325,9 +325,9 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	// Temporary blocking the Navigator.
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+    // Temporary blocking the Navigator.
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json( $results );
 
 }
 
@@ -339,16 +339,16 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	return array(
-		'items' => array(
-			array( 'values' => $results ),
-		),
-	);
+    return array(
+        'items' => array(
+            array( 'values' => $results ),
+        ),
+    );
 
 }
 
@@ -356,22 +356,22 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-		'methods'             => 'GET',
-		'permission_callback' => '__return_true',
-		'callback'            => 'wl_shortcode_navigator_wp_json'
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods'             => 'GET',
+        'permission_callback' => '__return_true',
+        'callback'            => 'wl_shortcode_navigator_wp_json'
+    ) );
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
-		'methods'             => 'GET',
-		'callback'            => 'wl_network_navigator_wp_json',
-		'permission_callback' => '__return_true',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+        'methods'             => 'GET',
+        'callback'            => 'wl_network_navigator_wp_json',
+        'permission_callback' => '__return_true',
+    ) );
 } );
 
 /**
@@ -380,23 +380,23 @@ 
  * @since 2.2.0
  */
 add_action( 'plugins_loaded', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
-
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    $action = array_key_exists( 'action', $_REQUEST ) ? $_REQUEST['action'] : '';
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+        return;
+    }
+
+    remove_action( 'plugins_loaded', 'rocket_init' );
+    remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+    remove_action( 'plugins_loaded', 'wpseo_init', 14 );
 }, 0 );
 
 add_action( 'init', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
+    $action = array_key_exists( 'action', $_REQUEST ) ? $_REQUEST['action'] : '';
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+        return;
+    }
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
+    remove_action( 'init', 'wp_widgets_init', 1 );
+    remove_action( 'init', 'gglcptch_init' );
 }, 0 );
 

Spacing +106 added lines, -106 removed lines

@@ -22,25 +22,25 @@ 
 
 	// 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;
 }
@@ -55,29 +55,29 @@ 
  * @since 3.22.6
  *
  */
-function wl_network_navigator_wp_json( $request ) {
+function wl_network_navigator_wp_json($request) {
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("network-navigator", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
-	$results = _wl_network_navigator_get_data( $request );
+	$results = _wl_network_navigator_get_data($request);
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 
@@ -86,58 +86,58 @@ 
 function _wl_navigator_get_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_send_json_error('No post_id given');
 
 		return array();
 	}
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['uniqid'] ) ) {
-		wp_send_json_error( 'No uniqid given' );
+	if ( ! isset($_GET['uniqid'])) {
+		wp_send_json_error('No uniqid given');
 
 		return array();
 	}
 
 	// Limit the results (defaults to 4)
-	$navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
+	$navigator_length    = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
+	$navigator_offset    = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
+	$order_by            = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
+	$post_types          = isset($_GET['post_types']) ? (string) $_GET['post_types'] : '';
+	$post_types          = explode(',', $post_types);
 	$existing_post_types = get_post_types();
-	$post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
+	$post_types          = array_values(array_intersect($existing_post_types, $post_types));
 	$current_post_id     = $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
+	$current_post        = get_post($current_post_id);
 
 	$navigator_id = $_GET['uniqid'];
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_send_json_error('No valid post_id given');
 
 		return array();
 	}
 
 	// Determine navigator type and call respective _get_results
-	if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+	if (get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME) {
 
-		$referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
+		$referencing_posts = Navigator_Data::entity_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
+		), $order_by, $navigator_length, $navigator_offset, $post_types);
 	} else {
-		$referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
+		$referencing_posts = Navigator_Data::post_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
+		), $order_by, $navigator_length, $navigator_offset, $post_types);
 
 	}
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -147,21 +147,21 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
 				'id'        => $referencing_post->ID,
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
-				'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
+				'srcset'    => Srcset_Util::get_srcset($referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET)
 			),
 			'entity' => array(
 				'id'        => $referencing_post->entity_id,
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
@@ -169,59 +169,59 @@ 
 	}
 
 
-	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( $results, $filler_posts );
+		$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($results, $filler_posts);
 	}
 
 	// Apply filters after fillers are added
-	foreach ( $results as $result_index => $result ) {
-		$results[ $result_index ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
-		$results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+	foreach ($results as $result_index => $result) {
+		$results[$result_index]['post']   = apply_filters('wl_navigator_data_post', $result['post'], intval($result['post']['id']), $navigator_id);
+		$results[$result_index]['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($result['entity']['id']), $navigator_id);
 	}
 
 	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.
@@ -231,30 +231,30 @@ 
 		 *
 		 * @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;
@@ -269,24 +269,24 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
-		if ( isset( $entity ) ) {
+	$entities_in = implode(',', array_map(function($item) {
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
+		if (isset($entity)) {
 			return $entity->ID;
 		}
-	}, $entities ) );
+	}, $entities));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -312,7 +312,7 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -327,12 +327,12 @@ 
 
 	// Temporary blocking the Navigator.
 	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -340,13 +340,13 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
 	return array(
 		'items' => array(
-			array( 'values' => $results ),
+			array('values' => $results),
 		),
 	);
 
@@ -355,23 +355,23 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 		'methods'             => 'GET',
 		'permission_callback' => '__return_true',
 		'callback'            => 'wl_shortcode_navigator_wp_json'
-	) );
+	));
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
 		'methods'             => 'GET',
 		'callback'            => 'wl_network_navigator_wp_json',
 		'permission_callback' => '__return_true',
-	) );
+	));
 } );
 
 /**
@@ -379,24 +379,24 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('plugins_loaded', function() {
+	$action = array_key_exists('action', $_REQUEST) ? $_REQUEST['action'] : '';
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $action) {
 		return;
 	}
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-}, 0 );
+	remove_action('plugins_loaded', 'rocket_init');
+	remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+	remove_action('plugins_loaded', 'wpseo_init', 14);
+}, 0);
 
-add_action( 'init', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('init', function() {
+	$action = array_key_exists('action', $_REQUEST) ? $_REQUEST['action'] : '';
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $action) {
 		return;
 	}
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
-}, 0 );
+	remove_action('init', 'wp_widgets_init', 1);
+	remove_action('init', 'gglcptch_init');
+}, 0);
 

src/public/class-wordlift-faceted-search-shortcode.php

Indentation +221 added lines, -221 removed lines

@@ -19,116 +19,116 @@ 
  */
 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' => $scope->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' );
-		$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' => $scope->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' );
+        $template_url = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
+
+        return <<<HTML
 			<!-- Faceted {$faceted_id} -->
 			<div id="{$faceted_id}" 
 				 class="wl-faceted" 
@@ -138,60 +138,60 @@ 
 				 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' );
-		}
-
-		$srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
-
-		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' );
+        }
+
+        $srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+
+        return <<<HTML
 		<div id="{$faceted_id}" class="wl-amp-faceted">
 			<h2 class="wl-headline">{$title}</h2>
 			<amp-state id="referencedPosts">
@@ -275,62 +275,62 @@ 
 			</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;
+    }
 
 }

Spacing +57 added lines, -57 removed lines

@@ -32,35 +32,35 @@ 
 	/**
 	 * {@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' => $scope->get_block_attributes(),
-			) );
+			));
 		} );
 	}
 
@@ -74,17 +74,17 @@ 
 	 * @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;
 	}
@@ -98,35 +98,35 @@ 
 	 * @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' );
-		$template_url = get_rest_url( null, '/wordlift/v1/faceted-search/template' );
+		wp_enqueue_script('wordlift-cloud');
+		$template_url = get_rest_url(null, '/wordlift/v1/faceted-search/template');
 
 		return <<<HTML
 			<!-- Faceted {$faceted_id} -->
@@ -149,47 +149,47 @@ 
 	 * @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');
 		}
 
-		$srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+		$srcset = Srcset_Util::get_srcset($post->ID, Srcset_Util::FACETED_SEARCH_WIDGET);
 
 		return <<<HTML
 		<div id="{$faceted_id}" class="wl-amp-faceted">
@@ -281,7 +281,7 @@ 
 		return array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'template_id' => array(
 				'type'    => 'string',
@@ -297,7 +297,7 @@ 
 			),
 			'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',
@@ -305,7 +305,7 @@ 
 			),
 			'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',
@@ -323,12 +323,12 @@ 
 	 *
 	 * @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;
 	}

src/public/class-wordlift-navigator-shortcode.php

Indentation +191 added lines, -191 removed lines

@@ -19,122 +19,122 @@ 
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
 
-	public function __construct() {
-		parent::__construct();
-		$this->register_block_type();
-	}
+    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 );
-	}
+    /**
+     * {@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() {
+    private function register_block_type() {
 
-		$scope = $this;
+        $scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
-				// Gutenberg is not active.
-				return;
-			}
+        add_action( 'init', function () use ( $scope ) {
+            if ( ! function_exists( 'register_block_type' ) ) {
+                // Gutenberg is not active.
+                return;
+            }
 
-			register_block_type( 'wordlift/navigator', array(
-				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
-					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-					}
+            register_block_type( 'wordlift/navigator', 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'      => $scope->get_navigator_block_attributes(),
-			) );
-		} );
-	}
+                    return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                },
+                'attributes'      => $scope->get_navigator_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 ) {
+    /**
+     * 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'       => 4,
-			'offset'      => 0,
-			'template_id' => '',
-			'post_id'     => '',
-			'uniqid'      => uniqid( 'wl-navigator-widget-' ),
-			'order_by'    => 'ID DESC',
-			'post_types'  => '',
-		), $atts );
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'       => __( 'Related articles', 'wordlift' ),
+            'limit'       => 4,
+            'offset'      => 0,
+            'template_id' => '',
+            'post_id'     => '',
+            'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+            'order_by'    => 'ID DESC',
+            'post_types'  => '',
+        ), $atts );
 
-		return $shortcode_atts;
-	}
+        return $shortcode_atts;
+    }
 
-	/**
-	 * Function in charge of displaying the [wl-navigator] in web mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 * @since 3.20.0
-	 *
-	 */
-	private function web_shortcode( $atts ) {
+    /**
+     * Function in charge of displaying the [wl-navigator] 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 );
+        // 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;
-		}
+        // 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( $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'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $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'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
 
-		$rest_url = $post ? admin_url( 'admin-ajax.php?' . build_query( array(
-				'action'     => 'wl_navigator',
-				'uniqid'     => $navigator_id,
-				'post_id'    => $post->ID,
-				'limit'      => $limit,
-				'offset'     => $offset,
-				'sort'       => $sort,
-				'post_types' => $shortcode_atts['post_types']
-			) ) ) : false;
+        $rest_url = $post ? admin_url( 'admin-ajax.php?' . build_query( array(
+                'action'     => 'wl_navigator',
+                'uniqid'     => $navigator_id,
+                'post_id'    => $post->ID,
+                'limit'      => $limit,
+                'offset'     => $offset,
+                'sort'       => $sort,
+                'post_types' => $shortcode_atts['post_types']
+            ) ) ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
+        wp_enqueue_script( 'wordlift-cloud' );
+        $template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
 
-		return <<<HTML
+        return <<<HTML
 			<!-- Navigator {$navigator_id} -->
 			<div id="{$navigator_id}" 
 				 class="wl-navigator" 
@@ -145,59 +145,59 @@ 
 				 data-limit="{$limit}"></div>
 			<!-- /Navigator {$navigator_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 );
+    /**
+     * 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;
-		}
+        // 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( $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'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $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'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query( array(
-				'uniqid'  => $navigator_id,
-				'post_id' => $post->ID,
-				'limit'   => $limit,
-				'offset'  => $offset,
-				'sort'    => $sort
-			) ) ) : false;
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query( array(
+                'uniqid'  => $navigator_id,
+                'post_id' => $post->ID,
+                'limit'   => $limit,
+                'offset'  => $offset,
+                'sort'    => $sort
+            ) ) ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // 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 );
+        // 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-" . $navigator_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-" . $navigator_id;
+            wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+        }
 
-		return <<<HTML
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-amp-navigator" style="width: 100%">
 			<h3 class="wl-headline">{$title}</h3>
 			<amp-list 
@@ -230,54 +230,54 @@ 
 			</div>
 		</template>
 HTML;
-	}
+    }
 
-	/**
-	 * @return array
-	 */
-	public function get_navigator_block_attributes() {
-		return array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => 4,
-			),
-			'template_id' => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'post_id'     => array(
-				'type'    => 'number',
-				'default' => '',
-			),
-			'offset'      => array(
-				'type'    => 'number',
-				'default' => 0,
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'order_by'    => array(
-				'type'    => 'string',
-				'default' => 'ID DESC',
-			),
-			'preview'     => array(
-				'type'    => 'boolean',
-				'default' => false,
-			),
-			'preview_src' => array(
-				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
-			),
-			'post_types'  => array(
-				'type'    => 'string',
-				'default' => '',
-			)
-		);
-	}
+    /**
+     * @return array
+     */
+    public function get_navigator_block_attributes() {
+        return array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => 4,
+            ),
+            'template_id' => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'post_id'     => array(
+                'type'    => 'number',
+                'default' => '',
+            ),
+            'offset'      => array(
+                'type'    => 'number',
+                'default' => 0,
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'order_by'    => array(
+                'type'    => 'string',
+                'default' => 'ID DESC',
+            ),
+            'preview'     => array(
+                'type'    => 'boolean',
+                'default' => false,
+            ),
+            'preview_src' => array(
+                'type'    => 'string',
+                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
+            ),
+            'post_types'  => array(
+                'type'    => 'string',
+                'default' => '',
+            )
+        );
+    }
 
 }

Spacing +52 added lines, -52 removed lines

@@ -32,33 +32,33 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+	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' ) ) {
+		add_action('init', function() use ($scope) {
+			if ( ! function_exists('register_block_type')) {
 				// Gutenberg is not active.
 				return;
 			}
 
-			register_block_type( 'wordlift/navigator', array(
+			register_block_type('wordlift/navigator', 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'      => $scope->get_navigator_block_attributes(),
-			) );
+			));
 		} );
 	}
 
@@ -72,19 +72,19 @@ 
 	 * @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' ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'       => __('Related articles', 'wordlift'),
 			'limit'       => 4,
 			'offset'      => 0,
 			'template_id' => '',
 			'post_id'     => '',
-			'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+			'uniqid'      => uniqid('wl-navigator-widget-'),
 			'order_by'    => 'ID DESC',
 			'post_types'  => '',
-		), $atts );
+		), $atts);
 
 		return $shortcode_atts;
 	}
@@ -98,25 +98,25 @@ 
 	 * @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( $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'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($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']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-navigator-widget-');
 
-		$rest_url = $post ? admin_url( 'admin-ajax.php?' . build_query( array(
+		$rest_url = $post ? admin_url('admin-ajax.php?'.build_query(array(
 				'action'     => 'wl_navigator',
 				'uniqid'     => $navigator_id,
 				'post_id'    => $post->ID,
@@ -124,15 +124,15 @@ 
 				'offset'     => $offset,
 				'sort'       => $sort,
 				'post_types' => $shortcode_atts['post_types']
-			) ) ) : false;
+			))) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
+		wp_enqueue_script('wordlift-cloud');
+		$template_url = get_rest_url(null, '/wordlift/v1/navigator/template');
 
 		return <<<HTML
 			<!-- Navigator {$navigator_id} -->
@@ -156,45 +156,45 @@ 
 	 * @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( $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'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($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']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-navigator-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url( WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query( array(
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
+		$rest_url            = $post ? rest_url(WL_REST_ROUTE_DEFAULT_NAMESPACE.'/navigator'.$delimiter.build_query(array(
 				'uniqid'  => $navigator_id,
 				'post_id' => $post->ID,
 				'limit'   => $limit,
 				'offset'  => $offset,
 				'sort'    => $sort
-			) ) ) : false;
+			))) : 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-" . $navigator_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-".$navigator_id;
+			wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(dirname(__FILE__)).'/css/wordlift-amp-custom.min.css');
 		}
 
 		return <<<HTML
@@ -239,7 +239,7 @@ 
 		return array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'limit'       => array(
 				'type'    => 'number',
@@ -271,7 +271,7 @@ 
 			),
 			'preview_src' => array(
 				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
+				'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/navigator.png',
 			),
 			'post_types'  => array(
 				'type'    => 'string',

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

Indentation +95 added lines, -95 removed lines

@@ -9,101 +9,101 @@
  */
 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 ),
-					'srcset'    => Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET )
-				),
-				'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 ),
+                    'srcset'    => Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET )
+                ),
+                'entity' => array(
+                    'id' => 0
+                )
+            );
+        }
+
+        return $filler_response;
+    }
 
 
 }

Spacing +25 added lines, -25 removed lines

@@ -14,18 +14,18 @@ 
 	 */
 	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),
 			);
 		}
 	}
@@ -36,22 +36,22 @@ 
 	 *
 	 * @return array<int>
 	 */
-	private function extract_post_ids( $posts ) {
-		return array_map( function ( $post ) {
+	private function extract_post_ids($posts) {
+		return array_map(function($post) {
 			/**
 			 * @var $post \WP_Post
 			 */
 			return $post->ID;
-		}, $posts );
+		}, $posts);
 	}
 
-	public function get_filler_posts( $filler_count, $post_ids_to_be_excluded ) {
+	public function get_filler_posts($filler_count, $post_ids_to_be_excluded) {
 
 		$filler_posts = array();
 
-		foreach ( $this->sources as $source ) {
+		foreach ($this->sources as $source) {
 
-			if ( $filler_count <= 0 ) {
+			if ($filler_count <= 0) {
 				break;
 			}
 			/**
@@ -60,13 +60,13 @@ 
 			$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);
 
 
 		}
@@ -82,19 +82,19 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_filler_response( $filler_count, $post_ids_to_be_excluded ) {
-		$filler_posts = $this->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+	public function get_filler_response($filler_count, $post_ids_to_be_excluded) {
+		$filler_posts = $this->get_filler_posts($filler_count, $post_ids_to_be_excluded);
 		// Add thumbnail and permalink to filler posts
 		$filler_response = array();
-		foreach ( $filler_posts as $post_obj ) {
-			$thumbnail         = get_the_post_thumbnail_url( $post_obj, 'medium' );
+		foreach ($filler_posts as $post_obj) {
+			$thumbnail         = get_the_post_thumbnail_url($post_obj, 'medium');
 			$filler_response[] = array(
 				'post'   => array(
 					'id'        => $post_obj->ID,
-					'permalink' => get_permalink( $post_obj->ID ),
-					'thumbnail' => ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
-					'title'     => get_the_title( $post_obj->ID ),
-					'srcset'    => Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET )
+					'permalink' => get_permalink($post_obj->ID),
+					'thumbnail' => ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH,
+					'title'     => get_the_title($post_obj->ID),
+					'srcset'    => Srcset_Util::get_srcset($post_obj->ID, Srcset_Util::NAVIGATOR_WIDGET)
 				),
 				'entity' => array(
 					'id' => 0

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +206 added lines, -206 removed lines

@@ -20,30 +20,30 @@ 
  */
 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 );
 
 }
 
@@ -54,151 +54,151 @@ 
  * @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 );
-			$post_obj->srcset    = Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
-
-			$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 );
+            $post_obj->srcset    = Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+
+            $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
@@ -210,67 +210,67 @@ 
 				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 );
+    $post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
 
-	// Add srcset attribute.
-	$post_results = array_map( function ( $post ) {
-		$post->srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
-		return $post;
-	}, $post_results );
+    // Add srcset attribute.
+    $post_results = array_map( function ( $post ) {
+        $post->srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+        return $post;
+    }, $post_results );
 
-	$entity_results = apply_filters( 'wl_faceted_data_entities', $entity_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 );
 
 }
 
@@ -278,9 +278,9 @@ 
  * 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',
+    ) );
 } );

Spacing +73 added lines, -75 removed lines

@@ -18,7 +18,7 @@ 
  * @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(
@@ -26,24 +26,24 @@ 
 	);
 
 	// 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);
 
 }
 
@@ -53,27 +53,27 @@ 
  * @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;
 	}
@@ -83,25 +83,24 @@ 
 	// 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;
 
 
 	/**
@@ -109,7 +108,7 @@ 
 	 * 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'];
 	}
 
@@ -119,7 +118,7 @@ 
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit,
 		null,
 		$order_by,
@@ -127,19 +126,18 @@ 
 	);
 
 
-	$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,
@@ -148,8 +146,8 @@ 
 			$referencing_post_ids
 		);
 
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
+	if ($filtered_posts) {
+		foreach ($filtered_posts as $post_obj) {
 
 			/**
 			 * Use the thumbnail.
@@ -159,11 +157,11 @@ 
 			 *
 			 * @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->srcset    = Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+			$post_obj->permalink = get_permalink($post_obj->ID);
+			$post_obj->srcset    = Srcset_Util::get_srcset($post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET);
 
 			$result         = $post_obj;
 			$post_results[] = $result;
@@ -172,17 +170,17 @@ 
 
 	// 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
 
@@ -195,8 +193,8 @@ 
 	 * 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
@@ -210,21 +208,21 @@ 
 				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(
@@ -236,51 +234,51 @@ 
 					null,
 					$referencing_post_ids
 				);
-				$entity_results[]                     = $serialized_entity;
+				$entity_results[] = $serialized_entity;
 			}
 		}
 	}
 
-	$post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
+	$post_results = apply_filters('wl_faceted_data_posts', $post_results, $faceted_id);
 
 	// Add srcset attribute.
-	$post_results = array_map( function ( $post ) {
-		$post->srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+	$post_results = array_map(function($post) {
+		$post->srcset = Srcset_Util::get_srcset($post->ID, Srcset_Util::FACETED_SEARCH_WIDGET);
 		return $post;
-	}, $post_results );
+	}, $post_results);
 
-	$entity_results = apply_filters( 'wl_faceted_data_entities', $entity_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',
-	) );
+	));
 } );

src/wordlift/widgets/class-srcset-util.php

Indentation +50 added lines, -50 removed lines

@@ -7,56 +7,56 @@
  */
 class Srcset_Util {
 
-	const NAVIGATOR_WIDGET = 'navigator';
-
-	const FACETED_SEARCH_WIDGET = 'faceted_search';
-
-	public static function get_srcset( $post_id, $widget_name ) {
-
-		$srcset = array();
-		$small  = get_the_post_thumbnail_url( $post_id, 'small' );
-		$medium = get_the_post_thumbnail_url( $post_id, 'medium' );
-		$large  = get_the_post_thumbnail_url( $post_id, 'large' );
-		if ( $small && $width = self::get_image_width( $post_id, 'small' ) ) {
-			$srcset[] = $small . ' ' . $width . 'w';
-		}
-		if ( $medium && $width = self::get_image_width( $post_id, 'medium' ) ) {
-			$srcset[] = $medium . ' ' . $width . 'w';
-		}
-
-		if ( $large && $width = self::get_image_width( $post_id, 'large' ) ) {
-			$srcset[] = $large . ' ' . $width . 'w';
-		}
-
-		$srcset_string = join( ",", $srcset );
-
-		/**
-		 * Filter name: wordlift_${widget_name}_thumbnail_srcset
-		 * Filters the srcset string supplied to widgets for each post.
-		 *
-		 * @param $srcset_string string The srcset string
-		 *
-		 * @since 3.28.0
-		 */
-		$srcset_string = apply_filters( "wordlift_${widget_name}_thumbnail_srcset", $srcset_string );
-
-		return $srcset_string;
-
-	}
-
-
-	private static function get_image_width( $post_id, $size ) {
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
-		if ( ! $thumbnail_id ) {
-			return false;
-		}
-		$data = wp_get_attachment_image_src( $thumbnail_id, $size );
-		if ( ! $data ) {
-			return false;
-		}
-
-		return array_key_exists( 2, $data ) ? $data[2] : false;
-	}
+    const NAVIGATOR_WIDGET = 'navigator';
+
+    const FACETED_SEARCH_WIDGET = 'faceted_search';
+
+    public static function get_srcset( $post_id, $widget_name ) {
+
+        $srcset = array();
+        $small  = get_the_post_thumbnail_url( $post_id, 'small' );
+        $medium = get_the_post_thumbnail_url( $post_id, 'medium' );
+        $large  = get_the_post_thumbnail_url( $post_id, 'large' );
+        if ( $small && $width = self::get_image_width( $post_id, 'small' ) ) {
+            $srcset[] = $small . ' ' . $width . 'w';
+        }
+        if ( $medium && $width = self::get_image_width( $post_id, 'medium' ) ) {
+            $srcset[] = $medium . ' ' . $width . 'w';
+        }
+
+        if ( $large && $width = self::get_image_width( $post_id, 'large' ) ) {
+            $srcset[] = $large . ' ' . $width . 'w';
+        }
+
+        $srcset_string = join( ",", $srcset );
+
+        /**
+         * Filter name: wordlift_${widget_name}_thumbnail_srcset
+         * Filters the srcset string supplied to widgets for each post.
+         *
+         * @param $srcset_string string The srcset string
+         *
+         * @since 3.28.0
+         */
+        $srcset_string = apply_filters( "wordlift_${widget_name}_thumbnail_srcset", $srcset_string );
+
+        return $srcset_string;
+
+    }
+
+
+    private static function get_image_width( $post_id, $size ) {
+        $thumbnail_id = get_post_thumbnail_id( $post_id );
+        if ( ! $thumbnail_id ) {
+            return false;
+        }
+        $data = wp_get_attachment_image_src( $thumbnail_id, $size );
+        if ( ! $data ) {
+            return false;
+        }
+
+        return array_key_exists( 2, $data ) ? $data[2] : false;
+    }
 
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -11,24 +11,24 @@ 
 
 	const FACETED_SEARCH_WIDGET = 'faceted_search';
 
-	public static function get_srcset( $post_id, $widget_name ) {
+	public static function get_srcset($post_id, $widget_name) {
 
 		$srcset = array();
-		$small  = get_the_post_thumbnail_url( $post_id, 'small' );
-		$medium = get_the_post_thumbnail_url( $post_id, 'medium' );
-		$large  = get_the_post_thumbnail_url( $post_id, 'large' );
-		if ( $small && $width = self::get_image_width( $post_id, 'small' ) ) {
-			$srcset[] = $small . ' ' . $width . 'w';
+		$small  = get_the_post_thumbnail_url($post_id, 'small');
+		$medium = get_the_post_thumbnail_url($post_id, 'medium');
+		$large  = get_the_post_thumbnail_url($post_id, 'large');
+		if ($small && $width = self::get_image_width($post_id, 'small')) {
+			$srcset[] = $small.' '.$width.'w';
 		}
-		if ( $medium && $width = self::get_image_width( $post_id, 'medium' ) ) {
-			$srcset[] = $medium . ' ' . $width . 'w';
+		if ($medium && $width = self::get_image_width($post_id, 'medium')) {
+			$srcset[] = $medium.' '.$width.'w';
 		}
 
-		if ( $large && $width = self::get_image_width( $post_id, 'large' ) ) {
-			$srcset[] = $large . ' ' . $width . 'w';
+		if ($large && $width = self::get_image_width($post_id, 'large')) {
+			$srcset[] = $large.' '.$width.'w';
 		}
 
-		$srcset_string = join( ",", $srcset );
+		$srcset_string = join(",", $srcset);
 
 		/**
 		 * Filter name: wordlift_${widget_name}_thumbnail_srcset
@@ -38,24 +38,24 @@ 
 		 *
 		 * @since 3.28.0
 		 */
-		$srcset_string = apply_filters( "wordlift_${widget_name}_thumbnail_srcset", $srcset_string );
+		$srcset_string = apply_filters("wordlift_${widget_name}_thumbnail_srcset", $srcset_string);
 
 		return $srcset_string;
 
 	}
 
 
-	private static function get_image_width( $post_id, $size ) {
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
-		if ( ! $thumbnail_id ) {
+	private static function get_image_width($post_id, $size) {
+		$thumbnail_id = get_post_thumbnail_id($post_id);
+		if ( ! $thumbnail_id) {
 			return false;
 		}
-		$data = wp_get_attachment_image_src( $thumbnail_id, $size );
-		if ( ! $data ) {
+		$data = wp_get_attachment_image_src($thumbnail_id, $size);
+		if ( ! $data) {
 			return false;
 		}
 
-		return array_key_exists( 2, $data ) ? $data[2] : false;
+		return array_key_exists(2, $data) ? $data[2] : false;
 	}