insideout10 / wordlift-plugin

src/wordlift/cache/class-ttl-cache.php

Indentation +140 added lines, -140 removed lines

@@ -17,150 +17,150 @@
 // @@todo: add a hook to clear the cached files now and then.
 class Ttl_Cache {
 
-	/**
-	 * The cache name.
-	 *
-	 * @var string $name The cache name.
-	 * @access private
-	 * @since 3.21.2
-	 */
-	private $name;
-
-	/**
-	 * The TTL of cached responses in seconds.
-	 *
-	 * @var int $ttl The TTL in seconds.
-	 * @access private
-	 * @since 3.21.2
-	 */
-	private $ttl;
-
-	/**
-	 * The cache dir where the cached data is written.
-	 *
-	 * @since 3.21.2
-	 * @access private
-	 * @var string $cache_dir The cache dir where the cached responses are written.
-	 */
-	private $cache_dir;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 * @access private
-	 * @since 3.21.2
-	 */
-	private $log;
-
-	/**
-	 * @var array
-	 */
-	private static $caches = array();
-
-	/**
-	 * Create a {@link Ttl_Cache} with the specified TTL, default 900 secs.
-	 *
-	 * @param string $name The cache name.
-	 * @param int    $ttl The cache TTL, default 900 secs.
-	 *
-	 * @since 3.21.2
-	 */
-	public function __construct( $name, $ttl = 900 ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->name = $name;
-		$this->ttl  = $ttl;
-
-		// Get the temp dir and add the directory separator if missing.
-		$temp_dir = get_temp_dir();
-		if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
-			$temp_dir .= DIRECTORY_SEPARATOR;
-		}
-		$this->cache_dir = $temp_dir . 'wl.cache' . DIRECTORY_SEPARATOR . md5( $name );
-
-		$this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
-		wp_mkdir_p( $this->cache_dir );
-
-		self::$caches[ $name ] = $this;
-
-	}
-
-	/**
-	 * Get the cached data for the specified key.
-	 *
-	 * @param mixed $key A serializable key.
-	 *
-	 * @return mixed|null
-	 * @since 3.21.2
-	 */
-	public function get( $key ) {
-
-		$filename = $this->get_filename( $key );
-
-		// If the cache file exists and it's not too old, then return it.
-		if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
-			$this->log->trace( "Cache HIT.\n" );
-
-			return json_decode( file_get_contents( $filename ), true );
-		}
-
-		$this->log->trace( "Cache MISS, filename $filename.\n" );
-
-		return null;
-	}
-
-	public function put( $key, $data ) {
-
-		$filename = $this->get_filename( $key );
-
-		// Cache.
-		@unlink( $filename );
-		@file_put_contents( $filename, wp_json_encode( $data ) );
-
-	}
-
-	public function flush() {
-
-		$files = glob( $this->cache_dir . DIRECTORY_SEPARATOR . '*' );
-		foreach ( $files as $file ) { // iterate files
-			if ( is_file( $file ) ) {
-				@unlink( $file );
-			}
-		}
-
-	}
-
-	public static function flush_all() {
-
-		/** @var Ttl_Cache $cache */
-		foreach ( self::$caches as $cache ) {
-			$cache->flush();
-		}
-
-	}
+    /**
+     * The cache name.
+     *
+     * @var string $name The cache name.
+     * @access private
+     * @since 3.21.2
+     */
+    private $name;
+
+    /**
+     * The TTL of cached responses in seconds.
+     *
+     * @var int $ttl The TTL in seconds.
+     * @access private
+     * @since 3.21.2
+     */
+    private $ttl;
+
+    /**
+     * The cache dir where the cached data is written.
+     *
+     * @since 3.21.2
+     * @access private
+     * @var string $cache_dir The cache dir where the cached responses are written.
+     */
+    private $cache_dir;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     * @access private
+     * @since 3.21.2
+     */
+    private $log;
+
+    /**
+     * @var array
+     */
+    private static $caches = array();
+
+    /**
+     * Create a {@link Ttl_Cache} with the specified TTL, default 900 secs.
+     *
+     * @param string $name The cache name.
+     * @param int    $ttl The cache TTL, default 900 secs.
+     *
+     * @since 3.21.2
+     */
+    public function __construct( $name, $ttl = 900 ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->name = $name;
+        $this->ttl  = $ttl;
+
+        // Get the temp dir and add the directory separator if missing.
+        $temp_dir = get_temp_dir();
+        if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
+            $temp_dir .= DIRECTORY_SEPARATOR;
+        }
+        $this->cache_dir = $temp_dir . 'wl.cache' . DIRECTORY_SEPARATOR . md5( $name );
+
+        $this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
+        wp_mkdir_p( $this->cache_dir );
+
+        self::$caches[ $name ] = $this;
+
+    }
+
+    /**
+     * Get the cached data for the specified key.
+     *
+     * @param mixed $key A serializable key.
+     *
+     * @return mixed|null
+     * @since 3.21.2
+     */
+    public function get( $key ) {
+
+        $filename = $this->get_filename( $key );
+
+        // If the cache file exists and it's not too old, then return it.
+        if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
+            $this->log->trace( "Cache HIT.\n" );
+
+            return json_decode( file_get_contents( $filename ), true );
+        }
+
+        $this->log->trace( "Cache MISS, filename $filename.\n" );
+
+        return null;
+    }
+
+    public function put( $key, $data ) {
+
+        $filename = $this->get_filename( $key );
+
+        // Cache.
+        @unlink( $filename );
+        @file_put_contents( $filename, wp_json_encode( $data ) );
+
+    }
+
+    public function flush() {
+
+        $files = glob( $this->cache_dir . DIRECTORY_SEPARATOR . '*' );
+        foreach ( $files as $file ) { // iterate files
+            if ( is_file( $file ) ) {
+                @unlink( $file );
+            }
+        }
+
+    }
+
+    public static function flush_all() {
+
+        /** @var Ttl_Cache $cache */
+        foreach ( self::$caches as $cache ) {
+            $cache->flush();
+        }
+
+    }
 
