insideout10 / wordlift-plugin

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +254 added lines, -254 removed lines

@@ -16,29 +16,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", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 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;
 }
 
 /**
@@ -53,195 +53,195 @@ 
  */
 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", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 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();
-	}
-
-	// 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';
-
-	$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 = _wl_entity_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset );
-	} else {
-		$referencing_posts = _wl_navigator_get_results( $current_post_id, 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_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	return $results;
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_send_json_error( 'No post_id 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';
+
+    $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 = _wl_entity_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset );
+    } else {
+        $referencing_posts = _wl_navigator_get_results( $current_post_id, 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_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    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_navigator_get_results(
-	$post_id, $fields = array(
-	'ID',
-	'post_title',
+    $post_id, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -273,30 +273,30 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
-	);
+            , $post_id, $limit, $offset, $select, $order_by )
+    );
 
 }
 
 function _wl_entity_navigator_get_results(
-	$post_id, $fields = array(
-	'ID',
-	'post_title',
+    $post_id, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -325,36 +325,36 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
-	);
+            , $post_id, $limit, $offset, $select, $order_by )
+    );
 }
 
 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. 
@@ -380,8 +380,8 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -392,9 +392,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 );
 
 }
 
@@ -406,16 +406,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 ),
+        ),
+    );
 
 }
 
@@ -423,22 +423,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',
-		'callback'            => 'wl_shortcode_navigator_wp_json',
-		'permission_callback' => '__return_true',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods'             => 'GET',
+        'callback'            => 'wl_shortcode_navigator_wp_json',
+        'permission_callback' => '__return_true',
+    ) );
 } );
 
 /**
  * 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',
+    ) );
 } );
 
 /**
@@ -448,22 +448,22 @@ 
  */
 add_action( 'plugins_loaded', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    remove_action( 'plugins_loaded', 'rocket_init' );
+    remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+    remove_action( 'plugins_loaded', 'wpseo_init', 14 );
 }, 0 );
 
 add_action( 'init', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
+    remove_action( 'init', 'wp_widgets_init', 1 );
+    remove_action( 'init', 'gglcptch_init' );
 }, 0 );
 

Spacing +101 added lines, -101 removed lines

@@ -18,25 +18,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", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("navigator", 24 * 60 * 60); // 24 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;
 }
@@ -51,29 +51,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", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("network-navigator", 24 * 60 * 60); // 24 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;
 
@@ -82,46 +82,46 @@ 
 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();
 	}
 
 	// 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';
+	$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';
 
 	$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 ) {
-		$referencing_posts = _wl_entity_navigator_get_results( $current_post_id, array(
+	if (get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME) {
+		$referencing_posts = _wl_entity_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset );
+		), $order_by, $navigator_length, $navigator_offset);
 	} else {
-		$referencing_posts = _wl_navigator_get_results( $current_post_id, array(
+		$referencing_posts = _wl_navigator_get_results($current_post_id, 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.
@@ -131,58 +131,58 @@ 
 		 *
 		 * @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_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 	}
 
-	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);
 	}
 
 	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.
@@ -192,30 +192,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;
@@ -231,17 +231,17 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -273,7 +273,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
+			, $post_id, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -286,17 +286,17 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -325,7 +325,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
+			, $post_id, $limit, $offset, $select, $order_by)
 	);
 }
 
@@ -337,24 +337,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. 
@@ -380,7 +380,7 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -394,12 +394,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
@@ -407,13 +407,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),
 		),
 	);
 
@@ -422,23 +422,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',
 		'callback'            => 'wl_shortcode_navigator_wp_json',
 		'permission_callback' => '__return_true',