-	/**
-	 * Get the full path for the given `$hash`. The file is not checked for its existence.
-	 *
-	 * @param string $hash A file hash.
-	 *
-	 * @return string The full path to the file.
-	 * @since 3.21.2
-	 */
-	private function get_path( $hash ) {
+    /**
+     * Get the full path for the given `$hash`. The file is not checked for its existence.
+     *
+     * @param string $hash A file hash.
+     *
+     * @return string The full path to the file.
+     * @since 3.21.2
+     */
+    private function get_path( $hash ) {
 
-		return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
-	}
+        return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
+    }
 
-	private function get_filename( $key ) {
+    private function get_filename( $key ) {
 
-		// Create a hash and a path to the cache file.
-		$hash     = md5( json_encode( $key ) );
-		$filename = $this->get_path( $hash );
+        // Create a hash and a path to the cache file.
+        $hash     = md5( json_encode( $key ) );
+        $filename = $this->get_path( $hash );
 
-		return $filename;
-	}
+        return $filename;
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -66,24 +66,24 @@ 
 	 *
 	 * @since 3.21.2
 	 */
-	public function __construct( $name, $ttl = 900 ) {
+	public function __construct($name, $ttl = 900) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->name = $name;
 		$this->ttl  = $ttl;
 
 		// Get the temp dir and add the directory separator if missing.
 		$temp_dir = get_temp_dir();
-		if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
+		if (DIRECTORY_SEPARATOR !== substr($temp_dir, - strlen(DIRECTORY_SEPARATOR))) {
 			$temp_dir .= DIRECTORY_SEPARATOR;
 		}
-		$this->cache_dir = $temp_dir . 'wl.cache' . DIRECTORY_SEPARATOR . md5( $name );
+		$this->cache_dir = $temp_dir.'wl.cache'.DIRECTORY_SEPARATOR.md5($name);
 
-		$this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
-		wp_mkdir_p( $this->cache_dir );
+		$this->log->trace("Creating the cache folder {$this->cache_dir}...");
+		wp_mkdir_p($this->cache_dir);
 
-		self::$caches[ $name ] = $this;
+		self::$caches[$name] = $this;
 
 	}
 
@@ -95,38 +95,38 @@ 
 	 * @return mixed|null
 	 * @since 3.21.2
 	 */
-	public function get( $key ) {
+	public function get($key) {
 
-		$filename = $this->get_filename( $key );
+		$filename = $this->get_filename($key);
 
 		// If the cache file exists and it's not too old, then return it.
-		if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
-			$this->log->trace( "Cache HIT.\n" );
+		if (file_exists($filename) && $this->ttl >= time() - filemtime($filename)) {
+			$this->log->trace("Cache HIT.\n");
 
-			return json_decode( file_get_contents( $filename ), true );
+			return json_decode(file_get_contents($filename), true);
 		}
 
-		$this->log->trace( "Cache MISS, filename $filename.\n" );
+		$this->log->trace("Cache MISS, filename $filename.\n");
 
 		return null;
 	}
 
-	public function put( $key, $data ) {
+	public function put($key, $data) {
 
-		$filename = $this->get_filename( $key );
+		$filename = $this->get_filename($key);
 
 		// Cache.
-		@unlink( $filename );
-		@file_put_contents( $filename, wp_json_encode( $data ) );
+		@unlink($filename);
+		@file_put_contents($filename, wp_json_encode($data));
 
 	}
 
 	public function flush() {
 
-		$files = glob( $this->cache_dir . DIRECTORY_SEPARATOR . '*' );
-		foreach ( $files as $file ) { // iterate files
-			if ( is_file( $file ) ) {
-				@unlink( $file );
+		$files = glob($this->cache_dir.DIRECTORY_SEPARATOR.'*');
+		foreach ($files as $file) { // iterate files
+			if (is_file($file)) {
+				@unlink($file);
 			}
 		}
 
@@ -135,7 +135,7 @@ 
 	public static function flush_all() {
 
 		/** @var Ttl_Cache $cache */
-		foreach ( self::$caches as $cache ) {
+		foreach (self::$caches as $cache) {
 			$cache->flush();
 		}
 
@@ -149,16 +149,16 @@ 
 	 * @return string The full path to the file.
 	 * @since 3.21.2
 	 */
-	private function get_path( $hash ) {
+	private function get_path($hash) {
 
-		return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
+		return $this->cache_dir.DIRECTORY_SEPARATOR.$hash;
 	}
 
-	private function get_filename( $key ) {
+	private function get_filename($key) {
 
 		// Create a hash and a path to the cache file.
-		$hash     = md5( json_encode( $key ) );
-		$filename = $this->get_path( $hash );
+		$hash     = md5(json_encode($key));
+		$filename = $this->get_path($hash);
 
 		return $filename;
 	}

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +355 added lines, -355 removed lines

@@ -18,113 +18,113 @@ 
  */
 function wl_shortcode_faceted_search_data_ajax( $request_body = null ) {
 
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	// Extract filtering conditions.
-	$filtering_entity_uris = json_decode( $request_body );
-
-	$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 ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
-
-		return;
-	}
-
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
-
-	if ( 'posts' === $required_type ) {
-
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
-
-		$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_post_permalink( $post_obj->ID );
-
-				$results[] = $post_obj;
-			}
-		}
-	} else {
-
-		global $wpdb;
-
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
-
-		// 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;
+    }
+
+    // Extract filtering conditions.
+    $filtering_entity_uris = json_decode( $request_body );
+
+    $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 ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
+
+        return;
+    }
+
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
+
+    if ( 'posts' === $required_type ) {
+
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+
+        $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_post_permalink( $post_obj->ID );
+
+                $results[] = $post_obj;
+            }
+        }
+    } else {
+
+        global $wpdb;
+
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+
+        // 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
@@ -136,30 +136,30 @@ 
 				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['counter']   = $obj->counter;
-					$serialized_entity['createdAt'] = $entity->post_date;
+                    $serialized_entity              = wl_serialize_entity( $entity );
+                    $serialized_entity['counter']   = $obj->counter;
+                    $serialized_entity['createdAt'] = $entity->post_date;
 
-					$results[] = $serialized_entity;
-				}
-			}
-		}
-	}
+                    $results[] = $serialized_entity;
+                }
+            }
+        }
+    }
 