-	) );
+	));
 } );
 
 /**
  * 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',
-	) );
+	));
 } );
 
 /**
@@ -446,24 +446,24 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
+add_action('plugins_loaded', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action']) {
 		return;
 	}
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-}, 0 );
+	remove_action('plugins_loaded', 'rocket_init');
+	remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+	remove_action('plugins_loaded', 'wpseo_init', 14);
+}, 0);
 
-add_action( 'init', function () {
+add_action('init', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action']) {
 		return;
 	}
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
-}, 0 );
+	remove_action('init', 'wp_widgets_init', 1);
+	remove_action('init', 'gglcptch_init');
+}, 0);
 

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +236 added lines, -236 removed lines

@@ -18,30 +18,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 );
 
 }
 
@@ -52,134 +52,134 @@ 
  * @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 );
-
-	// 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
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-
-	$post_results   = array();
-	$entity_results = array();
-
-	// Populate $post_results
-
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-			'*',
-			null,
-			null,
-			array(),
-			null,
-			$referencing_post_ids
-		);
-
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
-
-			/**
-			 * Use the thumbnail.
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-			 *
-			 * @since 3.19.3 We're using the medium size image.
-			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ?
-				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_permalink( $post_obj->ID );
-
-			$result         = $post_obj;
-			$post_results[] = $result;
-		}
-	}
-
-	// Add filler posts if needed
-
-	$filler_count         = $limit - count( $post_results );
-	$filler_posts         = wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids );
-	$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 );
+
+    // 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
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+
+    $post_results   = array();
+    $entity_results = array();
+
+    // Populate $post_results
+
+    $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+        $referencing_posts :
+        Wordlift_Relation_Service::get_instance()->get_article_subjects(
+            wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+            '*',
+            null,
+            null,
+            array(),
+            null,
+            $referencing_post_ids
+        );
+
+    if ( $filtered_posts ) {
+        foreach ( $filtered_posts as $post_obj ) {
+
+            /**
+             * Use the thumbnail.
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+             * @see https://github.com/insideout10/wordlift-plugin/issues/837
+             *
+             * @since 3.19.3 We're using the medium size image.
+             */
+            $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+            $post_obj->thumbnail = ( $thumbnail ) ?
+                $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+            $post_obj->permalink = get_permalink( $post_obj->ID );
+
+            $result         = $post_obj;
+            $post_results[] = $result;
+        }
+    }
+
+    // Add filler posts if needed
+
+    $filler_count         = $limit - count( $post_results );
+    $filler_posts         = wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids );
+    $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
@@ -191,116 +191,116 @@ 
 				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;
+            }
+        }
+    }
 
-	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 );
 
 }
 
 function wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids ) {
 
-	$filler_posts = array();
-
-	// First add latest posts from same categories as the current post
-	if ( $filler_count > 0 ) {
-
-		$current_post_categories = wp_get_post_categories( $current_post_id );
-
-		$args = array(
-			'meta_query'          => array(
-				array(
-					'key' => '_thumbnail_id'
-				)
-			),
-			'category__in'        => $current_post_categories,
-			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids ),
-			'ignore_sticky_posts' => 1
-		);
-
-		$filler_posts = get_posts( $args );
-	}
-
-	$filler_count    = $filler_count - count( $filler_posts );
-	$filler_post_ids = array_map( function ( $post ) {
-		return $post->ID;
-	}, $filler_posts );
-
-	// If that does not fill, add latest posts irrespective of category
-	if ( $filler_count > 0 ) {
-
-		$args = array(
-			'meta_query'          => array(
-				array(
-					'key' => '_thumbnail_id'
-				)
-			),
-			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids, $filler_post_ids ),
-			'ignore_sticky_posts' => 1
-		);
-
-		$filler_posts = array_merge( $filler_posts, get_posts( $args ) );
-
-	}
-
-	// Add thumbnail and permalink to filler posts
-	foreach ( $filler_posts as $post_obj ) {
-		$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 );
-	}
-
-	return $filler_posts;
+    $filler_posts = array();
+
+    // First add latest posts from same categories as the current post
+    if ( $filler_count > 0 ) {
+
+        $current_post_categories = wp_get_post_categories( $current_post_id );
+
+        $args = array(
+            'meta_query'          => array(
+                array(
+                    'key' => '_thumbnail_id'
+                )
+            ),
+            'category__in'        => $current_post_categories,
+            'numberposts'         => $filler_count,
+            'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids ),
+            'ignore_sticky_posts' => 1
+        );
+
+        $filler_posts = get_posts( $args );
+    }
+
+    $filler_count    = $filler_count - count( $filler_posts );
+    $filler_post_ids = array_map( function ( $post ) {
+        return $post->ID;
+    }, $filler_posts );
+
+    // If that does not fill, add latest posts irrespective of category
+    if ( $filler_count > 0 ) {
+
+        $args = array(
+            'meta_query'          => array(
+                array(
+                    'key' => '_thumbnail_id'
+                )
+            ),
+            'numberposts'         => $filler_count,
+            'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids, $filler_post_ids ),
+            'ignore_sticky_posts' => 1
+        );
+
+        $filler_posts = array_merge( $filler_posts, get_posts( $args ) );
+
+    }
+
+    // Add thumbnail and permalink to filler posts
+    foreach ( $filler_posts as $post_obj ) {
+        $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 );
+    }
+
+    return $filler_posts;
 
 }
 
@@ -308,9 +308,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 +76 added lines, -78 removed lines

@@ -16,7 +16,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(
@@ -24,24 +24,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);
 
 }
 
@@ -51,20 +51,20 @@ 
  * @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);
 
 	// 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;
 	}
@@ -73,25 +73,24 @@ 
 	// 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 );
+	$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;
 
 
 	/**
@@ -99,7 +98,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'];
 	}
 
@@ -108,25 +107,24 @@ 
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit,
 		null,
 		$order_by
 	);
 
-	$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,
@@ -135,8 +133,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.
@@ -146,10 +144,10 @@ 
 			 *
 			 * @since 3.19.3 We're using the medium size image.
 			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ?
+			$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+			$post_obj->thumbnail = ($thumbnail) ?
 				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_permalink( $post_obj->ID );
+			$post_obj->permalink = get_permalink($post_obj->ID);
 
 			$result         = $post_obj;
 			$post_results[] = $result;
@@ -158,12 +156,12 @@ 
 
 	// Add filler posts if needed
 
-	$filler_count         = $limit - count( $post_results );
-	$filler_posts         = wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids );
-	$post_results         = array_merge( $post_results, $filler_posts );
-	$referencing_post_ids = array_map( function ( $post ) {
+	$filler_count         = $limit - count($post_results);
+	$filler_posts         = wl_shortcode_faceted_search_filler_posts($filler_count, $current_post_id, $referencing_post_ids);
+	$post_results         = array_merge($post_results, $filler_posts);
+	$referencing_post_ids = array_map(function($post) {
 		return $post->ID;
-	}, $post_results );
+	}, $post_results);
 
 	// Populate $entity_results
 
@@ -176,8 +174,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
@@ -191,21 +189,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(
@@ -217,42 +215,42 @@ 
 					null,
 					$referencing_post_ids
 				);
-				$entity_results[]                     = $serialized_entity;
+				$entity_results[] = $serialized_entity;
 			}
 		}
 	}
 
 	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);
 
 }
 
-function wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids ) {
+function wl_shortcode_faceted_search_filler_posts($filler_count, $current_post_id, $referencing_post_ids) {
 
 	$filler_posts = array();
 
 	// First add latest posts from same categories as the current post
-	if ( $filler_count > 0 ) {
+	if ($filler_count > 0) {
 
-		$current_post_categories = wp_get_post_categories( $current_post_id );
+		$current_post_categories = wp_get_post_categories($current_post_id);
 
 		$args = array(
 			'meta_query'          => array(
@@ -262,20 +260,20 @@ 
 			),
 			'category__in'        => $current_post_categories,
 			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids ),
+			'post__not_in'        => array_merge(array($current_post_id), $referencing_post_ids),
 			'ignore_sticky_posts' => 1
 		);
 
-		$filler_posts = get_posts( $args );
+		$filler_posts = get_posts($args);
 	}
 
-	$filler_count    = $filler_count - count( $filler_posts );
-	$filler_post_ids = array_map( function ( $post ) {
+	$filler_count    = $filler_count - count($filler_posts);
+	$filler_post_ids = array_map(function($post) {
 		return $post->ID;
-	}, $filler_posts );
+	}, $filler_posts);
 
 	// If that does not fill, add latest posts irrespective of category
-	if ( $filler_count > 0 ) {
+	if ($filler_count > 0) {
 
 		$args = array(
 			'meta_query'          => array(
@@ -284,20 +282,20 @@ 
 				)
 			),
 			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids, $filler_post_ids ),
+			'post__not_in'        => array_merge(array($current_post_id), $referencing_post_ids, $filler_post_ids),
 			'ignore_sticky_posts' => 1
 		);
 
-		$filler_posts = array_merge( $filler_posts, get_posts( $args ) );
+		$filler_posts = array_merge($filler_posts, get_posts($args));
 
 	}
 
 	// Add thumbnail and permalink to filler posts
-	foreach ( $filler_posts as $post_obj ) {
-		$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-		$post_obj->thumbnail = ( $thumbnail ) ?
+	foreach ($filler_posts as $post_obj) {
+		$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+		$post_obj->thumbnail = ($thumbnail) ?
 			$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-		$post_obj->permalink = get_permalink( $post_obj->ID );
+		$post_obj->permalink = get_permalink($post_obj->ID);
 	}
 
 	return $filler_posts;
@@ -307,10 +305,10 @@ 
 /**
  * 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/jsonld/class-jsonld-by-id-endpoint.php

Indentation +103 added lines, -103 removed lines

@@ -23,108 +23,108 @@
  */
 class Jsonld_By_Id_Endpoint {
 
-	/**
-	 * The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Endpoint constructor.
-	 *
-	 * @param \Wordlift_Jsonld_Service $jsonld_service
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
-	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
-
-		$this->jsonld_service     = $jsonld_service;
-		$this->entity_uri_service = $entity_uri_service;
-
-		add_action( 'rest_api_init', array( $this, 'register_routes', ) );
-
-	}
-
-	/**
-	 * Get the JSON-LD.
-	 *
-	 * @param \WP_REST_Request $request The incoming {@link \WP_REST_Request}.
-	 *
-	 * @return WP_REST_Response The outgoing {@link WP_REST_Response}.
-	 * @throws \Exception
-	 */
-	public function jsonld_by_id( $request ) {
-
-		// Get the ids.
-		$ids = (array) $request->get_param( 'id' );
-
-		// Preload the URIs to reduce the number of DB roundtrips.
-		$this->entity_uri_service->preload_uris( array_map( 'urldecode', $ids ) );
-
-		$that = $this;
-
-		// Get the posts, filtering out those not found.
-		$posts = array_filter( array_map( function ( $item ) use ( $that ) {
-			return $that->entity_uri_service->get_entity( urldecode( $item ) );
-		}, $ids ) );
-
-		// Get the posts' IDs and make the unique.
-		$post_ids = array_unique( array_map( function ( $item ) {
-			return $item->ID;
-		}, $posts ) );
-
-		// Get the JSON-LD.
-		$data = array();
-		foreach ( $post_ids as $post_id ) {
-			$data = array_merge( $data, $that->jsonld_service->get_jsonld( false, $post_id ) );
-		}
-
-		// Add the WebSite fragment if requested.
-		if ( $request->get_param( 'website' ) ) {
-			$data[] = $this->jsonld_service->get_jsonld( true );
-		}
-
-		return Jsonld_Response_Helper::to_response( $data );
-	}
-
-	public function register_routes() {
-
-		register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
-			'methods'             => WP_REST_Server::READABLE,
-			'callback'            => array( $this, 'jsonld_by_id' ),
-			'permission_callback' => '__return_true',
-			'args'                => array(
-				'id'      => array(
-					'description'       => __( 'One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift' ),
-					// We expect an array of strings.
-					'type'              => 'array',
-					'items'             => array(
-						'type' => 'string'
-					),
-					'validate_callback' => function ( $values, $request, $param ) {
-
-						if ( ! is_array( $values ) ) {
-							return new WP_Error( 'rest_invalid_param', esc_html__( 'The id argument must be an array (try passing `id[]=...`.', 'wordlift' ), array( 'status' => 400 ) );
-						}
-
-						foreach ( $values as $value ) {
-							if ( 0 !== strpos( $value, 'http' ) ) {
-								return new WP_Error( 'rest_invalid_param', esc_html__( 'Ids must start with http.', 'wordlift' ), array( 'status' => 400 ) );
-							}
-						}
-					}
-				),
-				'website' => array(
-					'description' => __( 'Whether to include the WebSite markup.', 'wordlift' ),
-				)
-			)
-		) );
-
-	}
+    /**
+     * The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Endpoint constructor.
+     *
+     * @param \Wordlift_Jsonld_Service $jsonld_service
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service
+     */
+    public function __construct( $jsonld_service, $entity_uri_service ) {
+
+        $this->jsonld_service     = $jsonld_service;
+        $this->entity_uri_service = $entity_uri_service;
+
+        add_action( 'rest_api_init', array( $this, 'register_routes', ) );
+
+    }
+
+    /**
+     * Get the JSON-LD.
+     *
+     * @param \WP_REST_Request $request The incoming {@link \WP_REST_Request}.
+     *
+     * @return WP_REST_Response The outgoing {@link WP_REST_Response}.
+     * @throws \Exception
+     */
+    public function jsonld_by_id( $request ) {
+
+        // Get the ids.
+        $ids = (array) $request->get_param( 'id' );
+
+        // Preload the URIs to reduce the number of DB roundtrips.
+        $this->entity_uri_service->preload_uris( array_map( 'urldecode', $ids ) );
+
+        $that = $this;
+
+        // Get the posts, filtering out those not found.
+        $posts = array_filter( array_map( function ( $item ) use ( $that ) {
+            return $that->entity_uri_service->get_entity( urldecode( $item ) );
+        }, $ids ) );
+
+        // Get the posts' IDs and make the unique.
+        $post_ids = array_unique( array_map( function ( $item ) {
+            return $item->ID;
+        }, $posts ) );
+
+        // Get the JSON-LD.
+        $data = array();
+        foreach ( $post_ids as $post_id ) {
+            $data = array_merge( $data, $that->jsonld_service->get_jsonld( false, $post_id ) );
+        }
+
+        // Add the WebSite fragment if requested.
+        if ( $request->get_param( 'website' ) ) {
+            $data[] = $this->jsonld_service->get_jsonld( true );
+        }
+
+        return Jsonld_Response_Helper::to_response( $data );
+    }
+
+    public function register_routes() {
+
+        register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
+            'methods'             => WP_REST_Server::READABLE,
+            'callback'            => array( $this, 'jsonld_by_id' ),
+            'permission_callback' => '__return_true',
+            'args'                => array(
+                'id'      => array(
+                    'description'       => __( 'One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift' ),
+                    // We expect an array of strings.
+                    'type'              => 'array',
+                    'items'             => array(
+                        'type' => 'string'
+                    ),
+                    'validate_callback' => function ( $values, $request, $param ) {
+
+                        if ( ! is_array( $values ) ) {
+                            return new WP_Error( 'rest_invalid_param', esc_html__( 'The id argument must be an array (try passing `id[]=...`.', 'wordlift' ), array( 'status' => 400 ) );
+                        }
+
+                        foreach ( $values as $value ) {
+                            if ( 0 !== strpos( $value, 'http' ) ) {
+                                return new WP_Error( 'rest_invalid_param', esc_html__( 'Ids must start with http.', 'wordlift' ), array( 'status' => 400 ) );
+                            }
+                        }
+                    }
+                ),
+                'website' => array(
+                    'description' => __( 'Whether to include the WebSite markup.', 'wordlift' ),
+                )
+            )
+        ) );
+
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -41,12 +41,12 @@ 
 	 * @param \Wordlift_Jsonld_Service $jsonld_service
 	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
 	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