-	return $results;
+    return $results;
 
 }
 
@@ -171,148 +171,148 @@ 
  */
 function wl_shortcode_faceted_search_data_wp_json( $http_raw_data = null ) {
 
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
-
-	$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 ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
-
-		return;
-	}
-
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
-
-	if ( 'posts' === $required_type ) {
-
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
-
-		$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 $i => $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_post_permalink( $post_obj->ID );
-
-				$results[ $i ] = $post_obj;
-
-				// Get Entity URLs needed for client side filtering in amp
-				foreach ( Wordlift_Relation_Service::get_instance()->get_objects( $post_obj->ID, 'ids' ) as $entity_id ) {
-					$results[ $i ]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
-				}
-			}
-		}
-
-		return array(
-			array( 'values' => $results ),
-		);
-
-	} else {
-
-		global $wpdb;
-
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
-
-		// Retrieve Wordlift relation instances table name.
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		// Response interface with l10n strings, grouped entities and empty data array
-		$serialized_entity_groups = array(
-			array(
-				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['what'] : 'what',
-				'entities' => array( 'thing', 'creative-work', 'recipe' ),
-				'data'     => array(),
-			),
-			array(
-				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['who'] : 'who',
-				'entities' => array( 'person', 'organization', 'local-business' ),
-				'data'     => array(),
-			),
-			array(
-				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['where'] : 'where',
-				'entities' => array( 'place' ),
-				'data'     => array(),
-			),
-			array(
-				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['when'] : 'when',
-				'entities' => array( 'event' ),
-				'data'     => array(),
-			),
-		);
-
-		/*
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    // Extract filtering conditions.
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
+
+    $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 ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
+
+        return;
+    }
+
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
+
+    if ( 'posts' === $required_type ) {
+
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+
+        $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 $i => $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_post_permalink( $post_obj->ID );
+
+                $results[ $i ] = $post_obj;
+
+                // Get Entity URLs needed for client side filtering in amp
+                foreach ( Wordlift_Relation_Service::get_instance()->get_objects( $post_obj->ID, 'ids' ) as $entity_id ) {
+                    $results[ $i ]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+                }
+            }
+        }
+
+        return array(
+            array( 'values' => $results ),
+        );
+
+    } else {
+
+        global $wpdb;
+
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+
+        // Retrieve Wordlift relation instances table name.
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Response interface with l10n strings, grouped entities and empty data array
+        $serialized_entity_groups = array(
+            array(
+                'l10n'     => $_GET['l10n'] ? $_GET['l10n']['what'] : 'what',
+                'entities' => array( 'thing', 'creative-work', 'recipe' ),
+                'data'     => array(),
+            ),
+            array(
+                'l10n'     => $_GET['l10n'] ? $_GET['l10n']['who'] : 'who',
+                'entities' => array( 'person', 'organization', 'local-business' ),
+                'data'     => array(),
+            ),
+            array(
+                'l10n'     => $_GET['l10n'] ? $_GET['l10n']['where'] : 'where',
+                'entities' => array( 'place' ),
+                'data'     => array(),
+            ),
+            array(
+                'l10n'     => $_GET['l10n'] ? $_GET['l10n']['when'] : 'when',
+                'entities' => array( 'event' ),
+                'data'     => array(),
+            ),
+        );
+
+        /*
 		 * 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
@@ -324,45 +324,45 @@ 
 				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['counter']   = $obj->counter;
-					$serialized_entity['createdAt'] = $entity->post_date;
+                    $serialized_entity              = wl_serialize_entity( $entity );
+                    $serialized_entity['counter']   = $obj->counter;
+                    $serialized_entity['createdAt'] = $entity->post_date;
 
-					// Populate $serialized_entity_groups maintaining array sequence
-					foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-						if ( in_array( $serialized_entity['mainType'], $seg_value['entities'] ) ) {
-							$serialized_entity_groups[ $seg_key ]['data'][] = $serialized_entity;
-						}
-					}
-				}
-			}
+                    // Populate $serialized_entity_groups maintaining array sequence
+                    foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
+                        if ( in_array( $serialized_entity['mainType'], $seg_value['entities'] ) ) {
+                            $serialized_entity_groups[ $seg_key ]['data'][] = $serialized_entity;
+                        }
+                    }
+                }
+            }
 
-			// Clean-up $serialized_entity_groups by removing empty items and entities
-			foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-				if ( empty( $seg_value['data'] ) ) {
-					unset( $serialized_entity_groups[ $seg_key ] );
-				}
-				unset( $serialized_entity_groups[ $seg_key ]['entities'] );
-			}
+            // Clean-up $serialized_entity_groups by removing empty items and entities
+            foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
+                if ( empty( $seg_value['data'] ) ) {
+                    unset( $serialized_entity_groups[ $seg_key ] );
+                }
+                unset( $serialized_entity_groups[ $seg_key ]['entities'] );
+            }
 
-			$results = $serialized_entity_groups;
-		}
+            $results = $serialized_entity_groups;
+        }
 
-		return $results;
-	}
+        return $results;
+    }
 
 }
 
@@ -374,34 +374,34 @@ 
  */
 function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
 
-	// Get the request body. It may contain posts to filter the results.
-	$request_body = ( empty( $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data );
+    // Get the request body. It may contain posts to filter the results.
+    $request_body = ( empty( $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data );
 
-	// Create the cache key.
-	$cache_key = array(
-		'request_body'   => $request_body,
-		'request_params' => $_REQUEST,
-	);
+    // Create the cache key.
+    $cache_key = array(
+        'request_body'   => $request_body,
+        'request_params' => $_REQUEST,
+    );
 
-	// 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_data_ajax( $request_body );
+    $results = wl_shortcode_faceted_search_data_ajax( $request_body );
 
-	// 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 );
 
 }
 
@@ -416,14 +416,14 @@ 
  */
 function wl_shortcode_faceted_search_wp_json( $http_raw_data = null ) {
 
-	$results = wl_shortcode_faceted_search_data_wp_json( $http_raw_data );
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    $results = wl_shortcode_faceted_search_data_wp_json( $http_raw_data );
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	return array(
-		'items' => $results,
-	);
+    return array(
+        'items' => $results,
+    );
 
 }
 
@@ -431,52 +431,52 @@ 
  * Adding `rest_api_init` action for amp backend of 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_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+        'methods'  => 'GET',
+        'callback' => 'wl_shortcode_faceted_search_wp_json',
+    ) );
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function () {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type( 'wordlift/faceted-search', array(
-		'editor_script'   => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_faceted_search ' . $attr_code . ']';
-		},
-		'attributes'      => array(
-			'title'          => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'show_facets'    => array(
-				'type'    => 'bool',
-				'default' => true,
-			),
-			'with_carousel'  => array(
-				'type'    => 'bool',
-				'default' => true,
-			),
-			'squared_thumbs' => array(
-				'type'    => 'bool',
-				'default' => false,
-			),
-			'limit'          => array(
-				'type'    => 'number',
-				'default' => 20,
-			),
-		),
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/faceted-search', array(
+        'editor_script'   => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_faceted_search ' . $attr_code . ']';
+        },
+        'attributes'      => array(
+            'title'          => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'show_facets'    => array(
+                'type'    => 'bool',
+                'default' => true,
+            ),
+            'with_carousel'  => array(
+                'type'    => 'bool',
+                'default' => true,
+            ),
+            'squared_thumbs' => array(
+                'type'    => 'bool',
+                'default' => false,
+            ),
+            'limit'          => array(
+                'type'    => 'number',
+                'default' => 20,
+            ),
+        ),
+    ) );
 } );