+	public function __construct($jsonld_service, $entity_uri_service) {
 
 		$this->jsonld_service     = $jsonld_service;
 		$this->entity_uri_service = $entity_uri_service;
 
-		add_action( 'rest_api_init', array( $this, 'register_routes', ) );
+		add_action('rest_api_init', array($this, 'register_routes',));
 
 	}
 
@@ -58,72 +58,72 @@ 
 	 * @return WP_REST_Response The outgoing {@link WP_REST_Response}.
 	 * @throws \Exception
 	 */
-	public function jsonld_by_id( $request ) {
+	public function jsonld_by_id($request) {
 
 		// Get the ids.
-		$ids = (array) $request->get_param( 'id' );
+		$ids = (array) $request->get_param('id');
 
 		// Preload the URIs to reduce the number of DB roundtrips.
-		$this->entity_uri_service->preload_uris( array_map( 'urldecode', $ids ) );
+		$this->entity_uri_service->preload_uris(array_map('urldecode', $ids));
 
 		$that = $this;
 
 		// Get the posts, filtering out those not found.
-		$posts = array_filter( array_map( function ( $item ) use ( $that ) {
-			return $that->entity_uri_service->get_entity( urldecode( $item ) );
-		}, $ids ) );
+		$posts = array_filter(array_map(function($item) use ($that) {
+			return $that->entity_uri_service->get_entity(urldecode($item));
+		}, $ids));
 
 		// Get the posts' IDs and make the unique.
-		$post_ids = array_unique( array_map( function ( $item ) {
+		$post_ids = array_unique(array_map(function($item) {
 			return $item->ID;
-		}, $posts ) );
+		}, $posts));
 
 		// Get the JSON-LD.
 		$data = array();
-		foreach ( $post_ids as $post_id ) {
-			$data = array_merge( $data, $that->jsonld_service->get_jsonld( false, $post_id ) );
+		foreach ($post_ids as $post_id) {
+			$data = array_merge($data, $that->jsonld_service->get_jsonld(false, $post_id));
 		}
 
 		// Add the WebSite fragment if requested.
-		if ( $request->get_param( 'website' ) ) {
-			$data[] = $this->jsonld_service->get_jsonld( true );
+		if ($request->get_param('website')) {
+			$data[] = $this->jsonld_service->get_jsonld(true);
 		}
 
-		return Jsonld_Response_Helper::to_response( $data );
+		return Jsonld_Response_Helper::to_response($data);
 	}
 
 	public function register_routes() {
 
-		register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
+		register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
 			'methods'             => WP_REST_Server::READABLE,
-			'callback'            => array( $this, 'jsonld_by_id' ),
+			'callback'            => array($this, 'jsonld_by_id'),
 			'permission_callback' => '__return_true',
 			'args'                => array(
 				'id'      => array(
-					'description'       => __( 'One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift' ),
+					'description'       => __('One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift'),
 					// We expect an array of strings.
 					'type'              => 'array',
 					'items'             => array(
 						'type' => 'string'
 					),
-					'validate_callback' => function ( $values, $request, $param ) {
+					'validate_callback' => function($values, $request, $param) {
 
-						if ( ! is_array( $values ) ) {
-							return new WP_Error( 'rest_invalid_param', esc_html__( 'The id argument must be an array (try passing `id[]=...`.', 'wordlift' ), array( 'status' => 400 ) );
+						if ( ! is_array($values)) {
+							return new WP_Error('rest_invalid_param', esc_html__('The id argument must be an array (try passing `id[]=...`.', 'wordlift'), array('status' => 400));
 						}
 
-						foreach ( $values as $value ) {
-							if ( 0 !== strpos( $value, 'http' ) ) {
-								return new WP_Error( 'rest_invalid_param', esc_html__( 'Ids must start with http.', 'wordlift' ), array( 'status' => 400 ) );
+						foreach ($values as $value) {
+							if (0 !== strpos($value, 'http')) {
+								return new WP_Error('rest_invalid_param', esc_html__('Ids must start with http.', 'wordlift'), array('status' => 400));
 							}
 						}
 					}
 				),
 				'website' => array(
-					'description' => __( 'Whether to include the WebSite markup.', 'wordlift' ),
+					'description' => __('Whether to include the WebSite markup.', 'wordlift'),
 				)
 			)
-		) );
+		));
 
 	}
 

src/wordlift/jsonld/class-jsonld-endpoint.php

Indentation +165 added lines, -165 removed lines

@@ -20,157 +20,157 @@ 
  */
 class Jsonld_Endpoint {
 
-	/**
-	 * The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Endpoint constructor.
-	 *
-	 * @param Jsonld_Service $jsonld_service
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
-	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
-
-		$this->jsonld_service     = $jsonld_service;
-		$this->entity_uri_service = $entity_uri_service;
-
-		// PHP 5.3 compatibility.
-		$that = $this;
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $that, 'jsonld_using_post_id' ),
-				'permission_callback' => '__return_true',
-				'args'                => array(
-					'id' => array(
-						'validate_callback' => function ( $param, $request, $key ) {
-							return is_numeric( $param );
-						},
-						'sanitize_callback' => 'absint',
-					),
-				)
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_item_id' ),
-				'permission_callback' => '__return_true',
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_post_meta' ),
-				'permission_callback' => '__return_true',
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_meta' ),
-				'permission_callback' => '__return_true',
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_get_page_by_path' ),
-				'permission_callback' => '__return_true',
-			) );
-
-		} );
-
-	}
-
-	/**
-	 * Callback for the JSON-LD request.
-	 *
-	 * @param array $request {
-	 *  The request array.
-	 *
-	 * @type int $id The post id.
-	 * }
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_post_id( $request ) {
-
-		$post_id = $request['id'];
-		$type    = ( 0 === $post_id ) ? Jsonld_Service::TYPE_HOMEPAGE : Jsonld_Service::TYPE_POST;
-
-		// Send the generated JSON-LD.
-		$data = $this->jsonld_service->get( $type, $post_id );
-
-		return Jsonld_Response_Helper::to_response( $data );
-	}
-
-	/**
-	 * Provide a JSON-LD given the itemId.
-	 *
-	 * @param array $request {
-	 *  The request array.
-	 *
-	 * @type string $item_id The entity item id.
-	 * }
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_item_id( $request ) {
-
-		$item_id = 'http://' . $request['item_id'];
-		$post    = $this->entity_uri_service->get_entity( $item_id );
-
-		if ( ! is_a( $post, 'WP_Post' ) ) {
-			return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
-
-		return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
-	}
-
-	public function jsonld_using_get_page_by_path( $request ) {
-
-		$post_name = $request['post_name'];
-		$post_type = $request['post_type'];
-
-		global $wpdb;
-
-		$sql = "
+    /**
+     * The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Endpoint constructor.
+     *
+     * @param Jsonld_Service $jsonld_service
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service
+     */
+    public function __construct( $jsonld_service, $entity_uri_service ) {
+
+        $this->jsonld_service     = $jsonld_service;
+        $this->entity_uri_service = $entity_uri_service;
+
+        // PHP 5.3 compatibility.
+        $that = $this;
+        add_action( 'rest_api_init', function () use ( $that ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
+                'methods'             => WP_REST_Server::READABLE,
+                'callback'            => array( $that, 'jsonld_using_post_id' ),
+                'permission_callback' => '__return_true',
+                'args'                => array(
+                    'id' => array(
+                        'validate_callback' => function ( $param, $request, $key ) {
+                            return is_numeric( $param );
+                        },
+                        'sanitize_callback' => 'absint',
+                    ),
+                )
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_item_id' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_post_meta' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_meta' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_get_page_by_path' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+        } );
+
+    }
+
+    /**
+     * Callback for the JSON-LD request.
+     *
+     * @param array $request {
+     *  The request array.
+     *
+     * @type int $id The post id.
+     * }
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_post_id( $request ) {
+
+        $post_id = $request['id'];
+        $type    = ( 0 === $post_id ) ? Jsonld_Service::TYPE_HOMEPAGE : Jsonld_Service::TYPE_POST;
+
+        // Send the generated JSON-LD.
+        $data = $this->jsonld_service->get( $type, $post_id );
+
+        return Jsonld_Response_Helper::to_response( $data );
+    }
+
+    /**
+     * Provide a JSON-LD given the itemId.
+     *
+     * @param array $request {
+     *  The request array.
+     *
+     * @type string $item_id The entity item id.
+     * }
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_item_id( $request ) {
+
+        $item_id = 'http://' . $request['item_id'];
+        $post    = $this->entity_uri_service->get_entity( $item_id );
+
+        if ( ! is_a( $post, 'WP_Post' ) ) {
+            return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
+
+        return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
+    }
+
+    public function jsonld_using_get_page_by_path( $request ) {
+
+        $post_name = $request['post_name'];
+        $post_type = $request['post_type'];
+
+        global $wpdb;
+
+        $sql = "
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_name = %s
 			 AND post_type = %s
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
+        $post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
+        if ( is_null( $post_id ) ) {
+            return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
-	}
+        return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+    }
 
-	/**
-	 * @param WP_REST_Request $request
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_post_meta( $request ) {
+    /**
+     * @param WP_REST_Request $request
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_post_meta( $request ) {
 
-		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+        $meta_key   = $request['meta_key'];
+        $meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
 
-		global $wpdb;
+        global $wpdb;
 
-		$sql = "
+        $sql = "
 			SELECT post_id AS ID
 			FROM $wpdb->postmeta
 			WHERE meta_key = %s
@@ -178,24 +178,24 @@ 
 			LIMIT 1
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $meta_key, $meta_value ) );
+        $post_id = $wpdb->get_var( $wpdb->prepare( $sql, $meta_key, $meta_value ) );
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "Post with meta key $meta_key and value $meta_value not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
+        if ( is_null( $post_id ) ) {
+            return new WP_REST_Response( esc_html( "Post with meta key $meta_key and value $meta_value not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
-	}
+        return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+    }
 
-	public function jsonld_using_meta( $request ) {
+    public function jsonld_using_meta( $request ) {
 
-		global $wpdb;
+        global $wpdb;
 
-		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+        $meta_key   = $request['meta_key'];
+        $meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
 
-		$results = $wpdb->get_results( $wpdb->prepare(
-			"
+        $results = $wpdb->get_results( $wpdb->prepare(
+            "
 			SELECT pm.post_id AS id, %s AS type
 			 FROM {$wpdb->postmeta} pm
 			 	INNER JOIN {$wpdb->posts} p
@@ -206,23 +206,23 @@ 
 			 FROM {$wpdb->termmeta}
 			 WHERE meta_key = %s AND meta_value = %s
 			",
-			Jsonld_Service::TYPE_POST,
-			$meta_key,
-			$meta_value,
-			Jsonld_Service::TYPE_TERM,
-			$meta_key,
-			$meta_value
-		) );
+            Jsonld_Service::TYPE_POST,
+            $meta_key,
+            $meta_value,
+            Jsonld_Service::TYPE_TERM,
+            $meta_key,
+            $meta_value
+        ) );
 
-		$jsonld_service = $this->jsonld_service;
+        $jsonld_service = $this->jsonld_service;
 
-		$data = array_reduce( $results, function ( $carry, $result ) use ( $jsonld_service ) {
-			$jsonld = $jsonld_service->get( $result->type, $result->id );
+        $data = array_reduce( $results, function ( $carry, $result ) use ( $jsonld_service ) {
+            $jsonld = $jsonld_service->get( $result->type, $result->id );
 
-			return array_merge( $carry, $jsonld );
-		}, array() );
+            return array_merge( $carry, $jsonld );
+        }, array() );
 
-		return Jsonld_Response_Helper::to_response( $data );
-	}
+        return Jsonld_Response_Helper::to_response( $data );
+    }
 
 }

Spacing +49 added lines, -49 removed lines

@@ -37,51 +37,51 @@ 
 	 * @param Jsonld_Service $jsonld_service
 	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
 	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
+	public function __construct($jsonld_service, $entity_uri_service) {
 
 		$this->jsonld_service     = $jsonld_service;
 		$this->entity_uri_service = $entity_uri_service;
 
 		// PHP 5.3 compatibility.
 		$that = $this;
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
+		add_action('rest_api_init', function() use ($that) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
 				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $that, 'jsonld_using_post_id' ),
+				'callback'            => array($that, 'jsonld_using_post_id'),
 				'permission_callback' => '__return_true',
 				'args'                => array(
 					'id' => array(
-						'validate_callback' => function ( $param, $request, $key ) {
-							return is_numeric( $param );
+						'validate_callback' => function($param, $request, $key) {
+							return is_numeric($param);
 						},
 						'sanitize_callback' => 'absint',
 					),
 				)
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_item_id' ),
+				'callback'            => array($that, 'jsonld_using_item_id'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_post_meta' ),
+				'callback'            => array($that, 'jsonld_using_post_meta'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_meta' ),
+				'callback'            => array($that, 'jsonld_using_meta'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_get_page_by_path' ),
+				'callback'            => array($that, 'jsonld_using_get_page_by_path'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
 		} );
 
@@ -99,15 +99,15 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_post_id( $request ) {
+	public function jsonld_using_post_id($request) {
 
 		$post_id = $request['id'];
-		$type    = ( 0 === $post_id ) ? Jsonld_Service::TYPE_HOMEPAGE : Jsonld_Service::TYPE_POST;
+		$type    = (0 === $post_id) ? Jsonld_Service::TYPE_HOMEPAGE : Jsonld_Service::TYPE_POST;
 
 		// Send the generated JSON-LD.
-		$data = $this->jsonld_service->get( $type, $post_id );
+		$data = $this->jsonld_service->get($type, $post_id);
 
-		return Jsonld_Response_Helper::to_response( $data );
+		return Jsonld_Response_Helper::to_response($data);
 	}
 
 	/**
@@ -122,19 +122,19 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_item_id( $request ) {
+	public function jsonld_using_item_id($request) {
 
-		$item_id = 'http://' . $request['item_id'];
-		$post    = $this->entity_uri_service->get_entity( $item_id );
+		$item_id = 'http://'.$request['item_id'];
+		$post    = $this->entity_uri_service->get_entity($item_id);
 
-		if ( ! is_a( $post, 'WP_Post' ) ) {
-			return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if ( ! is_a($post, 'WP_Post')) {
+			return new WP_REST_Response(esc_html("$item_id not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
+		return $this->jsonld_using_post_id(array('id' => $post->ID,));
 	}
 
-	public function jsonld_using_get_page_by_path( $request ) {
+	public function jsonld_using_get_page_by_path($request) {
 
 		$post_name = $request['post_name'];
 		$post_type = $request['post_type'];
@@ -148,13 +148,13 @@ 
 			 AND post_type = %s
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
+		$post_id = $wpdb->get_var($wpdb->prepare($sql, $post_name, $post_type));
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if (is_null($post_id)) {
+			return new WP_REST_Response(esc_html("$post_name of type $post_type not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+		return $this->jsonld_using_post_id(array('id' => $post_id,));
 	}
 
 	/**
@@ -163,10 +163,10 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_post_meta( $request ) {
+	public function jsonld_using_post_meta($request) {
 
 		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+		$meta_value = urldecode(current($request->get_query_params('meta_value')));
 
 		global $wpdb;
 
@@ -178,23 +178,23 @@ 
 			LIMIT 1
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $meta_key, $meta_value ) );
+		$post_id = $wpdb->get_var($wpdb->prepare($sql, $meta_key, $meta_value));
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "Post with meta key $meta_key and value $meta_value not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if (is_null($post_id)) {
+			return new WP_REST_Response(esc_html("Post with meta key $meta_key and value $meta_value not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+		return $this->jsonld_using_post_id(array('id' => $post_id,));
 	}
 
-	public function jsonld_using_meta( $request ) {
+	public function jsonld_using_meta($request) {
 
 		global $wpdb;
 
 		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+		$meta_value = urldecode(current($request->get_query_params('meta_value')));
 
-		$results = $wpdb->get_results( $wpdb->prepare(
+		$results = $wpdb->get_results($wpdb->prepare(
 			"
 			SELECT pm.post_id AS id, %s AS type
 			 FROM {$wpdb->postmeta} pm
@@ -212,17 +212,17 @@ 
 			Jsonld_Service::TYPE_TERM,
 			$meta_key,
 			$meta_value
-		) );
+		));
 
 		$jsonld_service = $this->jsonld_service;
 
-		$data = array_reduce( $results, function ( $carry, $result ) use ( $jsonld_service ) {
-			$jsonld = $jsonld_service->get( $result->type, $result->id );
+		$data = array_reduce($results, function($carry, $result) use ($jsonld_service) {
+			$jsonld = $jsonld_service->get($result->type, $result->id);
 
-			return array_merge( $carry, $jsonld );
-		}, array() );
+			return array_merge($carry, $jsonld);
+		}, array());
 
-		return Jsonld_Response_Helper::to_response( $data );
+		return Jsonld_Response_Helper::to_response($data);
 	}
 
 }