Spacing +116 added lines, -120 removed lines

@@ -16,24 +16,24 @@ 
  * @return array $results
  * @since        3.20.0
  */
-function wl_shortcode_faceted_search_data_ajax( $request_body = null ) {
+function wl_shortcode_faceted_search_data_ajax($request_body = null) {
 
 	// 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;
 	}
 
 	// Extract filtering conditions.
-	$filtering_entity_uris = json_decode( $request_body );
+	$filtering_entity_uris = json_decode($request_body);
 
 	$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;
 	}
@@ -42,45 +42,43 @@ 
 	// 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 ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 20; // WPCS: input var ok; CSRF ok.
 
 	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
 		$entity_ids,
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$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,
@@ -89,8 +87,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.
@@ -100,10 +98,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_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
 				$results[] = $post_obj;
 			}
@@ -112,7 +110,7 @@ 
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name.
 		$table_name = wl_core_get_relation_instances_table_name();
@@ -121,8 +119,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
@@ -136,20 +134,20 @@ 
 				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              = wl_serialize_entity($entity);
 					$serialized_entity['counter']   = $obj->counter;
 					$serialized_entity['createdAt'] = $entity->post_date;
 
@@ -169,25 +167,25 @@ 
  * @return array $results
  * @since        3.20.0
  */
-function wl_shortcode_faceted_search_data_wp_json( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_data_wp_json($http_raw_data = null) {
 
 	// 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;
 	}
 
 	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents('php://input') : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
 	$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;
 	}
@@ -196,45 +194,43 @@ 
 	// 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 ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 20; // WPCS: input var ok; CSRF ok.
 
 	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
 		$entity_ids,
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$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,
@@ -243,8 +239,8 @@ 
 				$referencing_post_ids
 			);
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $i => $post_obj ) {
+		if ($filtered_posts) {
+			foreach ($filtered_posts as $i => $post_obj) {
 
 				/**
 				 * Use the thumbnail.
@@ -254,29 +250,29 @@ 
 				 *
 				 * @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_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
-				$results[ $i ] = $post_obj;
+				$results[$i] = $post_obj;
 
 				// Get Entity URLs needed for client side filtering in amp
-				foreach ( Wordlift_Relation_Service::get_instance()->get_objects( $post_obj->ID, 'ids' ) as $entity_id ) {
-					$results[ $i ]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+				foreach (Wordlift_Relation_Service::get_instance()->get_objects($post_obj->ID, 'ids') as $entity_id) {
+					$results[$i]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri($entity_id);
 				}
 			}
 		}
 
 		return array(
-			array( 'values' => $results ),
+			array('values' => $results),
 		);
 
 	} else {
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name.
 		$table_name = wl_core_get_relation_instances_table_name();
@@ -285,22 +281,22 @@ 
 		$serialized_entity_groups = array(
 			array(
 				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['what'] : 'what',
-				'entities' => array( 'thing', 'creative-work', 'recipe' ),
+				'entities' => array('thing', 'creative-work', 'recipe'),
 				'data'     => array(),
 			),
 			array(
 				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['who'] : 'who',
-				'entities' => array( 'person', 'organization', 'local-business' ),
+				'entities' => array('person', 'organization', 'local-business'),
 				'data'     => array(),
 			),
 			array(
 				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['where'] : 'where',
-				'entities' => array( 'place' ),
+				'entities' => array('place'),
 				'data'     => array(),
 			),
 			array(
 				'l10n'     => $_GET['l10n'] ? $_GET['l10n']['when'] : 'when',
-				'entities' => array( 'event' ),
+				'entities' => array('event'),
 				'data'     => array(),
 			),
 		);
@@ -309,8 +305,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
@@ -324,38 +320,38 @@ 
 				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              = wl_serialize_entity($entity);
 					$serialized_entity['counter']   = $obj->counter;
 					$serialized_entity['createdAt'] = $entity->post_date;
 
 					// Populate $serialized_entity_groups maintaining array sequence
-					foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-						if ( in_array( $serialized_entity['mainType'], $seg_value['entities'] ) ) {
-							$serialized_entity_groups[ $seg_key ]['data'][] = $serialized_entity;
+					foreach ($serialized_entity_groups as $seg_key => $seg_value) {
+						if (in_array($serialized_entity['mainType'], $seg_value['entities'])) {
+							$serialized_entity_groups[$seg_key]['data'][] = $serialized_entity;
 						}
 					}
 				}
 			}
 
 			// Clean-up $serialized_entity_groups by removing empty items and entities
-			foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-				if ( empty( $seg_value['data'] ) ) {
-					unset( $serialized_entity_groups[ $seg_key ] );
+			foreach ($serialized_entity_groups as $seg_key => $seg_value) {
+				if (empty($seg_value['data'])) {
+					unset($serialized_entity_groups[$seg_key]);
 				}
-				unset( $serialized_entity_groups[ $seg_key ]['entities'] );
+				unset($serialized_entity_groups[$seg_key]['entities']);
 			}
 
 			$results = $serialized_entity_groups;
@@ -372,10 +368,10 @@ 
  * @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_ajax( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_ajax($http_raw_data = null) {
 
 	// Get the request body. It may contain posts to filter the results.
-	$request_body = ( empty( $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data );
+	$request_body = (empty($http_raw_data) ? file_get_contents('php://input') : $http_raw_data);
 
 	// Create the cache key.
 	$cache_key = array(
@@ -384,40 +380,40 @@ 
 	);
 
 	// 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_data_ajax( $request_body );
+	$results = wl_shortcode_faceted_search_data_ajax($request_body);
 
 	// 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);
 
 }
 
 /**
  * Adding `wp_ajax` and `wp_ajax_nopriv` action for web backend of faceted-search
  */
-add_action( 'wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
-add_action( 'wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
+add_action('wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
+add_action('wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
 
 /**
  * wp-json call for the faceted search widget
  */
-function wl_shortcode_faceted_search_wp_json( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_wp_json($http_raw_data = null) {
 
-	$results = wl_shortcode_faceted_search_data_wp_json( $http_raw_data );
-	if ( ob_get_contents() ) {
+	$results = wl_shortcode_faceted_search_data_wp_json($http_raw_data);
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
@@ -430,36 +426,36 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of 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_wp_json',
-	) );
+	));
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function () {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
-	register_block_type( 'wordlift/faceted-search', array(
+	register_block_type('wordlift/faceted-search', array(
 		'editor_script'   => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_faceted_search ' . $attr_code . ']';
+			return '[wl_faceted_search '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'title'          => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'show_facets'    => array(
 				'type'    => 'bool',
@@ -478,5 +474,5 @@ 
 				'default' => 20,
 			),
 		),
-	) );
+	));
 } );

src/includes/mapping/class-wordlift-mapping-service.php

Indentation +200 added lines, -200 removed lines

@@ -14,205 +14,205 @@
  */
 class Wordlift_Mapping_Service {
 
-	/**
-	 * The mapping's options.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var array $options The mapping's options.
-	 */
-	private $options;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Mapping_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	public function __construct( $entity_type_service ) {
-
-		// Set the entity type service instance.
-		$this->entity_type_service = $entity_type_service;
-
-		// Load the options.
-		$this->options = get_option( 'wl_mappings', array() );
-
-		// Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
-		add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types', ), 9 );
-		add_filter( 'wl_default_entity_types_for_post_type', array(
-			$this,
-			'default_entity_types_for_post_type',
-		), 9, 2 );
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return \Wordlift_Mapping_Service The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Save the options.
-	 *
-	 * @since 3.20.0
-	 */
-	private function save_options() {
-
-		update_option( 'wl_mappings', $this->options, true );
-
-	}
-
-	/**
-	 * Set the default entity types for a post type.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type Post type.
-	 * @param array  $entity_types An array of entity types slugs.
-	 */
-	public function set_entity_types_for_post_type( $post_type, $entity_types ) {
-
-		$this->options[ $post_type ] = $entity_types;
-		$this->save_options();
-
-	}
-
-	/**
-	 * Hook to `wl_valid_entity_post_types` to declare schema.org support for the configured post types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $post_types The default post types.
-	 *
-	 * @return array The supported post types.
-	 */
-	public function valid_entity_post_types( $post_types ) {
-
-		return array_merge( $post_types, array_keys( $this->options ) );
-	}
-
-	/**
-	 * Hook to `wl_default_entity_types_for_post_type` to declare the entity types for a post type.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array  $default The default entity types.
-	 * @param string $post_type The post type.
-	 *
-	 * @return array The default entity types.
-	 */
-	public function default_entity_types_for_post_type( $default, $post_type ) {
-
-		return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
-	}
-
-	/**
-	 * Update the post type with the entity types, starting at the specified offset.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The post type.
-	 * @param array  $entity_types The entity types.
-	 * @param int    $offset The offset (0 by default).
-	 *
-	 * @return array {
-	 * The result array.
-	 *
-	 * @type int     $current The current offset.
-	 * @type int     $next The next offset.
-	 * @type int     $count The total element count.
-	 * }
-	 */
-	public function update( $post_type, $entity_types, $offset = 0 ) {
-
-		$entity_type_service = $this->entity_type_service;
-		$tax_query           = $this->get_tax_query( $entity_types );
-
-		return Wordlift_Batch_Action::process( $post_type, $offset, $tax_query, function ( $post_id ) use ( $entity_type_service, $entity_types ) {
-			foreach ( $entity_types as $entity_type ) {
-				$entity_type_service->set( $post_id, $entity_type, false );
-			}
-		} );
-	}
-
-	/**
-	 * Count the number of posts that need to be assigned with the entity types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The post type.
-	 * @param array  $entity_types An array of entity types.
-	 *
-	 * @return int The number of posts to be assigned with entity types.
-	 */
-	public function count( $post_type, $entity_types ) {
-
-		$tax_query = $this->get_tax_query( $entity_types );
-
-		return Wordlift_Batch_Action::count( $post_type, $tax_query );
-	}
-
-	/**
-	 * Get the taxonomy query for the specified entity types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $entity_types The entity types.
-	 *
-	 * @return array The tax query.
-	 */
-	private function get_tax_query( $entity_types ) {
-
-		$entity_type_service = $this->entity_type_service;
-		$entity_types_terms  = array_filter( array_map( function ( $item ) use ( $entity_type_service ) {
-			return $entity_type_service->get_term_by_uri( $item );
-		}, $entity_types ) );
-
-		$entity_types_terms_ids = array_map( function ( $term ) {
-			return $term->term_id;
-		}, $entity_types_terms );
-
-		$tax_query = array(
-			'tax_query' => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'term_id',
-					'terms'    => $entity_types_terms_ids,
-					'operator' => 'NOT IN',
-				),
-			),
-		);
-
-		return $tax_query;
-	}
+    /**
+     * The mapping's options.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var array $options The mapping's options.
+     */
+    private $options;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The singleton instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Mapping_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    public function __construct( $entity_type_service ) {
+
+        // Set the entity type service instance.
+        $this->entity_type_service = $entity_type_service;
+
+        // Load the options.
+        $this->options = get_option( 'wl_mappings', array() );
+
+        // Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
+        add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types', ), 9 );
+        add_filter( 'wl_default_entity_types_for_post_type', array(
+            $this,
+            'default_entity_types_for_post_type',
+        ), 9, 2 );
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.20.0
+     *
+     * @return \Wordlift_Mapping_Service The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Save the options.
+     *
+     * @since 3.20.0
+     */
+    private function save_options() {
+
+        update_option( 'wl_mappings', $this->options, true );
+
+    }
+
+    /**
+     * Set the default entity types for a post type.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type Post type.
+     * @param array  $entity_types An array of entity types slugs.
+     */
+    public function set_entity_types_for_post_type( $post_type, $entity_types ) {
+
+        $this->options[ $post_type ] = $entity_types;
+        $this->save_options();
+
+    }
+
+    /**
+     * Hook to `wl_valid_entity_post_types` to declare schema.org support for the configured post types.
+     *
+     * @since 3.20.0
+     *
+     * @param array $post_types The default post types.
+     *
+     * @return array The supported post types.
+     */
+    public function valid_entity_post_types( $post_types ) {
+
+        return array_merge( $post_types, array_keys( $this->options ) );
+    }
+
+    /**
+     * Hook to `wl_default_entity_types_for_post_type` to declare the entity types for a post type.
+     *
+     * @since 3.20.0
+     *
+     * @param array  $default The default entity types.
+     * @param string $post_type The post type.
+     *
+     * @return array The default entity types.
+     */
+    public function default_entity_types_for_post_type( $default, $post_type ) {
+
+        return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
+    }
+
+    /**
+     * Update the post type with the entity types, starting at the specified offset.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The post type.
+     * @param array  $entity_types The entity types.
+     * @param int    $offset The offset (0 by default).
+     *
+     * @return array {
+     * The result array.
+     *
+     * @type int     $current The current offset.
+     * @type int     $next The next offset.
+     * @type int     $count The total element count.
+     * }
+     */
+    public function update( $post_type, $entity_types, $offset = 0 ) {
+
+        $entity_type_service = $this->entity_type_service;
+        $tax_query           = $this->get_tax_query( $entity_types );
+
+        return Wordlift_Batch_Action::process( $post_type, $offset, $tax_query, function ( $post_id ) use ( $entity_type_service, $entity_types ) {
+            foreach ( $entity_types as $entity_type ) {
+                $entity_type_service->set( $post_id, $entity_type, false );
+            }
+        } );
+    }
+
+    /**
+     * Count the number of posts that need to be assigned with the entity types.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The post type.
+     * @param array  $entity_types An array of entity types.
+     *
+     * @return int The number of posts to be assigned with entity types.
+     */
+    public function count( $post_type, $entity_types ) {
+
+        $tax_query = $this->get_tax_query( $entity_types );
+
+        return Wordlift_Batch_Action::count( $post_type, $tax_query );
+    }
+
+    /**
+     * Get the taxonomy query for the specified entity types.
+     *
+     * @since 3.20.0
+     *
+     * @param array $entity_types The entity types.
+     *
+     * @return array The tax query.
+     */
+    private function get_tax_query( $entity_types ) {
+
+        $entity_type_service = $this->entity_type_service;
+        $entity_types_terms  = array_filter( array_map( function ( $item ) use ( $entity_type_service ) {
+            return $entity_type_service->get_term_by_uri( $item );
+        }, $entity_types ) );
+
+        $entity_types_terms_ids = array_map( function ( $term ) {
+            return $term->term_id;
+        }, $entity_types_terms );
+
+        $tax_query = array(
+            'tax_query' => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'term_id',
+                    'terms'    => $entity_types_terms_ids,
+                    'operator' => 'NOT IN',
+                ),
+            ),
+        );
+
+        return $tax_query;
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -48,20 +48,20 @@ 
 	 *
 	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
 	 */
-	public function __construct( $entity_type_service ) {
+	public function __construct($entity_type_service) {
 
 		// Set the entity type service instance.
 		$this->entity_type_service = $entity_type_service;
 
 		// Load the options.
-		$this->options = get_option( 'wl_mappings', array() );
+		$this->options = get_option('wl_mappings', array());
 
 		// Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
-		add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types', ), 9 );
-		add_filter( 'wl_default_entity_types_for_post_type', array(
+		add_filter('wl_valid_entity_post_types', array($this, 'valid_entity_post_types',), 9);
+		add_filter('wl_default_entity_types_for_post_type', array(
 			$this,
 			'default_entity_types_for_post_type',
-		), 9, 2 );
+		), 9, 2);
 
 		// Set the singleton instance.
 		self::$instance = $this;
@@ -87,7 +87,7 @@ 
 	 */
 	private function save_options() {
 
-		update_option( 'wl_mappings', $this->options, true );
+		update_option('wl_mappings', $this->options, true);
 
 	}
 
@@ -99,9 +99,9 @@ 
 	 * @param string $post_type Post type.
 	 * @param array  $entity_types An array of entity types slugs.
 	 */
-	public function set_entity_types_for_post_type( $post_type, $entity_types ) {
+	public function set_entity_types_for_post_type($post_type, $entity_types) {
 
-		$this->options[ $post_type ] = $entity_types;
+		$this->options[$post_type] = $entity_types;
 		$this->save_options();
 
 	}
@@ -115,9 +115,9 @@ 
 	 *
 	 * @return array The supported post types.
 	 */
-	public function valid_entity_post_types( $post_types ) {
+	public function valid_entity_post_types($post_types) {
 
-		return array_merge( $post_types, array_keys( $this->options ) );
+		return array_merge($post_types, array_keys($this->options));
 	}
 
 	/**
@@ -130,9 +130,9 @@ 
 	 *
 	 * @return array The default entity types.
 	 */
-	public function default_entity_types_for_post_type( $default, $post_type ) {
+	public function default_entity_types_for_post_type($default, $post_type) {
 
-		return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
+		return isset($this->options[$post_type]) ? $this->options[$post_type] : $default;
 	}
 
 	/**
@@ -152,14 +152,14 @@ 
 	 * @type int     $count The total element count.
 	 * }
 	 */
-	public function update( $post_type, $entity_types, $offset = 0 ) {
+	public function update($post_type, $entity_types, $offset = 0) {
 
 		$entity_type_service = $this->entity_type_service;
-		$tax_query           = $this->get_tax_query( $entity_types );
+		$tax_query           = $this->get_tax_query($entity_types);
 
-		return Wordlift_Batch_Action::process( $post_type, $offset, $tax_query, function ( $post_id ) use ( $entity_type_service, $entity_types ) {
-			foreach ( $entity_types as $entity_type ) {
-				$entity_type_service->set( $post_id, $entity_type, false );
+		return Wordlift_Batch_Action::process($post_type, $offset, $tax_query, function($post_id) use ($entity_type_service, $entity_types) {
+			foreach ($entity_types as $entity_type) {
+				$entity_type_service->set($post_id, $entity_type, false);
 			}
 		} );
 	}
@@ -174,11 +174,11 @@ 
 	 *
 	 * @return int The number of posts to be assigned with entity types.
 	 */
-	public function count( $post_type, $entity_types ) {
+	public function count($post_type, $entity_types) {
 
-		$tax_query = $this->get_tax_query( $entity_types );
+		$tax_query = $this->get_tax_query($entity_types);
 
-		return Wordlift_Batch_Action::count( $post_type, $tax_query );
+		return Wordlift_Batch_Action::count($post_type, $tax_query);
 	}
 
 	/**
@@ -190,16 +190,16 @@ 
 	 *
 	 * @return array The tax query.
 	 */
-	private function get_tax_query( $entity_types ) {
+	private function get_tax_query($entity_types) {
 
 		$entity_type_service = $this->entity_type_service;
-		$entity_types_terms  = array_filter( array_map( function ( $item ) use ( $entity_type_service ) {
-			return $entity_type_service->get_term_by_uri( $item );
-		}, $entity_types ) );
+		$entity_types_terms  = array_filter(array_map(function($item) use ($entity_type_service) {
+			return $entity_type_service->get_term_by_uri($item);
+		}, $entity_types));
 
-		$entity_types_terms_ids = array_map( function ( $term ) {
+		$entity_types_terms_ids = array_map(function($term) {
 			return $term->term_id;
-		}, $entity_types_terms );
+		}, $entity_types_terms);
 
 		$tax_query = array(
 			'tax_query' => array(