insideout10 / wordlift-plugin

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

Indentation +430 added lines, -430 removed lines

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

Spacing +60 added lines, -60 removed lines

@@ -44,7 +44,7 @@ 
 	protected function __construct() {
 		global $wpdb;
 
-		self::$log = Wordlift_Log_Service::get_logger( get_class() );
+		self::$log = Wordlift_Log_Service::get_logger(get_class());
 
 		// The relations table.
 		$this->relation_table = "{$wpdb->prefix}wl_relation_instances";
@@ -69,7 +69,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -96,24 +96,24 @@ 
 	 * @return array|object|null Database query results
 	 * @since 3.15.0
 	 */
-	public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array(), $offset = null ) {
+	public function get_article_subjects($object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null, $order_by = null, $post_types = array(), $offset = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
-		self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
+		self::$log->trace('Getting article subjects for object '.implode(', ', (array) $object_id).'...');
 
-		$objects = $this->article_id_to_entity_id( $object_id );
+		$objects = $this->article_id_to_entity_id($object_id);
 
 		// If there are no related objects, return an empty array.
-		if ( empty( $objects ) ) {
-			self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
+		if (empty($objects)) {
+			self::$log->debug('No entities found for object '.implode(', ', (array) $object_id).'.');
 
 			return array();
 		}
 
-		self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
+		self::$log->debug(count($objects).' entity id(s) found for object '.implode(', ', (array) $object_id).'.');
 
 		$sql =
 			"
@@ -123,20 +123,20 @@ 
 				ON p.id = r.subject_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_article()
-			. self::where_object_id( $objects )
+			. self::where_object_id($objects)
 			// Since `object_id` can be an article ID we need to exclude it from
 			// the results.
-			. self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
-			. self::and_article_in( $include )
-			. self::and_post_type_in( $post_types )
-			. self::and_predicate( $predicate )
-			. self::order_by( $order_by )
-			. self::limit( $limit )
-			. self::offset( $offset );
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );  // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+			. self::and_article_not_in(array_merge($excludes, (array) $object_id))
+			. self::and_article_in($include)
+			. self::and_post_type_in($post_types)
+			. self::and_predicate($predicate)
+			. self::order_by($order_by)
+			. self::limit($limit)
+			. self::offset($offset);
+
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 	}
 
 	/**
@@ -148,16 +148,16 @@ 
 	 * @return string The `post_type IN` clause.
 	 * @since 3.15.3
 	 */
-	private static function and_post_type_in( $post_types = array() ) {
+	private static function and_post_type_in($post_types = array()) {
 
-		if ( array() === $post_types ) {
+		if (array() === $post_types) {
 			$post_types = Wordlift_Entity_Service::valid_entity_post_types();
 		}
 
 		return " AND p.post_type IN ( '"
 			. implode(
 				"','",
-				array_map( 'esc_sql', $post_types )
+				array_map('esc_sql', $post_types)
 			)
 			   . "' )";
 	}
@@ -170,9 +170,9 @@ 
 	 * @return string The limit clause (empty if no limit has been specified).
 	 * @since 3.15.0
 	 */
-	private static function limit( $limit = null ) {
+	private static function limit($limit = null) {
 
-		if ( null === $limit ) {
+		if (null === $limit) {
 			return '';
 		}
 
@@ -187,9 +187,9 @@ 
 	 * @return string The offset clause (empty if no offset has been specified).
 	 * @since 3.35.11
 	 */
-	private static function offset( $offset = null ) {
+	private static function offset($offset = null) {
 
-		if ( null === $offset || ! is_numeric( $offset ) ) {
+		if (null === $offset || ! is_numeric($offset)) {
 			return '';
 		}
 
@@ -201,14 +201,14 @@ 
 	 *
 	 * @return string
 	 */
-	private static function order_by( $order_by ) {
-		if ( ! $order_by ) {
+	private static function order_by($order_by) {
+		if ( ! $order_by) {
 			return '';
 		}
 		$order_by         = (string) $order_by;
-		$order_by_clauses = array( 'DESC', 'ASC' );
+		$order_by_clauses = array('DESC', 'ASC');
 
-		if ( in_array( $order_by, $order_by_clauses, true ) ) {
+		if (in_array($order_by, $order_by_clauses, true)) {
 			return " ORDER BY p.post_modified ${order_by} ";
 		} else {
 			return ' ORDER BY p.post_modified DESC ';
@@ -224,7 +224,7 @@ 
 	 * @return array An array of entities' ids.
 	 * @since 3.15.0
 	 */
-	private function article_id_to_entity_id( $object_id ) {
+	private function article_id_to_entity_id($object_id) {
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
@@ -232,12 +232,12 @@ 
 
 		return array_reduce(
 			(array) $object_id,
-			function ( $carry, $item ) use ( $entity_service, $relation_service ) {
-				if ( $entity_service->is_entity( $item ) ) {
-					return array_merge( $carry, (array) $item );
+			function($carry, $item) use ($entity_service, $relation_service) {
+				if ($entity_service->is_entity($item)) {
+					return array_merge($carry, (array) $item);
 				}
 
-				return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
+				return array_merge($carry, $relation_service->get_objects($item, 'ids'));
 			},
 			array()
 		);
@@ -252,15 +252,15 @@ 
 	 * @return string The WHERE clause.
 	 * @since 3.15.0
 	 */
-	private static function where_object_id( $object_id ) {
+	private static function where_object_id($object_id) {
 
-		if ( empty( $object_id ) ) {
+		if (empty($object_id)) {
 			// self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
 
 			return ' WHERE 1 = 1';
 		}
 
-		return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
+		return ' WHERE r.object_id IN ( '.implode(',', wp_parse_id_list((array) $object_id)).' )';
 	}
 
 	/**
@@ -271,9 +271,9 @@ 
 	 * @return string The exclude clause.
 	 * @since 3.15.0
 	 */
-	private static function and_article_not_in( $exclude ) {
+	private static function and_article_not_in($exclude) {
 
-		return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
+		return ' AND NOT p.ID IN ( '.implode(',', wp_parse_id_list((array) $exclude)).' )';
 	}
 
 	/**
@@ -285,13 +285,13 @@ 
 	 *                clause.
 	 * @since 3.15.0
 	 */
-	private static function and_article_in( $include = null ) {
+	private static function and_article_in($include = null) {
 
-		if ( null === $include ) {
+		if (null === $include) {
 			return '';
 		}
 
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
+		return ' AND p.ID IN ( '.implode(',', wp_parse_id_list((array) $include)).' )';
 	}
 
 	/**
@@ -305,23 +305,23 @@ 
 	 * @return array|object|null Database query results
 	 * @since 3.15.0
 	 */
-	public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
+	public function get_non_article_subjects($object_id, $fields = '*', $status = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
 		$sql = $wpdb->prepare(
 			"SELECT p.$actual_fields FROM {$wpdb->prefix}wl_relation_instances r INNER JOIN $wpdb->posts p ON p.id = r.subject_id" // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			// Add the status clause.
-			. self::and_status( $status ) // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+			. self::and_status($status) // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 			. self::inner_join_is_not_article() // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 			. ' WHERE r.object_id = %d '
 			. self::and_post_type_in(), // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 			$object_id
 		);
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 	}
 
 	/**
@@ -338,24 +338,24 @@ 
 	 * @deprecated since it doesn't handle the subject_type nor the object_type
 	 * @since 3.15.0
 	 */
-	public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
+	public function get_objects($subject_id, $fields = '*', $predicate = null, $status = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
 		$sql = $wpdb->prepare(
 			"SELECT p.$actual_fields FROM {$this->relation_table} r INNER JOIN $wpdb->posts p ON p.id = r.object_id" // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			// Add the status clause.
-			. self::and_status( $status ) // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+			. self::and_status($status) // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 			. self::inner_join_is_not_article() // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 			. ' WHERE r.subject_id = %d '
 			. self::and_post_type_in() // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			. self::and_predicate( $predicate ), // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+			. self::and_predicate($predicate), // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 			$subject_id
 		);
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 	}
 
 	/**
@@ -366,13 +366,13 @@ 
 	 * @return string An empty string if $status is null, otherwise the status clause.
 	 * @since 3.15.0
 	 */
-	private static function and_status( $status = null ) {
+	private static function and_status($status = null) {
 
-		if ( null === $status ) {
+		if (null === $status) {
 			return '';
 		}
 
-		return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
+		return " AND p.post_status IN ('".implode("', '", array_map('esc_sql', (array) $status))."')";
 	}
 
 	/**
@@ -384,13 +384,13 @@ 
 	 *                clause.
 	 * @since 3.15.0
 	 */
-	private static function and_predicate( $predicate = null ) {
+	private static function and_predicate($predicate = null) {
 
-		if ( null === $predicate ) {
+		if (null === $predicate) {
 			return '';
 		}
 
-		return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
+		return " AND r.predicate IN ('".implode("', '", array_map('esc_sql', (array) $predicate))."')";
 	}
 
 	/**
@@ -401,7 +401,7 @@ 
 	 * @return string The `id` field if `ids` otherwise `*`.
 	 * @since 3.15.0
 	 */
-	private static function fields( $fields = '*' ) {
+	private static function fields($fields = '*') {
 
 		// The output fields.
 		return 'ids' === $fields ? 'id' : '*';

src/includes/class-wordlift.php

Indentation +1770 added lines, -1770 removed lines

@@ -83,1852 +83,1852 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The {@link Wordlift_Tinymce_Adapter} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
-	 */
-	protected $tinymce_adapter;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	protected $schema_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since  3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The Entity Types Taxonomy service.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Taxonomy_Service The Entity Types Taxonomy service.
-	 */
-	private $entity_types_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since  3.1.7
-	 * @access protected
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	protected $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
-	 */
-	protected $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since  3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service
-	 */
-	private $entity_post_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service $entity_link_service The {@link Wordlift_Entity_Link_Service} instance.
-	 */
-	private $entity_link_service;
-
-	/**
-	 * A {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access protected
-	 * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
-	 */
-	protected $jsonld_service;
-
-	/**
-	 * A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Website_Jsonld_Converter $jsonld_website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 */
-	protected $jsonld_website_converter;
-
-	/**
-	 * A {@link Wordlift_Property_Factory} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Property_Factory $property_factory
-	 */
-	private $property_factory;
-
-	/**
-	 * The 'Download Your Data' page.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
-	 */
-	private $download_your_data_page;
-
-	/**
-	 * The 'WordLift Settings' page.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
-	 */
-	protected $settings_page;
-
-	/**
-	 * The install wizard page.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
-	 */
-	public $admin_setup;
-
-	/**
-	 * The Content Filter Service hooks up to the 'the_content' filter and provides
-	 * linking of entities to their pages.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
-	 */
-	private $content_filter_service;
-
-	/**
-	 * The Faq Content filter service
-	 *
-	 * @since  3.26.0
-	 * @access private
-	 * @var Faq_Content_Filter $faq_content_filter_service A {@link Faq_Content_Filter} instance.
-	 */
-	private $faq_content_filter_service;
-
-	/**
-	 * A {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
-	 */
-	private $key_validation_service;
-
-	/**
-	 * A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	private $rating_service;
-
-	/**
-	 * A {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter A {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Install_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var \Wordlift_Install_Service $install_service A {@link Wordlift_Install_Service} instance.
-	 */
-	protected $install_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $entity_post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 */
-	protected $postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 */
-	protected $category_taxonomy_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Page_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Page_Service $entity_page_service The {@link Wordlift_Entity_Page_Service} instance.
-	 */
-	protected $entity_page_service;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $analytics_settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Analytics_Connect} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Analytics_Connect $analytics_connect The {@link Wordlift_Analytics_Connect} class.
-	 */
-	protected $analytics_connect;
-
-	/**
-	 * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 */
-	protected $publisher_ajax_adapter;
-
-	/**
-	 * The {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	protected $input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	protected $radio_input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	protected $language_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Country_Select_Element $country_select_element The {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 */
-	protected $country_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	protected $publisher_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 */
-	protected $select2_element;
-
-	/**
-	 * The controller for the entity type list admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
-	 */
-	private $entity_type_admin_page;
-
-	/**
-	 * The controller for the entity type settings admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
-	 */
-	private $entity_type_settings_admin_page;
-
-	/**
-	 * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 */
-	protected $related_entities_cloud_widget;
-
-	/**
-	 * The {@link Wordlift_Admin_Author_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Author_Element $author_element The {@link Wordlift_Admin_Author_Element} instance.
-	 */
-	protected $author_element;
-
-	/**
-	 * The {@link Wordlift_Sample_Data_Service} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
-	 */
-	protected $sample_data_service;
-
-	/**
-	 * The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Sample_Data_Ajax_Adapter $sample_data_ajax_adapter The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
-	 */
-	protected $sample_data_ajax_adapter;
-
-	/**
-	 * The {@link Wordlift_Google_Analytics_Export_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var \Wordlift_Google_Analytics_Export_Service $google_analytics_export_service The {@link Wordlift_Google_Analytics_Export_Service} instance.
-	 */
-	protected $google_analytics_export_service;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Adapter $entity_type_adapter The {@link Wordlift_Entity_Type_Adapter} instance.
-	 */
-	protected $entity_type_adapter;
-
-	/**
-	 * The {@link Wordlift_Storage_Factory} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Storage_Factory $storage_factory The {@link Wordlift_Storage_Factory} instance.
-	 */
-	protected $storage_factory;
-
-	/**
-	 * The {@link Wordlift_Autocomplete_Adapter} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Autocomplete_Adapter $autocomplete_adapter The {@link Wordlift_Autocomplete_Adapter} instance.
-	 */
-	private $autocomplete_adapter;
-
-	/**
-	 * The {@link Wordlift_Cached_Post_Converter} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var  \Wordlift_Cached_Post_Converter $cached_postid_to_jsonld_converter The {@link Wordlift_Cached_Post_Converter} instance.
-	 */
-	protected $cached_postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access protected
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	protected $entity_uri_service;
-
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.19.0
-	 * @access protected
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	protected $publisher_service;
-
-	/**
-	 * The {@link Wordlift_Context_Cards_Service} instance.
-	 *
-	 * @var \Wordlift_Context_Cards_Service The {@link Wordlift_Context_Cards_Service} instance.
-	 */
-	protected $context_cards_service;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.11.2
-	 * @access private
-	 * @var Wordlift $instance {@link Wordlift}'s singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * A singleton instance of features registry.
-	 *
-	 * @since 3.30.0
-	 * @var Features_Registry
-	 */
-	private $features_registry;
-
-	private $analytics_settings_page;
-
-	private $webhook_loader;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		self::$instance = $this;
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = WORDLIFT_VERSION;
-		$this->load_dependencies();
-		$this->set_locale();
-
-		$that = $this;
-		add_action(
-			'plugins_loaded',
-			function () use ( $that ) {
-				$that->define_admin_hooks( $that );
-				$that->define_public_hooks( $that );
-			},
-			4
-		);
-
-		// If we're in `WP_CLI` load the related files.
-		if ( class_exists( 'WP_CLI' ) ) {
-			$this->load_cli_dependencies();
-		}
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return Wordlift The {@link Wordlift} singleton instance.
-	 * @since 3.11.2
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @throws Exception when an error occurs.
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-loader.php';
-
-		// The class responsible for plugin uninstall.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-deactivator-feedback.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * WordLift's supported languages.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-languages.php';
-
-		/**
-		 * WordLift's supported countries.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-countries.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sanitizer.php';
-
-		/** Services. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-log-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-http-api.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-redirect-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-configuration-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-post-type-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-link-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-image-service.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-service.php';
-
-		// Add the entity rating service.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-rating-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sample-data-service.php';
-
-		require_once plugin_dir_path( __DIR__ ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-attachment-service.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-website-jsonld-converter.php';
-
-		/**
-		 * Load cache-related files.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/cache/require.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/*
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The {@link Wordlift_Tinymce_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
+     */
+    protected $tinymce_adapter;
+
+    /**
+     * The Schema service.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    protected $schema_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since  3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The Entity Types Taxonomy service.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Taxonomy_Service The Entity Types Taxonomy service.
+     */
+    private $entity_types_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since  3.1.7
+     * @access protected
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    protected $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
+     */
+    protected $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since  3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service
+     */
+    private $entity_post_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service $entity_link_service The {@link Wordlift_Entity_Link_Service} instance.
+     */
+    private $entity_link_service;
+
+    /**
+     * A {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since  3.7.0
+     * @access protected
+     * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
+     */
+    protected $jsonld_service;
+
+    /**
+     * A {@link Wordlift_Website_Jsonld_Converter} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Website_Jsonld_Converter $jsonld_website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     */
+    protected $jsonld_website_converter;
+
+    /**
+     * A {@link Wordlift_Property_Factory} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Property_Factory $property_factory
+     */
+    private $property_factory;
+
+    /**
+     * The 'Download Your Data' page.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
+     */
+    private $download_your_data_page;
+
+    /**
+     * The 'WordLift Settings' page.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
+     */
+    protected $settings_page;
+
+    /**
+     * The install wizard page.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
+     */
+    public $admin_setup;
+
+    /**
+     * The Content Filter Service hooks up to the 'the_content' filter and provides
+     * linking of entities to their pages.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
+     */
+    private $content_filter_service;
+
+    /**
+     * The Faq Content filter service
+     *
+     * @since  3.26.0
+     * @access private
+     * @var Faq_Content_Filter $faq_content_filter_service A {@link Faq_Content_Filter} instance.
+     */
+    private $faq_content_filter_service;
+
+    /**
+     * A {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
+     */
+    private $key_validation_service;
+
+    /**
+     * A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    private $rating_service;
+
+    /**
+     * A {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter A {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     */
+    protected $post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Install_Service} instance.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var \Wordlift_Install_Service $install_service A {@link Wordlift_Install_Service} instance.
+     */
+    protected $install_service;
+
+    /**
+     * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     */
+    protected $entity_post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     */
+    protected $postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_Category_Taxonomy_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
+     */
+    protected $category_taxonomy_service;
+
+    /**
+     * The {@link Wordlift_Entity_Page_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Entity_Page_Service $entity_page_service The {@link Wordlift_Entity_Page_Service} instance.
+     */
+    protected $entity_page_service;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $analytics_settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Analytics_Connect} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Analytics_Connect $analytics_connect The {@link Wordlift_Analytics_Connect} class.
+     */
+    protected $analytics_connect;
+
+    /**
+     * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     */
+    protected $publisher_ajax_adapter;
+
+    /**
+     * The {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    protected $input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    protected $radio_input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    protected $language_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var \Wordlift_Admin_Country_Select_Element $country_select_element The {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     */
+    protected $country_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    protected $publisher_element;
+
+    /**
+     * The {@link Wordlift_Admin_Select2_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
+     */
+    protected $select2_element;
+
+    /**
+     * The controller for the entity type list admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
+     */
+    private $entity_type_admin_page;
+
+    /**
+     * The controller for the entity type settings admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
+     */
+    private $entity_type_settings_admin_page;
+
+    /**
+     * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     */
+    protected $related_entities_cloud_widget;
+
+    /**
+     * The {@link Wordlift_Admin_Author_Element} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Admin_Author_Element $author_element The {@link Wordlift_Admin_Author_Element} instance.
+     */
+    protected $author_element;
+
+    /**
+     * The {@link Wordlift_Sample_Data_Service} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
+     */
+    protected $sample_data_service;
+
+    /**
+     * The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Sample_Data_Ajax_Adapter $sample_data_ajax_adapter The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
+     */
+    protected $sample_data_ajax_adapter;
+
+    /**
+     * The {@link Wordlift_Google_Analytics_Export_Service} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var \Wordlift_Google_Analytics_Export_Service $google_analytics_export_service The {@link Wordlift_Google_Analytics_Export_Service} instance.
+     */
+    protected $google_analytics_export_service;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Adapter $entity_type_adapter The {@link Wordlift_Entity_Type_Adapter} instance.
+     */
+    protected $entity_type_adapter;
+
+    /**
+     * The {@link Wordlift_Storage_Factory} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Storage_Factory $storage_factory The {@link Wordlift_Storage_Factory} instance.
+     */
+    protected $storage_factory;
+
+    /**
+     * The {@link Wordlift_Autocomplete_Adapter} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Autocomplete_Adapter $autocomplete_adapter The {@link Wordlift_Autocomplete_Adapter} instance.
+     */
+    private $autocomplete_adapter;
+
+    /**
+     * The {@link Wordlift_Cached_Post_Converter} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var  \Wordlift_Cached_Post_Converter $cached_postid_to_jsonld_converter The {@link Wordlift_Cached_Post_Converter} instance.
+     */
+    protected $cached_postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since  3.16.3
+     * @access protected
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    protected $entity_uri_service;
+
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.19.0
+     * @access protected
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    protected $publisher_service;
+
+    /**
+     * The {@link Wordlift_Context_Cards_Service} instance.
+     *
+     * @var \Wordlift_Context_Cards_Service The {@link Wordlift_Context_Cards_Service} instance.
+     */
+    protected $context_cards_service;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.11.2
+     * @access private
+     * @var Wordlift $instance {@link Wordlift}'s singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * A singleton instance of features registry.
+     *
+     * @since 3.30.0
+     * @var Features_Registry
+     */
+    private $features_registry;
+
+    private $analytics_settings_page;
+
+    private $webhook_loader;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        self::$instance = $this;
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = WORDLIFT_VERSION;
+        $this->load_dependencies();
+        $this->set_locale();
+
+        $that = $this;
+        add_action(
+            'plugins_loaded',
+            function () use ( $that ) {
+                $that->define_admin_hooks( $that );
+                $that->define_public_hooks( $that );
+            },
+            4
+        );
+
+        // If we're in `WP_CLI` load the related files.
+        if ( class_exists( 'WP_CLI' ) ) {
+            $this->load_cli_dependencies();
+        }
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return Wordlift The {@link Wordlift} singleton instance.
+     * @since 3.11.2
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @throws Exception when an error occurs.
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-loader.php';
+
+        // The class responsible for plugin uninstall.
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-deactivator-feedback.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * WordLift's supported languages.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-languages.php';
+
+        /**
+         * WordLift's supported countries.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-countries.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sanitizer.php';
+
+        /** Services. */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-log-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-http-api.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-redirect-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-configuration-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-post-type-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-link-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-relation-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-image-service.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-uri-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-service.php';
+
+        // Add the entity rating service.
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-rating-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-uri-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-property-factory.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sample-data-service.php';
+
+        require_once plugin_dir_path( __DIR__ ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-attachment-service.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/intf-wordlift-post-converter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-website-jsonld-converter.php';
+
+        /**
+         * Load cache-related files.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/cache/require.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-excerpt-helper.php';
-
-		/**
-		 * Load the JSON-LD service to publish entities using JSON-LD.s
-		 *
-		 * @since 3.8.0
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-jsonld-service.php';
-
-		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
-
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-adapter.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-key-validation-service.php';
-
-		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-category-taxonomy-service.php';
-
-		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-page-service.php';
-
-		/** Linked Data. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
-
-		/** Services. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-api-service.php';
-
-		/** Adapters. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-newrelic-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-wprocket-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-nitropack-adapter.php';
-
-		/** Autocomplete. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-autocomplete-adapter.php';
-
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-remote-image-service.php';
-
-		/** Analytics */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/analytics/class-wordlift-analytics-connect.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-list-service.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		global $wp_version;
-		if ( version_compare( $wp_version, '5.3', '<' ) ) {
-			require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-		} else {
-			require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
-		}
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-dashboard-service.php';
-
-		/**
-		 * The admin 'Install wizard' page.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-setup.php';
-
-		/**
-		 * The WordLift entity type list admin page controller.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
-
-		/**
-		 * The WordLift entity type settings admin page controller.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-entity-type-settings.php';
-
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-download-your-data-page.php';
-
-		/**
-		 * The admin 'WordLift Settings' page.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-radio-input-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-select-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-author-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
-
-		/** Admin Pages */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-user-profile-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-type-admin-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-shortcode.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-navigator-shortcode.php';
-
-		/**
-		 * The Products Navigator shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-products-navigator-shortcode.php';
-
-		/**
-		 * The chord shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-chord-shortcode.php';
-
-		/**
-		 * The geomap shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-geomap-shortcode.php';
-
-		/**
-		 * The entity cloud shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
-
-		/**
-		 * The entity glossary shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-alphabet-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-vocabulary-shortcode.php';
-
-		/**
-		 * Faceted Search shortcode.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-faceted-search-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-sharethis-service.php';
-
-		/**
-		 * The SEO service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-seo-service.php';
-
-		/**
-		 * The AMP service.
-		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-amp-service.php';
-
-		/** Widgets */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-related-entities-cloud-widget.php';
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-context-cards-service.php';
-
-		/*
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-excerpt-helper.php';
+
+        /**
+         * Load the JSON-LD service to publish entities using JSON-LD.s
+         *
+         * @since 3.8.0
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-jsonld-service.php';
+
+        // The Publisher Service and the AJAX adapter.
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-publisher-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-adapter.php';
+
+        /**
+         * Load the WordLift key validation service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-key-validation-service.php';
+
+        // Load the `Wordlift_Category_Taxonomy_Service` class definition.
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-category-taxonomy-service.php';
+
+        // Load the `Wordlift_Entity_Page_Service` class definition.
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-page-service.php';
+
+        /** Linked Data. */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
+
+        /** Services. */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-google-analytics-export-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-api-service.php';
+
+        /** Adapters. */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-tinymce-adapter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-newrelic-adapter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-adapter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-wprocket-adapter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-nitropack-adapter.php';
+
+        /** Autocomplete. */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-autocomplete-adapter.php';
+
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-remote-image-service.php';
+
+        /** Analytics */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/analytics/class-wordlift-analytics-connect.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-list-service.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        global $wp_version;
+        if ( version_compare( $wp_version, '5.3', '<' ) ) {
+            require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+        } else {
+            require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
+        }
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-dashboard-service.php';
+
+        /**
+         * The admin 'Install wizard' page.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-setup.php';
+
+        /**
+         * The WordLift entity type list admin page controller.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+
+        /**
+         * The WordLift entity type settings admin page controller.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-entity-type-settings.php';
+
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-download-your-data-page.php';
+
+        /**
+         * The admin 'WordLift Settings' page.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/intf-wordlift-admin-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-input-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-radio-input-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-select-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-select2-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-author-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-page.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-page.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
+
+        /** Admin Pages */
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-user-profile-page.php';
+        require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-type-admin-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-shortcode.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-navigator-shortcode.php';
+
+        /**
+         * The Products Navigator shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-products-navigator-shortcode.php';
+
+        /**
+         * The chord shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-chord-shortcode.php';
+
+        /**
+         * The geomap shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-geomap-shortcode.php';
+
+        /**
+         * The entity cloud shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+
+        /**
+         * The entity glossary shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-alphabet-service.php';
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-vocabulary-shortcode.php';
+
+        /**
+         * Faceted Search shortcode.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-faceted-search-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-sharethis-service.php';
+
+        /**
+         * The SEO service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-seo-service.php';
+
+        /**
+         * The AMP service.
+         */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-amp-service.php';
+
+        /** Widgets */
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-widget.php';
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-related-entities-cloud-widget.php';
+        require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-context-cards-service.php';
+
+        /*
 		 * Batch Operations. They're similar to Batch Actions but do not require working on post types.
 		 *
 		 * Eventually Batch Actions will become Batch Operations.
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/batch/intf-wordlift-batch-operation.php';
+        require_once plugin_dir_path( __DIR__ ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
-		/*
+        /*
 		 * Schema.org Services.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
-			require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
-			new Wordlift_Schemaorg_Sync_Service();
-			$schemaorg_property_service = Wordlift_Schemaorg_Property_Service::get_instance();
-			new Wordlift_Schemaorg_Class_Service();
-		} else {
-			$schemaorg_property_service = null;
-		}
-
-		$this->loader = new Wordlift_Loader();
-		/**
-		 * @since 3.30.0
-		 */
-		$this->features_registry = Features_Registry::get_instance();
-
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
-
-		// Load the `wl-api` end-point.
-		new Wordlift_Http_Api();
-
-		// Load the Install Service.
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-service.php';
-		$this->install_service = new Wordlift_Install_Service();
-		$this->notice_service  = new Wordlift_Notice_Service();
-		$this->user_service    = Wordlift_User_Service::get_instance();
-		// create an instance of the entity type list admin page controller.
-		$this->entity_type_admin_page        = new Wordlift_Admin_Entity_Taxonomy_List_Page();
-		$this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
-		$this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service(
-			Wordlift_Entity_Service::TYPE_NAME,
-			Wordlift_Configuration_Service::get_instance()->get_entity_base_path()
-		);
-		/* WordPress Admin. */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page();
-		// create an instance of the entity type setting admin page controller.
-		$this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
-
-		$that = $this;
-		add_action(
-			'plugins_loaded',
-			// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			function () use ( &$that, $schemaorg_property_service ) {
-
-				/** Services. */
-				// Create the configuration service.
-				new Wordlift_Api_Service();
-
-				// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-				$that->entity_link_service = new Wordlift_Entity_Link_Service( $that->entity_post_type_service, Wordlift_Configuration_Service::get_instance()->get_entity_base_path() );
-
-				$schema_url_property_service = new Wordlift_Schema_Url_Property_Service();
-
-				$that->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
-
-				// Create a new instance of the Redirect service.
-				$that->redirect_service = new Wordlift_Redirect_Service( $that->entity_uri_service );
-
-				// Create a new instance of the Timeline service and Timeline shortcode.
-				$that->timeline_service = new Wordlift_Timeline_Service();
-
-				$that->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
-
-				// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-				$that->sharethis_service = new Wordlift_ShareThis_Service();
-
-				// Create an instance of the PrimaShop adapter.
-				$that->primashop_adapter = new Wordlift_PrimaShop_Adapter();
-
-				$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
-
-				// Create the entity rating service.
-				$that->rating_service = Wordlift_Rating_Service::get_instance();
-
-				// Create entity list customization (wp-admin/edit.php).
-				$that->entity_list_service = new Wordlift_Entity_List_Service( $that->rating_service );
-
-				// Create an instance of the Publisher Service and the AJAX Adapter.
-				$that->publisher_service = Wordlift_Publisher_Service::get_instance();
-				$that->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
-				$that->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
-
-				$attachment_service = Wordlift_Attachment_Service::get_instance();
-
-				// Instantiate the JSON-LD service.
-				$property_getter                       = Wordlift_Property_Getter_Factory::create();
-				$that->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service );
-				$that->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $that->post_to_jsonld_converter );
-				$that->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $that->entity_post_to_jsonld_converter, $that->post_to_jsonld_converter );
-				$that->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service );
-
-				$jsonld_cache                            = new Ttl_Cache( 'jsonld', 86400 );
-				$that->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $that->postid_to_jsonld_converter, $jsonld_cache );
-				/*
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
+            require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
+            require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
+            require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
+            new Wordlift_Schemaorg_Sync_Service();
+            $schemaorg_property_service = Wordlift_Schemaorg_Property_Service::get_instance();
+            new Wordlift_Schemaorg_Class_Service();
+        } else {
+            $schemaorg_property_service = null;
+        }
+
+        $this->loader = new Wordlift_Loader();
+        /**
+         * @since 3.30.0
+         */
+        $this->features_registry = Features_Registry::get_instance();
+
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+
+        // Load the `wl-api` end-point.
+        new Wordlift_Http_Api();
+
+        // Load the Install Service.
+        require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-service.php';
+        $this->install_service = new Wordlift_Install_Service();
+        $this->notice_service  = new Wordlift_Notice_Service();
+        $this->user_service    = Wordlift_User_Service::get_instance();
+        // create an instance of the entity type list admin page controller.
+        $this->entity_type_admin_page        = new Wordlift_Admin_Entity_Taxonomy_List_Page();
+        $this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
+        $this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
+        // Create an entity type service instance. It'll be later bound to the init action.
+        $this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service(
+            Wordlift_Entity_Service::TYPE_NAME,
+            Wordlift_Configuration_Service::get_instance()->get_entity_base_path()
+        );
+        /* WordPress Admin. */
+        $this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page();
+        // create an instance of the entity type setting admin page controller.
+        $this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
+
+        $that = $this;
+        add_action(
+            'plugins_loaded',
+            // phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+            function () use ( &$that, $schemaorg_property_service ) {
+
+                /** Services. */
+                // Create the configuration service.
+                new Wordlift_Api_Service();
+
+                // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+                $that->entity_link_service = new Wordlift_Entity_Link_Service( $that->entity_post_type_service, Wordlift_Configuration_Service::get_instance()->get_entity_base_path() );
+
+                $schema_url_property_service = new Wordlift_Schema_Url_Property_Service();
+
+                $that->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
+
+                // Create a new instance of the Redirect service.
+                $that->redirect_service = new Wordlift_Redirect_Service( $that->entity_uri_service );
+
+                // Create a new instance of the Timeline service and Timeline shortcode.
+                $that->timeline_service = new Wordlift_Timeline_Service();
+
+                $that->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+
+                // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+                $that->sharethis_service = new Wordlift_ShareThis_Service();
+
+                // Create an instance of the PrimaShop adapter.
+                $that->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+
+                $uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+
+                // Create the entity rating service.
+                $that->rating_service = Wordlift_Rating_Service::get_instance();
+
+                // Create entity list customization (wp-admin/edit.php).
+                $that->entity_list_service = new Wordlift_Entity_List_Service( $that->rating_service );
+
+                // Create an instance of the Publisher Service and the AJAX Adapter.
+                $that->publisher_service = Wordlift_Publisher_Service::get_instance();
+                $that->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
+                $that->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+
+                $attachment_service = Wordlift_Attachment_Service::get_instance();
+
+                // Instantiate the JSON-LD service.
+                $property_getter                       = Wordlift_Property_Getter_Factory::create();
+                $that->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service );
+                $that->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $that->post_to_jsonld_converter );
+                $that->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $that->entity_post_to_jsonld_converter, $that->post_to_jsonld_converter );
+                $that->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service );
+
+                $jsonld_cache                            = new Ttl_Cache( 'jsonld', 86400 );
+                $that->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $that->postid_to_jsonld_converter, $jsonld_cache );
+                /*
 				* Load the `Wordlift_Term_JsonLd_Adapter`.
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/892
 				*
 				* @since 3.20.0
 				*/
-				require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-term-jsonld-adapter.php';
-
-				$term_jsonld_adapter  = new Wordlift_Term_JsonLd_Adapter( $that->entity_uri_service, $that->cached_postid_to_jsonld_converter );
-				$that->jsonld_service = new Wordlift_Jsonld_Service( Wordlift_Entity_Service::get_instance(), $that->cached_postid_to_jsonld_converter, $that->jsonld_website_converter, $term_jsonld_adapter );
-
-				$jsonld_service = new Jsonld_Service(
-					$that->jsonld_service,
-					$term_jsonld_adapter,
-					new Jsonld_User_Service( $that->user_service )
-				);
-				new Jsonld_Endpoint( $jsonld_service, $that->entity_uri_service );
-
-				// Prints the JSON-LD in the head.
-				new Jsonld_Adapter( $that->jsonld_service );
-
-				new Jsonld_By_Id_Endpoint( $that->jsonld_service, $that->entity_uri_service );
-
-				$that->key_validation_service = new Wordlift_Key_Validation_Service();
-
-				$that->content_filter_service = Wordlift_Content_Filter_Service::get_instance();
-				// Creating Faq Content filter service.
-				$that->faq_content_filter_service = new Faq_Content_Filter();
-				$that->sample_data_service        = Wordlift_Sample_Data_Service::get_instance();
-				$that->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter( $that->sample_data_service );
-
-				$that->loader->add_action( 'enqueue_block_editor_assets', $that, 'add_wl_enabled_blocks' );
-				$that->loader->add_action( 'admin_enqueue_scripts', $that, 'add_wl_enabled_blocks' );
-
-				/**
-				 * Filter: wl_feature__enable__blocks.
-				 *
-				 * @param bool whether the blocks needed to be registered, defaults to true.
-				 *
-				 * @return bool
-				 * @since 3.27.6
-				 */
-				if ( apply_filters( 'wl_feature__enable__blocks', true ) ) {
-					// Initialize the short-codes.
-					new Async_Template_Decorator( new Wordlift_Navigator_Shortcode() );
-					new Wordlift_Chord_Shortcode();
-					new Wordlift_Geomap_Shortcode();
-					new Wordlift_Timeline_Shortcode();
-					new Wordlift_Related_Entities_Cloud_Shortcode( Wordlift_Relation_Service::get_instance(), Wordlift_Entity_Service::get_instance() );
-					new Wordlift_Vocabulary_Shortcode();
-					new Async_Template_Decorator( new Wordlift_Faceted_Search_Shortcode() );
-				}
-
-				new Wordlift_Products_Navigator_Shortcode();
-
-				// Initialize the Context Cards Service
-				$that->context_cards_service = new Wordlift_Context_Cards_Service();
-
-				// Initialize the SEO service.
-				new Wordlift_Seo_Service();
-
-				// Initialize the AMP service.
-				new Wordlift_AMP_Service( $that->jsonld_service );
-
-				/** Services. */
-				$that->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
-				new Wordlift_Image_Service();
-
-				/** Adapters. */
-				$that->entity_type_adapter    = new Wordlift_Entity_Type_Adapter( Wordlift_Entity_Type_Service::get_instance() );
-				$that->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $that->publisher_service );
-				$that->tinymce_adapter        = new Wordlift_Tinymce_Adapter( $that );
-
-				/*
+                require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-term-jsonld-adapter.php';
+
+                $term_jsonld_adapter  = new Wordlift_Term_JsonLd_Adapter( $that->entity_uri_service, $that->cached_postid_to_jsonld_converter );
+                $that->jsonld_service = new Wordlift_Jsonld_Service( Wordlift_Entity_Service::get_instance(), $that->cached_postid_to_jsonld_converter, $that->jsonld_website_converter, $term_jsonld_adapter );
+
+                $jsonld_service = new Jsonld_Service(
+                    $that->jsonld_service,
+                    $term_jsonld_adapter,
+                    new Jsonld_User_Service( $that->user_service )
+                );
+                new Jsonld_Endpoint( $jsonld_service, $that->entity_uri_service );
+
+                // Prints the JSON-LD in the head.
+                new Jsonld_Adapter( $that->jsonld_service );
+
+                new Jsonld_By_Id_Endpoint( $that->jsonld_service, $that->entity_uri_service );
+
+                $that->key_validation_service = new Wordlift_Key_Validation_Service();
+
+                $that->content_filter_service = Wordlift_Content_Filter_Service::get_instance();
+                // Creating Faq Content filter service.
+                $that->faq_content_filter_service = new Faq_Content_Filter();
+                $that->sample_data_service        = Wordlift_Sample_Data_Service::get_instance();
+                $that->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter( $that->sample_data_service );
+
+                $that->loader->add_action( 'enqueue_block_editor_assets', $that, 'add_wl_enabled_blocks' );
+                $that->loader->add_action( 'admin_enqueue_scripts', $that, 'add_wl_enabled_blocks' );
+
+                /**
+                 * Filter: wl_feature__enable__blocks.
+                 *
+                 * @param bool whether the blocks needed to be registered, defaults to true.
+                 *
+                 * @return bool
+                 * @since 3.27.6
+                 */
+                if ( apply_filters( 'wl_feature__enable__blocks', true ) ) {
+                    // Initialize the short-codes.
+                    new Async_Template_Decorator( new Wordlift_Navigator_Shortcode() );
+                    new Wordlift_Chord_Shortcode();
+                    new Wordlift_Geomap_Shortcode();
+                    new Wordlift_Timeline_Shortcode();
+                    new Wordlift_Related_Entities_Cloud_Shortcode( Wordlift_Relation_Service::get_instance(), Wordlift_Entity_Service::get_instance() );
+                    new Wordlift_Vocabulary_Shortcode();
+                    new Async_Template_Decorator( new Wordlift_Faceted_Search_Shortcode() );
+                }
+
+                new Wordlift_Products_Navigator_Shortcode();
+
+                // Initialize the Context Cards Service
+                $that->context_cards_service = new Wordlift_Context_Cards_Service();
+
+                // Initialize the SEO service.
+                new Wordlift_Seo_Service();
+
+                // Initialize the AMP service.
+                new Wordlift_AMP_Service( $that->jsonld_service );
+
+                /** Services. */
+                $that->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
+                new Wordlift_Image_Service();
+
+                /** Adapters. */
+                $that->entity_type_adapter    = new Wordlift_Entity_Type_Adapter( Wordlift_Entity_Type_Service::get_instance() );
+                $that->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $that->publisher_service );
+                $that->tinymce_adapter        = new Wordlift_Tinymce_Adapter( $that );
+
+                /*
 				* Exclude our public js from WP-Rocket.
 				*
 				* @since 3.19.4
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/842.
 				*/
-				new Wordlift_WpRocket_Adapter();
+                new Wordlift_WpRocket_Adapter();
 
-				// Add support for NitroPack compatibility.
-				$nitropack_adapter = new Wordlift_NitroPack_Adapter();
-				$nitropack_adapter->register_hooks();
+                // Add support for NitroPack compatibility.
+                $nitropack_adapter = new Wordlift_NitroPack_Adapter();
+                $nitropack_adapter->register_hooks();
 
-				/** WordPress Admin UI. */
+                /** WordPress Admin UI. */
 
-				// UI elements.
-				$that->input_element           = new Wordlift_Admin_Input_Element();
-				$that->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
-				$that->select2_element         = new Wordlift_Admin_Select2_Element();
-				$that->language_select_element = new Wordlift_Admin_Language_Select_Element();
-				$that->country_select_element  = new Wordlift_Admin_Country_Select_Element();
-				$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-				$that->publisher_element       = new Wordlift_Admin_Publisher_Element( $that->publisher_service, $tabs_element, $that->select2_element );
-				$that->author_element          = new Wordlift_Admin_Author_Element( $that->publisher_service, $that->select2_element );
+                // UI elements.
+                $that->input_element           = new Wordlift_Admin_Input_Element();
+                $that->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
+                $that->select2_element         = new Wordlift_Admin_Select2_Element();
+                $that->language_select_element = new Wordlift_Admin_Language_Select_Element();
+                $that->country_select_element  = new Wordlift_Admin_Country_Select_Element();
+                $tabs_element                  = new Wordlift_Admin_Tabs_Element();
+                $that->publisher_element       = new Wordlift_Admin_Publisher_Element( $that->publisher_service, $tabs_element, $that->select2_element );
+                $that->author_element          = new Wordlift_Admin_Author_Element( $that->publisher_service, $that->select2_element );
 
-				$that->settings_page             = Wordlift_Admin_Settings_Page::get_instance();
-				$that->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $that->settings_page );
+                $that->settings_page             = Wordlift_Admin_Settings_Page::get_instance();
+                $that->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $that->settings_page );
 
-				$that->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $that->input_element, $that->radio_input_element );
-				$that->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $that->analytics_settings_page );
-				$that->analytics_connect                   = new Wordlift_Analytics_Connect();
+                $that->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $that->input_element, $that->radio_input_element );
+                $that->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $that->analytics_settings_page );
+                $that->analytics_connect                   = new Wordlift_Analytics_Connect();
 
-				// Pages.
-				/*
+                // Pages.
+                /*
 				* Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 				*
 				* @since 3.20.3
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/914
 				*/
-				if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
-					require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-post-edit-page.php';
-					new Wordlift_Admin_Post_Edit_Page( $that );
-				}
-				new Wordlift_Entity_Type_Admin_Service();
+                if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
+                    require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-post-edit-page.php';
+                    new Wordlift_Admin_Post_Edit_Page( $that );
+                }
+                new Wordlift_Entity_Type_Admin_Service();
 
-				/** Widgets */
-				$that->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
+                /** Widgets */
+                $that->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
-				// Create an instance of the install wizard.
-				$that->admin_setup = new Wordlift_Admin_Setup( $that->key_validation_service, Wordlift_Entity_Service::get_instance(), $that->language_select_element, $that->country_select_element );
+                // Create an instance of the install wizard.
+                $that->admin_setup = new Wordlift_Admin_Setup( $that->key_validation_service, Wordlift_Entity_Service::get_instance(), $that->language_select_element, $that->country_select_element );
 
-				$that->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $that->entity_post_type_service );
+                $that->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $that->entity_post_type_service );
 
-				// User Profile.
-				new Wordlift_Admin_User_Profile_Page( $that->author_element, $that->user_service );
+                // User Profile.
+                new Wordlift_Admin_User_Profile_Page( $that->author_element, $that->user_service );
 
-				$that->entity_page_service = new Wordlift_Entity_Page_Service();
+                $that->entity_page_service = new Wordlift_Entity_Page_Service();
 
-				// Load the debug service if WP is in debug mode.
-				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-					require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-debug-service.php';
-					new Wordlift_Debug_Service( Wordlift_Entity_Service::get_instance(), $uri_service );
-				}
+                // Load the debug service if WP is in debug mode.
+                if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                    require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-debug-service.php';
+                    new Wordlift_Debug_Service( Wordlift_Entity_Service::get_instance(), $uri_service );
+                }
 
-				// Remote Image Service.
-				new Wordlift_Remote_Image_Service();
+                // Remote Image Service.
+                new Wordlift_Remote_Image_Service();
 
-				/*
+                /*
 				* Provides mappings between post types and entity types.
 				*
 				* @since 3.20.0
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/852.
 				*/
-				require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-batch-action.php';
-				require_once plugin_dir_path( __DIR__ ) . 'includes/mapping/class-wordlift-mapping-service.php';
-				require_once plugin_dir_path( __DIR__ ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
+                require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-batch-action.php';
+                require_once plugin_dir_path( __DIR__ ) . 'includes/mapping/class-wordlift-mapping-service.php';
+                require_once plugin_dir_path( __DIR__ ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
 
-				// Create an instance of the Mapping Service and assign it to the Ajax Adapter.
-				new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
+                // Create an instance of the Mapping Service and assign it to the Ajax Adapter.
+                new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
 
-				/*
+                /*
 				* Load the Mappings JSON-LD post processing.
 				*
 				* @since 3.25.0
 				*/
 
-				$mappings_dbo           = new Mappings_DBO();
-				$default_rule_validator = new Taxonomy_Rule_Validator();
-				new Post_Type_Rule_Validator();
-				// Taxonomy term rule validator for validating rules for term pages.
-				new Taxonomy_Term_Rule_Validator();
-				new Post_Taxonomy_Term_Rule_Validator();
-				$rule_validators_registry = new Rule_Validators_Registry( $default_rule_validator );
-				$rule_groups_validator    = new Rule_Groups_Validator( $rule_validators_registry );
-				$mappings_validator       = new Mappings_Validator( $mappings_dbo, $rule_groups_validator );
-
-				new Url_To_Entity_Transform_Function( $that->entity_uri_service );
-				new Taxonomy_To_Terms_Transform_Function();
-				new Post_Id_To_Entity_Transform_Function();
-				$mappings_transform_functions_registry = new Mappings_Transform_Functions_Registry();
-
-				/**
-				 * @since 3.27.1
-				 * Intiailize the acf group data formatter.
-				 */
-				new Acf_Group_Formatter();
-				new Jsonld_Converter( $mappings_validator, $mappings_transform_functions_registry );
-
-				/**
-				 * @since 3.26.0
-				 * Initialize the Faq JSON LD converter here - disabled.
-				 */
-				// new Faq_To_Jsonld_Converter();
-				/*
+                $mappings_dbo           = new Mappings_DBO();
+                $default_rule_validator = new Taxonomy_Rule_Validator();
+                new Post_Type_Rule_Validator();
+                // Taxonomy term rule validator for validating rules for term pages.
+                new Taxonomy_Term_Rule_Validator();
+                new Post_Taxonomy_Term_Rule_Validator();
+                $rule_validators_registry = new Rule_Validators_Registry( $default_rule_validator );
+                $rule_groups_validator    = new Rule_Groups_Validator( $rule_validators_registry );
+                $mappings_validator       = new Mappings_Validator( $mappings_dbo, $rule_groups_validator );
+
+                new Url_To_Entity_Transform_Function( $that->entity_uri_service );
+                new Taxonomy_To_Terms_Transform_Function();
+                new Post_Id_To_Entity_Transform_Function();
+                $mappings_transform_functions_registry = new Mappings_Transform_Functions_Registry();
+
+                /**
+                 * @since 3.27.1
+                 * Intiailize the acf group data formatter.
+                 */
+                new Acf_Group_Formatter();
+                new Jsonld_Converter( $mappings_validator, $mappings_transform_functions_registry );
+
+                /**
+                 * @since 3.26.0
+                 * Initialize the Faq JSON LD converter here - disabled.
+                 */
+                // new Faq_To_Jsonld_Converter();
+                /*
 				* Use the Templates Ajax Endpoint to load HTML templates for the legacy Angular app via admin-ajax.php
 				* end-point.
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/834
 				* @since 3.24.4
 				*/
-				new Templates_Ajax_Endpoint();
-				// Call this static method to register FAQ routes to rest api - disabled
-				// Faq_Rest_Controller::register_routes();
-
-				$that->storage_factory = new Wordlift_Storage_Factory( Wordlift_Entity_Service::get_instance(), $that->user_service, $property_getter );
-
-				/** WL Autocomplete. */
-				$autocomplete_service       = new All_Autocomplete_Service(
-					array(
-						new Local_Autocomplete_Service(),
-						new Linked_Data_Autocomplete_Service( Entity_Helper::get_instance(), $that->entity_uri_service, Wordlift_Entity_Service::get_instance() ),
-					)
-				);
-				$that->autocomplete_adapter = new Wordlift_Autocomplete_Adapter( $autocomplete_service );
-
-				/**
-				 * @since 3.27.2
-				 * Integrate the recipe maker jsonld & set recipe
-				 * as default entity type to the wprm_recipe CPT.
-				 */
-				new Recipe_Maker_Post_Type_Hook();
-				$recipe_maker_validation_service = new Recipe_Maker_Validation_Service();
-				new Recipe_Maker_Jsonld_Hook( $attachment_service, $recipe_maker_validation_service );
-				new Recipe_Maker_After_Get_Jsonld_Hook( $recipe_maker_validation_service );
-				new Recipe_Maker_Jsonld_Swap( $recipe_maker_validation_service, $that->jsonld_service );
-				new Recipe_Maker_Warning( $recipe_maker_validation_service );
-
-				/**
-				 * Avada Builder compatibility.
-				 *
-				 * @since 3.40.0
-				 */
-				new Avada_Builder_Support();
-
-				new Duplicate_Markup_Remover();
-
-				/**
-				 * @since 3.27.8
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/1248
-				 */
-				new Key_Validation_Notice( $that->key_validation_service, Wordlift_Configuration_Service::get_instance() );
-
-				/**
-				 * @since 3.28.0
-				 * @see https://github.com/insideout10/wordlift-plugin/issues?q=assignee%3Anaveen17797+is%3Aopen
-				 */
-				new Entity_No_Index_Flag();
-
-				/**
-				 * @since 3.29.0
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/1304
-				 */
-				new Entity_Rest_Service( Wordlift_Entity_Type_Service::get_instance() );
-
-				/**
-				 * Expand author in to references.
-				 *
-				 * @since 3.30.0
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/1318
-				 */
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-				if ( apply_filters( 'wl_feature__enable__article-wrapper', false ) ) {
-					new Jsonld_Article_Wrapper( Wordlift_Post_To_Jsonld_Converter::get_instance(), $that->cached_postid_to_jsonld_converter );
-				}
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-				if ( apply_filters( 'wl_feature__enable__match-terms', false ) ) {
-					$vocabulary_loader = new Vocabulary_Loader();
-					$vocabulary_loader->init_vocabulary();
-				}
-
-				/**
-				 * Added for feature request 1496 (Webhooks)
-				 */
-				if ( apply_filters( 'wl_feature__enable__webhooks', false ) ) {
-					$that->webhook_loader = new Webhooks_Loader();
-					$that->webhook_loader->init();
-				}
-
-				/**
-				 * @since 3.30.0
-				 * Add a checkbox to user option screen for wordlift admin.
-				 */
-				$wordlift_admin_checkbox = new Admin_User_Option();
-				$wordlift_admin_checkbox->connect_hook();
-
-				/**
-				 * @since 3.31.0
-				 * Init loader class for videoobject.
-				 */
-				$videoobject_loader = new Loader();
-				$videoobject_loader->init_feature();
-
-				/**
-				 * @since 3.35.0
-				 */
-				$google_addon_integration_loader = new \Wordlift\Google_Addon_Integration\Loader();
-				$google_addon_integration_loader->init_feature();
-
-				/**
-				 * @since 3.31.5
-				 * Create configuration endpoint for webapp to configure.
-				 */
-				new Config( $that->admin_setup, $that->key_validation_service );
-				/**
-				 * @since 3.31.7
-				 * Remove duplicate videoobject.
-				 */
-				new Videoobject_Duplicate_Remover();
-				$synonym_loader = new \Wordlift\Synonym\Loader();
-				$synonym_loader->init_feature();
-				/**
-				 * @since 3.32.0
-				 * Create loader for vocabulary terms.
-				 */
-				$vocabulary_terms_loader = new Vocabulary_Terms_Loader( Wordlift_Entity_Type_Service::get_instance(), $property_getter );
-				$vocabulary_terms_loader->init_feature();
-
-				new Entity_Type_Change_Handler(
-					Wordlift_Entity_Service::get_instance(),
-					Wordlift_Entity_Type_Service::get_instance()
-				);
-
-			},
-			3
-		);
-
-		new Entity_Type_Setter();
-		$no_editor_analysis_loader = new \Wordlift\No_Editor_Analysis\Loader();
-		$no_editor_analysis_loader->init_feature();
-	}
-
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
-
-		$plugin_i18n = new Wordlift_I18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
-
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks( $that ) {
-		$plugin_admin = new Wordlift_Admin(
-			$that->get_plugin_name(),
-			$that->get_version(),
-			$that->notice_service,
-			$that->user_service
-		);
-
-		$that->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$that->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
-
-		// Hook the `admin_init` function to the Admin Setup.
-		Assertions::is_set( $that->admin_setup, '`admin_setup` must be set' );
-		$that->loader->add_action( 'admin_init', $that->admin_setup, 'admin_init' );
-
-		// Hook the admin_init to the settings page.
-		Assertions::is_set( $that->settings_page, '`setting_page` must be set' );
-		$that->loader->add_action( 'admin_init', $that->settings_page, 'admin_init' );
-
-		// Hook the admin_init to the analytics settings page.
-		Assertions::is_set( $that->analytics_settings_page, '`analytics_setting_page` must be set' );
-		$that->loader->add_action( 'admin_init', $that->analytics_settings_page, 'admin_init' );
-
-		// Hook the init action to taxonomy services.
-		$that->loader->add_action( 'init', $that->topic_taxonomy_service, 'init', 0 );
-		$that->loader->add_action( 'init', $that->entity_types_taxonomy_service, 'init', 0 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$that->loader->add_action( 'wp_ajax_wl_timeline', $that->timeline_service, 'ajax_timeline' );
-
-		// Register custom allowed redirect hosts.
-		$that->loader->add_filter( 'allowed_redirect_hosts', $that->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$that->loader->add_action( 'wp_ajax_wordlift_redirect', $that->redirect_service, 'ajax_redirect' );
-
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$that->loader->add_action( 'save_post', Wordlift_Entity_Service::get_instance(), 'save_post', 9, 2 );
-		$that->loader->add_action( 'save_post', $that->rating_service, 'set_rating_for', 20, 1 );
-
-		$that->loader->add_action( 'edit_form_before_permalink', Wordlift_Entity_Service::get_instance(), 'edit_form_before_permalink', 10, 1 );
-		$that->loader->add_action( 'in_admin_header', $that->rating_service, 'in_admin_header' );
-
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns.
-		$that->loader->add_filter( 'manage_entity_posts_columns', $that->entity_list_service, 'register_custom_columns' );
-		// no explicit entity as it prevents handling of other post types.
-		$that->loader->add_filter( 'manage_posts_custom_column', $that->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection.
-		$that->loader->add_action( 'restrict_manage_posts', $that->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$that->loader->add_filter( 'posts_clauses', $that->entity_list_service, 'posts_clauses_classification_scope' );
-		$that->loader->add_action( 'pre_get_posts', $that->entity_list_service, 'pre_get_posts' );
-		$that->loader->add_action( 'load-edit.php', $that->entity_list_service, 'load_edit' );
-
-		/*
+                new Templates_Ajax_Endpoint();
+                // Call this static method to register FAQ routes to rest api - disabled
+                // Faq_Rest_Controller::register_routes();
+
+                $that->storage_factory = new Wordlift_Storage_Factory( Wordlift_Entity_Service::get_instance(), $that->user_service, $property_getter );
+
+                /** WL Autocomplete. */
+                $autocomplete_service       = new All_Autocomplete_Service(
+                    array(
+                        new Local_Autocomplete_Service(),
+                        new Linked_Data_Autocomplete_Service( Entity_Helper::get_instance(), $that->entity_uri_service, Wordlift_Entity_Service::get_instance() ),
+                    )
+                );
+                $that->autocomplete_adapter = new Wordlift_Autocomplete_Adapter( $autocomplete_service );
+
+                /**
+                 * @since 3.27.2
+                 * Integrate the recipe maker jsonld & set recipe
+                 * as default entity type to the wprm_recipe CPT.
+                 */
+                new Recipe_Maker_Post_Type_Hook();
+                $recipe_maker_validation_service = new Recipe_Maker_Validation_Service();
+                new Recipe_Maker_Jsonld_Hook( $attachment_service, $recipe_maker_validation_service );
+                new Recipe_Maker_After_Get_Jsonld_Hook( $recipe_maker_validation_service );
+                new Recipe_Maker_Jsonld_Swap( $recipe_maker_validation_service, $that->jsonld_service );
+                new Recipe_Maker_Warning( $recipe_maker_validation_service );
+
+                /**
+                 * Avada Builder compatibility.
+                 *
+                 * @since 3.40.0
+                 */
+                new Avada_Builder_Support();
+
+                new Duplicate_Markup_Remover();
+
+                /**
+                 * @since 3.27.8
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/1248
+                 */
+                new Key_Validation_Notice( $that->key_validation_service, Wordlift_Configuration_Service::get_instance() );
+
+                /**
+                 * @since 3.28.0
+                 * @see https://github.com/insideout10/wordlift-plugin/issues?q=assignee%3Anaveen17797+is%3Aopen
+                 */
+                new Entity_No_Index_Flag();
+
+                /**
+                 * @since 3.29.0
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/1304
+                 */
+                new Entity_Rest_Service( Wordlift_Entity_Type_Service::get_instance() );
+
+                /**
+                 * Expand author in to references.
+                 *
+                 * @since 3.30.0
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/1318
+                 */
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+                if ( apply_filters( 'wl_feature__enable__article-wrapper', false ) ) {
+                    new Jsonld_Article_Wrapper( Wordlift_Post_To_Jsonld_Converter::get_instance(), $that->cached_postid_to_jsonld_converter );
+                }
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+                if ( apply_filters( 'wl_feature__enable__match-terms', false ) ) {
+                    $vocabulary_loader = new Vocabulary_Loader();
+                    $vocabulary_loader->init_vocabulary();
+                }
+
+                /**
+                 * Added for feature request 1496 (Webhooks)
+                 */
+                if ( apply_filters( 'wl_feature__enable__webhooks', false ) ) {
+                    $that->webhook_loader = new Webhooks_Loader();
+                    $that->webhook_loader->init();
+                }
+
+                /**
+                 * @since 3.30.0
+                 * Add a checkbox to user option screen for wordlift admin.
+                 */
+                $wordlift_admin_checkbox = new Admin_User_Option();
+                $wordlift_admin_checkbox->connect_hook();
+
+                /**
+                 * @since 3.31.0
+                 * Init loader class for videoobject.
+                 */
+                $videoobject_loader = new Loader();
+                $videoobject_loader->init_feature();
+
+                /**
+                 * @since 3.35.0
+                 */
+                $google_addon_integration_loader = new \Wordlift\Google_Addon_Integration\Loader();
+                $google_addon_integration_loader->init_feature();
+
+                /**
+                 * @since 3.31.5
+                 * Create configuration endpoint for webapp to configure.
+                 */
+                new Config( $that->admin_setup, $that->key_validation_service );
+                /**
+                 * @since 3.31.7
+                 * Remove duplicate videoobject.
+                 */
+                new Videoobject_Duplicate_Remover();
+                $synonym_loader = new \Wordlift\Synonym\Loader();
+                $synonym_loader->init_feature();
+                /**
+                 * @since 3.32.0
+                 * Create loader for vocabulary terms.
+                 */
+                $vocabulary_terms_loader = new Vocabulary_Terms_Loader( Wordlift_Entity_Type_Service::get_instance(), $property_getter );
+                $vocabulary_terms_loader->init_feature();
+
+                new Entity_Type_Change_Handler(
+                    Wordlift_Entity_Service::get_instance(),
+                    Wordlift_Entity_Type_Service::get_instance()
+                );
+
+            },
+            3
+        );
+
+        new Entity_Type_Setter();
+        $no_editor_analysis_loader = new \Wordlift\No_Editor_Analysis\Loader();
+        $no_editor_analysis_loader->init_feature();
+    }
+
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
+
+        $plugin_i18n = new Wordlift_I18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
+
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks( $that ) {
+        $plugin_admin = new Wordlift_Admin(
+            $that->get_plugin_name(),
+            $that->get_version(),
+            $that->notice_service,
+            $that->user_service
+        );
+
+        $that->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $that->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
+
+        // Hook the `admin_init` function to the Admin Setup.
+        Assertions::is_set( $that->admin_setup, '`admin_setup` must be set' );
+        $that->loader->add_action( 'admin_init', $that->admin_setup, 'admin_init' );
+
+        // Hook the admin_init to the settings page.
+        Assertions::is_set( $that->settings_page, '`setting_page` must be set' );
+        $that->loader->add_action( 'admin_init', $that->settings_page, 'admin_init' );
+
+        // Hook the admin_init to the analytics settings page.
+        Assertions::is_set( $that->analytics_settings_page, '`analytics_setting_page` must be set' );
+        $that->loader->add_action( 'admin_init', $that->analytics_settings_page, 'admin_init' );
+
+        // Hook the init action to taxonomy services.
+        $that->loader->add_action( 'init', $that->topic_taxonomy_service, 'init', 0 );
+        $that->loader->add_action( 'init', $that->entity_types_taxonomy_service, 'init', 0 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $that->loader->add_action( 'wp_ajax_wl_timeline', $that->timeline_service, 'ajax_timeline' );
+
+        // Register custom allowed redirect hosts.
+        $that->loader->add_filter( 'allowed_redirect_hosts', $that->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $that->loader->add_action( 'wp_ajax_wordlift_redirect', $that->redirect_service, 'ajax_redirect' );
+
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $that->loader->add_action( 'save_post', Wordlift_Entity_Service::get_instance(), 'save_post', 9, 2 );
+        $that->loader->add_action( 'save_post', $that->rating_service, 'set_rating_for', 20, 1 );
+
+        $that->loader->add_action( 'edit_form_before_permalink', Wordlift_Entity_Service::get_instance(), 'edit_form_before_permalink', 10, 1 );
+        $that->loader->add_action( 'in_admin_header', $that->rating_service, 'in_admin_header' );
+
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns.
+        $that->loader->add_filter( 'manage_entity_posts_columns', $that->entity_list_service, 'register_custom_columns' );
+        // no explicit entity as it prevents handling of other post types.
+        $that->loader->add_filter( 'manage_posts_custom_column', $that->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection.
+        $that->loader->add_action( 'restrict_manage_posts', $that->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $that->loader->add_filter( 'posts_clauses', $that->entity_list_service, 'posts_clauses_classification_scope' );
+        $that->loader->add_action( 'pre_get_posts', $that->entity_list_service, 'pre_get_posts' );
+        $that->loader->add_action( 'load-edit.php', $that->entity_list_service, 'load_edit' );
+
+        /*
 		 * If `All Entity Types` is disable, use the radio button Walker.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES )
-		     // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			 && ! apply_filters( 'wl_feature__enable__entity-types-professional', false )
-		     // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			 && ! apply_filters( 'wl_feature__enable__entity-types-business', false )
-		) {
-			$that->loader->add_filter( 'wp_terms_checklist_args', $that->entity_types_taxonomy_walker, 'terms_checklist_args' );
-		}
-
-		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
-		// entities.
-		$that->loader->add_filter( 'prima_metabox_entity_header_args', $that->primashop_adapter, 'prima_metabox_entity_header_args', 10 );
-
-		/**
-		 * Filter: wl_feature__enable__settings-download.
-		 *
-		 * @param bool whether the screens needed to be registered, defaults to true.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		$that->features_registry->register_feature_from_slug(
-			'settings-download',
-			true,
-			array(
-				$that,
-				'register_screens',
-			)
-		);
-
-		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$that->loader->add_action( 'wp_ajax_wl_download_your_data', $that->download_your_data_page, 'download_your_data', 10 );
-
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$that->loader->add_action( 'wp_ajax_wl_jsonld', $that->jsonld_service, 'get' );
-		$that->loader->add_action( 'admin_post_wl_jsonld', $that->jsonld_service, 'get' );
-		$that->loader->add_action( 'admin_post_nopriv_wl_jsonld', $that->jsonld_service, 'get' );
-
-		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$that->loader->add_action( 'wp_ajax_wl_validate_key', $that->key_validation_service, 'validate_key' );
-
-		// Hook the AJAX wl_update_country_options action to the countries.
-		$that->loader->add_action( 'wp_ajax_wl_update_country_options', $that->country_select_element, 'get_options_html' );
-
-		$that->loader->add_filter( 'admin_post_thumbnail_html', $that->publisher_service, 'add_featured_image_instruction' );
-
-		// Hook the menu creation on the general wordlift menu creation.
-		/**
-		 * Filter: wl_feature__enable__screens.
-		 *
-		 * @param bool whether the screens needed to be registered, defaults to true.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 *
-		 * Since 3.30.0 this feature is registered using registry.
-		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__settings-screen', true ) || Admin_User_Option::is_wordlift_admin() ) {
-			add_action( 'wl_admin_menu', array( $that->settings_page, 'admin_menu' ), 10, 2 );
-		}
-
-		// Hook key update.
-		$that->loader->add_action( 'pre_update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'maybe_update_dataset_uri', 10, 2 );
-		$that->loader->add_action( 'update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'update_key', 10, 2 );
-
-		// Add additional action links to the WordLift plugin in the plugins page.
-		$that->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $that->settings_page_action_link, 'action_links', 10, 1 );
-
-		/*
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( ! apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES )
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+             && ! apply_filters( 'wl_feature__enable__entity-types-professional', false )
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+             && ! apply_filters( 'wl_feature__enable__entity-types-business', false )
+        ) {
+            $that->loader->add_filter( 'wp_terms_checklist_args', $that->entity_types_taxonomy_walker, 'terms_checklist_args' );
+        }
+
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $that->loader->add_filter( 'prima_metabox_entity_header_args', $that->primashop_adapter, 'prima_metabox_entity_header_args', 10 );
+
+        /**
+         * Filter: wl_feature__enable__settings-download.
+         *
+         * @param bool whether the screens needed to be registered, defaults to true.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        $that->features_registry->register_feature_from_slug(
+            'settings-download',
+            true,
+            array(
+                $that,
+                'register_screens',
+            )
+        );
+
+        // Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
+        $that->loader->add_action( 'wp_ajax_wl_download_your_data', $that->download_your_data_page, 'download_your_data', 10 );
+
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $that->loader->add_action( 'wp_ajax_wl_jsonld', $that->jsonld_service, 'get' );
+        $that->loader->add_action( 'admin_post_wl_jsonld', $that->jsonld_service, 'get' );
+        $that->loader->add_action( 'admin_post_nopriv_wl_jsonld', $that->jsonld_service, 'get' );
+
+        // Hook the AJAX wl_validate_key action to the Key Validation service.
+        $that->loader->add_action( 'wp_ajax_wl_validate_key', $that->key_validation_service, 'validate_key' );
+
+        // Hook the AJAX wl_update_country_options action to the countries.
+        $that->loader->add_action( 'wp_ajax_wl_update_country_options', $that->country_select_element, 'get_options_html' );
+
+        $that->loader->add_filter( 'admin_post_thumbnail_html', $that->publisher_service, 'add_featured_image_instruction' );
+
+        // Hook the menu creation on the general wordlift menu creation.
+        /**
+         * Filter: wl_feature__enable__screens.
+         *
+         * @param bool whether the screens needed to be registered, defaults to true.
+         *
+         * @return bool
+         * @since 3.27.6
+         *
+         * Since 3.30.0 this feature is registered using registry.
+         */
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__settings-screen', true ) || Admin_User_Option::is_wordlift_admin() ) {
+            add_action( 'wl_admin_menu', array( $that->settings_page, 'admin_menu' ), 10, 2 );
+        }
+
+        // Hook key update.
+        $that->loader->add_action( 'pre_update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'maybe_update_dataset_uri', 10, 2 );
+        $that->loader->add_action( 'update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'update_key', 10, 2 );
+
+        // Add additional action links to the WordLift plugin in the plugins page.
+        $that->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $that->settings_page_action_link, 'action_links', 10, 1 );
+
+        /*
 		 * Remove the Analytics Settings link from the plugin page.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/932
 		 * @since 3.21.1
 		 */
-		// $that->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $that->analytics_settings_page_action_link, 'action_links', 10, 1 );
-
-		// Hook the AJAX `wl_publisher` action name.
-		$that->loader->add_action( 'wp_ajax_wl_publisher', $that->publisher_ajax_adapter, 'publisher' );
-
-		// Hook row actions for the entity type list admin.
-		$that->loader->add_filter( 'wl_entity_type_row_actions', $that->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
-
-		/** Ajax actions. */
-		$that->loader->add_action( 'wp_ajax_wl_google_analytics_export', $that->google_analytics_export_service, 'export' );
-
-		// Hook capabilities manipulation to allow access to entity type admin
-		// page  on WordPress versions before 4.7.
-		global $wp_version;
-		if ( version_compare( $wp_version, '4.7', '<' ) ) {
-			$that->loader->add_filter( 'map_meta_cap', $that->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 2 );
-		}
-
-		/** Adapters. */
-		$that->loader->add_filter( 'mce_external_plugins', $that->tinymce_adapter, 'mce_external_plugins', 10, 1 );
-		/**
-		 * Disabling Faq temporarily.
-		 * Load the tinymce editor button on the tool bar.
-		 *
-		 * @since 3.26.0
-		 */
-		// $that->loader->add_filter( 'tiny_mce_before_init', $that->faq_tinymce_adapter, 'register_custom_tags' );
-		// $that->loader->add_filter( 'mce_buttons', $that->faq_tinymce_adapter, 'register_faq_toolbar_button', 10, 1 );
-		// $that->loader->add_filter( 'mce_external_plugins', $that->faq_tinymce_adapter, 'register_faq_tinymce_plugin', 10, 1 );
-
-		$that->loader->add_action( 'wp_ajax_wl_sample_data_create', $that->sample_data_ajax_adapter, 'create' );
-		$that->loader->add_action( 'wp_ajax_wl_sample_data_delete', $that->sample_data_ajax_adapter, 'delete' );
-
-		/**
-		 * @since 3.26.0
-		 */
-		$excerpt_adapter = new Post_Excerpt_Meta_Box_Adapter();
-		$that->loader->add_action( 'do_meta_boxes', $excerpt_adapter, 'replace_post_excerpt_meta_box' );
-		// Adding Rest route for the post excerpt
-		Post_Excerpt_Rest_Controller::register_routes();
-
-		// Handle the autocomplete request.
-		add_action(
-			'wp_ajax_wl_autocomplete',
-			array(
-				$that->autocomplete_adapter,
-				'wl_autocomplete',
-			)
-		);
-		add_action(
-			'wp_ajax_nopriv_wl_autocomplete',
-			array(
-				$that->autocomplete_adapter,
-				'wl_autocomplete',
-			)
-		);
-
-		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$that->loader->add_filter( 'map_meta_cap', $that->entity_type_admin_page, 'restrict_super_admin', 10, 2 );
-		}
-
-		$deactivator_feedback = new Wordlift_Deactivator_Feedback();
-
-		add_action( 'admin_footer', array( $deactivator_feedback, 'render_feedback_popup' ) );
-		add_action(
-			'admin_enqueue_scripts',
-			array(
-				$deactivator_feedback,
-				'enqueue_popup_scripts',
-			)
-		);
-		add_action(
-			'wp_ajax_wl_deactivation_feedback',
-			array(
-				$deactivator_feedback,
-				'wl_deactivation_feedback',
-			)
-		);
-
-		/**
-		 * Always allow the `wordlift/classification` block.
-		 *
-		 * @since 3.23.0
-		 */
-		add_filter(
-			'allowed_block_types',
-			function ( $value ) {
-
-				if ( true === $value ) {
-					return $value;
-				}
-
-				return array_merge( (array) $value, array( 'wordlift/classification' ) );
-			},
-			PHP_INT_MAX
-		);
-
-		/**
-		 * @since 3.27.7
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-		 */
-		new Top_Entities();
-
-		add_action(
-			'admin_notices',
-			function () {
-				if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-					/**
-					 * Fired when the notice feature is enabled.
-					 *
-					 * @since 3.40.4
-					 */
-					do_action( 'wordlift_admin_notices' );
-				}
-			}
-		);
-
-		add_action(
-			'admin_init',
-			function () {
-				// Only show the notice when the key is set or skipped.
-				if ( \Wordlift_Configuration_Service::get_instance()->get_key() && ! \Wordlift_Configuration_Service::get_instance()->get_skip_installation_notice() ) {
-					$installation_complete_notice = new Installation_Complete_Notice();
-					$installation_complete_notice->init();
-				}
-			}
-		);
-
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks( $that ) {
-
-		$plugin_public = new Wordlift_Public( $that->get_plugin_name(), $that->get_version() );
-
-		// Register the entity post type.
-		$that->loader->add_action( 'init', $that->entity_post_type_service, 'register' );
-
-		// Bind the link generation and handling hooks to the entity link service.
-		$that->loader->add_filter( 'post_type_link', $that->entity_link_service, 'post_type_link', 10, 2 );
-		$that->loader->add_action( 'pre_get_posts', $that->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-
-		$that->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$that->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-		$that->loader->add_action( 'wp_enqueue_scripts', $that->context_cards_service, 'enqueue_scripts' );
-
-		// Registering Faq_Content_Filter service used for removing faq question and answer tags from the html.
-		$that->loader->add_filter( 'the_content', $that->faq_content_filter_service, 'remove_all_faq_question_and_answer_tags' );
-		// Hook the content filter service to add entity links.
-		if ( ! defined( 'WL_DISABLE_CONTENT_FILTER' ) || ! WL_DISABLE_CONTENT_FILTER ) {
-			// We run before other filters.
-			$that->loader->add_filter( 'the_content', $that->content_filter_service, 'the_content', 9 );
-		}
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$that->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $that->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$that->loader->add_filter( 'the_content', $that->sharethis_service, 'the_content', 99 );
-		$that->loader->add_filter( 'the_excerpt', $that->sharethis_service, 'the_excerpt', 99 );
-
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$that->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $that->jsonld_service, 'get' );
-
-		// Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
-		// in order to tweak WP's `WP_Query` to include entities in queries related
-		// to categories.
-		$that->loader->add_action( 'pre_get_posts', $that->category_taxonomy_service, 'pre_get_posts', 10, 1 );
-
-		/*
+        // $that->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $that->analytics_settings_page_action_link, 'action_links', 10, 1 );
+
+        // Hook the AJAX `wl_publisher` action name.
+        $that->loader->add_action( 'wp_ajax_wl_publisher', $that->publisher_ajax_adapter, 'publisher' );
+
+        // Hook row actions for the entity type list admin.
+        $that->loader->add_filter( 'wl_entity_type_row_actions', $that->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+
+        /** Ajax actions. */
+        $that->loader->add_action( 'wp_ajax_wl_google_analytics_export', $that->google_analytics_export_service, 'export' );
+
+        // Hook capabilities manipulation to allow access to entity type admin
+        // page  on WordPress versions before 4.7.
+        global $wp_version;
+        if ( version_compare( $wp_version, '4.7', '<' ) ) {
+            $that->loader->add_filter( 'map_meta_cap', $that->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 2 );
+        }
+
+        /** Adapters. */
+        $that->loader->add_filter( 'mce_external_plugins', $that->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+        /**
+         * Disabling Faq temporarily.
+         * Load the tinymce editor button on the tool bar.
+         *
+         * @since 3.26.0
+         */
+        // $that->loader->add_filter( 'tiny_mce_before_init', $that->faq_tinymce_adapter, 'register_custom_tags' );
+        // $that->loader->add_filter( 'mce_buttons', $that->faq_tinymce_adapter, 'register_faq_toolbar_button', 10, 1 );
+        // $that->loader->add_filter( 'mce_external_plugins', $that->faq_tinymce_adapter, 'register_faq_tinymce_plugin', 10, 1 );
+
+        $that->loader->add_action( 'wp_ajax_wl_sample_data_create', $that->sample_data_ajax_adapter, 'create' );
+        $that->loader->add_action( 'wp_ajax_wl_sample_data_delete', $that->sample_data_ajax_adapter, 'delete' );
+
+        /**
+         * @since 3.26.0
+         */
+        $excerpt_adapter = new Post_Excerpt_Meta_Box_Adapter();
+        $that->loader->add_action( 'do_meta_boxes', $excerpt_adapter, 'replace_post_excerpt_meta_box' );
+        // Adding Rest route for the post excerpt
+        Post_Excerpt_Rest_Controller::register_routes();
+
+        // Handle the autocomplete request.
+        add_action(
+            'wp_ajax_wl_autocomplete',
+            array(
+                $that->autocomplete_adapter,
+                'wl_autocomplete',
+            )
+        );
+        add_action(
+            'wp_ajax_nopriv_wl_autocomplete',
+            array(
+                $that->autocomplete_adapter,
+                'wl_autocomplete',
+            )
+        );
+
+        // Hooks to restrict multisite super admin from manipulating entity types.
+        if ( is_multisite() ) {
+            $that->loader->add_filter( 'map_meta_cap', $that->entity_type_admin_page, 'restrict_super_admin', 10, 2 );
+        }
+
+        $deactivator_feedback = new Wordlift_Deactivator_Feedback();
+
+        add_action( 'admin_footer', array( $deactivator_feedback, 'render_feedback_popup' ) );
+        add_action(
+            'admin_enqueue_scripts',
+            array(
+                $deactivator_feedback,
+                'enqueue_popup_scripts',
+            )
+        );
+        add_action(
+            'wp_ajax_wl_deactivation_feedback',
+            array(
+                $deactivator_feedback,
+                'wl_deactivation_feedback',
+            )
+        );
+
+        /**
+         * Always allow the `wordlift/classification` block.
+         *
+         * @since 3.23.0
+         */
+        add_filter(
+            'allowed_block_types',
+            function ( $value ) {
+
+                if ( true === $value ) {
+                    return $value;
+                }
+
+                return array_merge( (array) $value, array( 'wordlift/classification' ) );
+            },
+            PHP_INT_MAX
+        );
+
+        /**
+         * @since 3.27.7
+         * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+         */
+        new Top_Entities();
+
+        add_action(
+            'admin_notices',
+            function () {
+                if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+                    /**
+                     * Fired when the notice feature is enabled.
+                     *
+                     * @since 3.40.4
+                     */
+                    do_action( 'wordlift_admin_notices' );
+                }
+            }
+        );
+
+        add_action(
+            'admin_init',
+            function () {
+                // Only show the notice when the key is set or skipped.
+                if ( \Wordlift_Configuration_Service::get_instance()->get_key() && ! \Wordlift_Configuration_Service::get_instance()->get_skip_installation_notice() ) {
+                    $installation_complete_notice = new Installation_Complete_Notice();
+                    $installation_complete_notice->init();
+                }
+            }
+        );
+
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks( $that ) {
+
+        $plugin_public = new Wordlift_Public( $that->get_plugin_name(), $that->get_version() );
+
+        // Register the entity post type.
+        $that->loader->add_action( 'init', $that->entity_post_type_service, 'register' );
+
+        // Bind the link generation and handling hooks to the entity link service.
+        $that->loader->add_filter( 'post_type_link', $that->entity_link_service, 'post_type_link', 10, 2 );
+        $that->loader->add_action( 'pre_get_posts', $that->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
+
+        $that->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $that->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+        $that->loader->add_action( 'wp_enqueue_scripts', $that->context_cards_service, 'enqueue_scripts' );
+
+        // Registering Faq_Content_Filter service used for removing faq question and answer tags from the html.
+        $that->loader->add_filter( 'the_content', $that->faq_content_filter_service, 'remove_all_faq_question_and_answer_tags' );
+        // Hook the content filter service to add entity links.
+        if ( ! defined( 'WL_DISABLE_CONTENT_FILTER' ) || ! WL_DISABLE_CONTENT_FILTER ) {
+            // We run before other filters.
+            $that->loader->add_filter( 'the_content', $that->content_filter_service, 'the_content', 9 );
+        }
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $that->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $that->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $that->loader->add_filter( 'the_content', $that->sharethis_service, 'the_content', 99 );
+        $that->loader->add_filter( 'the_excerpt', $that->sharethis_service, 'the_excerpt', 99 );
+
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $that->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $that->jsonld_service, 'get' );
+
+        // Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
+        // in order to tweak WP's `WP_Query` to include entities in queries related
+        // to categories.
+        $that->loader->add_action( 'pre_get_posts', $that->category_taxonomy_service, 'pre_get_posts', 10, 1 );
+
+        /*
 		 * Hook the `pre_get_posts` action to the `Wordlift_Entity_Page_Service`
 		 * in order to tweak WP's `WP_Query` to show event related entities in reverse
 		 * order of start time.
 		 */
-		$that->loader->add_action( 'pre_get_posts', $that->entity_page_service, 'pre_get_posts', 10, 1 );
-
-		// This hook have to run before the rating service, as otherwise the post might not be a proper entity when rating is done.
-		$that->loader->add_action( 'save_post', $that->entity_type_adapter, 'save_post', 9, 2 );
-
-		// Analytics Script Frontend.
-		if ( apply_filters( 'wl_feature__enable__analytics', true ) && Wordlift_Configuration_Service::get_instance()->is_analytics_enable() ) {
-			$that->loader->add_action( 'wp_enqueue_scripts', $that->analytics_connect, 'enqueue_scripts', 10 );
-		}
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @return    string    The name of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @return    string    The version number of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_version() {
-		return $this->version;
-	}
-
-	/**
-	 * Load dependencies for WP-CLI.
-	 *
-	 * @throws Exception when an error occurs.
-	 * @since 3.18.0
-	 */
-	private function load_cli_dependencies() {
-
-	}
-
-	public function add_wl_enabled_blocks() {
-		/**
-		 * Filter: wl_feature__enable__blocks.
-		 *
-		 * @param bool whether the blocks needed to be registered, defaults to true.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter,WordPress.WP.EnqueuedResourceParameters.MissingVersion
-		wp_register_script( 'wl_enabled_blocks', false );
-
-		$enabled_blocks = array();
-
-		/**
-		 * Filter name: wl_feature__enable__product-navigator
-		 *
-		 * @since 3.32.3
-		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__product-navigator', true ) ) {
-			$enabled_blocks[] = 'wordlift/products-navigator';
-		}
-
-		if ( apply_filters( 'wl_feature__enable__blocks', true ) ) {
-			// To intimate JS
-			$enabled_blocks = array_merge(
-				$enabled_blocks,
-				array(
-					'wordlift/navigator',
-					'wordlift/chord',
-					'wordlift/geomap',
-					'wordlift/timeline',
-					'wordlift/cloud',
-					'wordlift/vocabulary',
-					'wordlift/faceted-search',
-				)
-			);
-		}
-
-		wp_localize_script( 'wl_enabled_blocks', 'wlEnabledBlocks', $enabled_blocks );
-		wp_enqueue_script( 'wl_enabled_blocks' );
-	}
-
-	/**
-	 * Register screens based on the filter.
-	 */
-	public function register_screens() {
-		// Hook the menu to the Download Your Data page.
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__settings-download', true ) ) {
-			Assertions::is_set( $this->download_your_data_page, "`download_your_data_page` can't be null" );
-			add_action(
-				'admin_menu',
-				array(
-					$this->download_your_data_page,
-					'admin_menu',
-				),
-				100,
-				0
-			);
-		}
-
-		Assertions::is_set( $this->entity_type_settings_admin_page, "`entity_type_settings_admin_page` can't be null" );
-		add_action(
-			'admin_menu',
-			array(
-				$this->entity_type_settings_admin_page,
-				'admin_menu',
-			),
-			100,
-			0
-		);
-
-	}
+        $that->loader->add_action( 'pre_get_posts', $that->entity_page_service, 'pre_get_posts', 10, 1 );
+
+        // This hook have to run before the rating service, as otherwise the post might not be a proper entity when rating is done.
+        $that->loader->add_action( 'save_post', $that->entity_type_adapter, 'save_post', 9, 2 );
+
+        // Analytics Script Frontend.
+        if ( apply_filters( 'wl_feature__enable__analytics', true ) && Wordlift_Configuration_Service::get_instance()->is_analytics_enable() ) {
+            $that->loader->add_action( 'wp_enqueue_scripts', $that->analytics_connect, 'enqueue_scripts', 10 );
+        }
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @return    string    The name of the plugin.
+     * @since     1.0.0
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     * @since     1.0.0
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @return    string    The version number of the plugin.
+     * @since     1.0.0
+     */
+    public function get_version() {
+        return $this->version;
+    }
+
+    /**
+     * Load dependencies for WP-CLI.
+     *
+     * @throws Exception when an error occurs.
+     * @since 3.18.0
+     */
+    private function load_cli_dependencies() {
+
+    }
+
+    public function add_wl_enabled_blocks() {
+        /**
+         * Filter: wl_feature__enable__blocks.
+         *
+         * @param bool whether the blocks needed to be registered, defaults to true.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter,WordPress.WP.EnqueuedResourceParameters.MissingVersion
+        wp_register_script( 'wl_enabled_blocks', false );
+
+        $enabled_blocks = array();
+
+        /**
+         * Filter name: wl_feature__enable__product-navigator
+         *
+         * @since 3.32.3
+         */
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__product-navigator', true ) ) {
+            $enabled_blocks[] = 'wordlift/products-navigator';
+        }
+
+        if ( apply_filters( 'wl_feature__enable__blocks', true ) ) {
+            // To intimate JS
+            $enabled_blocks = array_merge(
+                $enabled_blocks,
+                array(
+                    'wordlift/navigator',
+                    'wordlift/chord',
+                    'wordlift/geomap',
+                    'wordlift/timeline',
+                    'wordlift/cloud',
+                    'wordlift/vocabulary',
+                    'wordlift/faceted-search',
+                )
+            );
+        }
+
+        wp_localize_script( 'wl_enabled_blocks', 'wlEnabledBlocks', $enabled_blocks );
+        wp_enqueue_script( 'wl_enabled_blocks' );
+    }
+
+    /**
+     * Register screens based on the filter.
+     */
+    public function register_screens() {
+        // Hook the menu to the Download Your Data page.
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__settings-download', true ) ) {
+            Assertions::is_set( $this->download_your_data_page, "`download_your_data_page` can't be null" );
+            add_action(
+                'admin_menu',
+                array(
+                    $this->download_your_data_page,
+                    'admin_menu',
+                ),
+                100,
+                0
+            );
+        }
+
+        Assertions::is_set( $this->entity_type_settings_admin_page, "`entity_type_settings_admin_page` can't be null" );
+        add_action(
+            'admin_menu',
+            array(
+                $this->entity_type_settings_admin_page,
+                'admin_menu',
+            ),
+            100,
+            0
+        );
+
+    }
 
 }

Spacing +288 added lines, -288 removed lines

@@ -638,15 +638,15 @@ 
 		$that = $this;
 		add_action(
 			'plugins_loaded',
-			function () use ( $that ) {
-				$that->define_admin_hooks( $that );
-				$that->define_public_hooks( $that );
+			function() use ($that) {
+				$that->define_admin_hooks($that);
+				$that->define_public_hooks($that);
 			},
 			4
 		);
 
 		// If we're in `WP_CLI` load the related files.
-		if ( class_exists( 'WP_CLI' ) ) {
+		if (class_exists('WP_CLI')) {
 			$this->load_cli_dependencies();
 		}
 
@@ -686,329 +686,329 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-loader.php';
 
 		// The class responsible for plugin uninstall.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-deactivator-feedback.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-deactivator-feedback.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * WordLift's supported languages.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-languages.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-languages.php';
 
 		/**
 		 * WordLift's supported countries.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-countries.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-countries.php';
 
 		/**
 		 * Provide support functions to sanitize data.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sanitizer.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-sanitizer.php';
 
 		/** Services. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-log-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-http-api.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-redirect-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-configuration-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-post-type-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-link-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-image-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-http-api.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-redirect-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-configuration-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-post-type-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-type-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-link-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-relation-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-image-service.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The schema:url property service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-schema-url-property-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-property-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-schema-url-property-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-type-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-uri-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-service.php';
 
 		// Add the entity rating service.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-rating-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-rating-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The Topic Taxonomy service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-topic-taxonomy-service.php';
 
 		/**
 		 * The WordLift URI service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sample-data-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-uri-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-property-factory.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-sample-data-service.php';
 
-		require_once plugin_dir_path( __DIR__ ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-attachment-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/properties/class-wordlift-property-getter-factory.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-attachment-service.php';
 
 		/**
 		 * Load the converters.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-website-jsonld-converter.php';
+		require_once plugin_dir_path(__DIR__).'includes/intf-wordlift-post-converter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-postid-to-jsonld-converter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-website-jsonld-converter.php';
 
 		/**
 		 * Load cache-related files.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/cache/require.php';
+		require_once plugin_dir_path(__DIR__).'includes/cache/require.php';
 
 		/**
 		 * Load the content filter.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-content-filter-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-content-filter-service.php';
 
 		/*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-excerpt-helper.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-post-excerpt-helper.php';
 
 		/**
 		 * Load the JSON-LD service to publish entities using JSON-LD.s
 		 *
 		 * @since 3.8.0
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-jsonld-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-jsonld-service.php';
 
 		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-publisher-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-publisher-ajax-adapter.php';
 
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-post-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-post-adapter.php';
 
 		/**
 		 * Load the WordLift key validation service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-key-validation-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-key-validation-service.php';
 
 		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-category-taxonomy-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-category-taxonomy-service.php';
 
 		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-page-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-page-service.php';
 
 		/** Linked Data. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-property-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-author-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-image-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-post-related-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-url-property-storage.php';
+		require_once plugin_dir_path(__DIR__).'includes/linked-data/storage/class-wordlift-storage-factory.php';
 
 		/** Services. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-api-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-google-analytics-export-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-api-service.php';
 
 		/** Adapters. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-newrelic-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-entity-type-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-wprocket-adapter.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-nitropack-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-tinymce-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-newrelic-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-sample-data-ajax-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-entity-type-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-wprocket-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-nitropack-adapter.php';
 
 		/** Autocomplete. */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-autocomplete-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-autocomplete-adapter.php';
 
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-remote-image-service.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-remote-image-service.php';
 
 		/** Analytics */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/analytics/class-wordlift-analytics-connect.php';
+		require_once plugin_dir_path(__DIR__).'includes/analytics/class-wordlift-analytics-connect.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The class to customize the entity list admin page.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-list-service.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-entity-list-service.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
 		global $wp_version;
-		if ( version_compare( $wp_version, '5.3', '<' ) ) {
-			require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		if (version_compare($wp_version, '5.3', '<')) {
+			require_once plugin_dir_path(__DIR__).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 		} else {
-			require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
+			require_once plugin_dir_path(__DIR__).'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
 		}
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The PrimaShop adapter.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-primashop-adapter.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-primashop-adapter.php';
 
 		/**
 		 * The WordLift Dashboard service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-dashboard-service.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-dashboard-service.php';
 
 		/**
 		 * The admin 'Install wizard' page.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-setup.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-setup.php';
 
 		/**
 		 * The WordLift entity type list admin page controller.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
 
 		/**
 		 * The WordLift entity type settings admin page controller.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-entity-type-settings.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-entity-type-settings.php';
 
 		/**
 		 * The admin 'Download Your Data' page.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-download-your-data-page.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-download-your-data-page.php';
 
 		/**
 		 * The admin 'WordLift Settings' page.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-radio-input-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-select-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-author-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/intf-wordlift-admin-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-input-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-radio-input-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-select-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-select2-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-language-select-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-country-select-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-tabs-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-author-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/elements/class-wordlift-admin-publisher-element.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-page.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-settings-page.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-settings-analytics-page.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-settings-page-action-link.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
 
 		/** Admin Pages */
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-user-profile-page.php';
-		require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-entity-type-admin-service.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-user-profile-page.php';
+		require_once plugin_dir_path(__DIR__).'admin/class-wordlift-entity-type-admin-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-public.php';
 
 		/**
 		 * The shortcode abstract class.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-shortcode.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The Navigator shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-navigator-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-navigator-shortcode.php';
 
 		/**
 		 * The Products Navigator shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-products-navigator-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-products-navigator-shortcode.php';
 
 		/**
 		 * The chord shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-chord-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-chord-shortcode.php';
 
 		/**
 		 * The geomap shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-geomap-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-geomap-shortcode.php';
 
 		/**
 		 * The entity cloud shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-related-entities-cloud-shortcode.php';
 
 		/**
 		 * The entity glossary shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-alphabet-service.php';
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-vocabulary-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'includes/class-wordlift-alphabet-service.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-vocabulary-shortcode.php';
 
 		/**
 		 * Faceted Search shortcode.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-faceted-search-shortcode.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-faceted-search-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-sharethis-service.php';
 
 		/**
 		 * The SEO service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-seo-service.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-seo-service.php';
 
 		/**
 		 * The AMP service.
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-amp-service.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-amp-service.php';
 
 		/** Widgets */
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-related-entities-cloud-widget.php';
-		require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-context-cards-service.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-widget.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-related-entities-cloud-widget.php';
+		require_once plugin_dir_path(__DIR__).'public/class-wordlift-context-cards-service.php';
 
 		/*
 		 * Batch Operations. They're similar to Batch Actions but do not require working on post types.
@@ -1017,8 +1017,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( __DIR__ ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( __DIR__ ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+		require_once plugin_dir_path(__DIR__).'includes/batch/intf-wordlift-batch-operation.php';
+		require_once plugin_dir_path(__DIR__).'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
 		/*
 		 * Schema.org Services.
@@ -1026,10 +1026,10 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
-			require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( __DIR__ ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
+		if (apply_filters('wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES)) {
+			require_once plugin_dir_path(__DIR__).'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
+			require_once plugin_dir_path(__DIR__).'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
+			require_once plugin_dir_path(__DIR__).'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
 			new Wordlift_Schemaorg_Sync_Service();
 			$schemaorg_property_service = Wordlift_Schemaorg_Property_Service::get_instance();
 			new Wordlift_Schemaorg_Class_Service();
@@ -1045,13 +1045,13 @@ 
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Load the `wl-api` end-point.
 		new Wordlift_Http_Api();
 
 		// Load the Install Service.
-		require_once plugin_dir_path( __DIR__ ) . 'install/class-wordlift-install-service.php';
+		require_once plugin_dir_path(__DIR__).'install/class-wordlift-install-service.php';
 		$this->install_service = new Wordlift_Install_Service();
 		$this->notice_service  = new Wordlift_Notice_Service();
 		$this->user_service    = Wordlift_User_Service::get_instance();
@@ -1073,21 +1073,21 @@ 
 		add_action(
 			'plugins_loaded',
 			// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			function () use ( &$that, $schemaorg_property_service ) {
+			function() use (&$that, $schemaorg_property_service) {
 
 				/** Services. */
 				// Create the configuration service.
 				new Wordlift_Api_Service();
 
 				// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-				$that->entity_link_service = new Wordlift_Entity_Link_Service( $that->entity_post_type_service, Wordlift_Configuration_Service::get_instance()->get_entity_base_path() );
+				$that->entity_link_service = new Wordlift_Entity_Link_Service($that->entity_post_type_service, Wordlift_Configuration_Service::get_instance()->get_entity_base_path());
 
 				$schema_url_property_service = new Wordlift_Schema_Url_Property_Service();
 
 				$that->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
 
 				// Create a new instance of the Redirect service.
-				$that->redirect_service = new Wordlift_Redirect_Service( $that->entity_uri_service );
+				$that->redirect_service = new Wordlift_Redirect_Service($that->entity_uri_service);
 
 				// Create a new instance of the Timeline service and Timeline shortcode.
 				$that->timeline_service = new Wordlift_Timeline_Service();
@@ -1100,30 +1100,30 @@ 
 				// Create an instance of the PrimaShop adapter.
 				$that->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
-				$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+				$uri_service = new Wordlift_Uri_Service($GLOBALS['wpdb']);
 
 				// Create the entity rating service.
 				$that->rating_service = Wordlift_Rating_Service::get_instance();
 
 				// Create entity list customization (wp-admin/edit.php).
-				$that->entity_list_service = new Wordlift_Entity_List_Service( $that->rating_service );
+				$that->entity_list_service = new Wordlift_Entity_List_Service($that->rating_service);
 
 				// Create an instance of the Publisher Service and the AJAX Adapter.
 				$that->publisher_service = Wordlift_Publisher_Service::get_instance();
-				$that->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
-				$that->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+				$that->property_factory  = new Wordlift_Property_Factory($schema_url_property_service);
+				$that->property_factory->register(Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service);
 
 				$attachment_service = Wordlift_Attachment_Service::get_instance();
 
 				// Instantiate the JSON-LD service.
 				$property_getter                       = Wordlift_Property_Getter_Factory::create();
-				$that->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service );
-				$that->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $that->post_to_jsonld_converter );
-				$that->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $that->entity_post_to_jsonld_converter, $that->post_to_jsonld_converter );
-				$that->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter( Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service );
+				$that->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter(Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service);
+				$that->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter(Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $that->post_to_jsonld_converter);
+				$that->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter($that->entity_post_to_jsonld_converter, $that->post_to_jsonld_converter);
+				$that->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter(Wordlift_Entity_Type_Service::get_instance(), $that->user_service, $attachment_service);
 
-				$jsonld_cache                            = new Ttl_Cache( 'jsonld', 86400 );
-				$that->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $that->postid_to_jsonld_converter, $jsonld_cache );
+				$jsonld_cache                            = new Ttl_Cache('jsonld', 86400);
+				$that->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter($that->postid_to_jsonld_converter, $jsonld_cache);
 				/*
 				* Load the `Wordlift_Term_JsonLd_Adapter`.
 				*
@@ -1131,22 +1131,22 @@ 
 				*
 				* @since 3.20.0
 				*/
-				require_once plugin_dir_path( __DIR__ ) . 'public/class-wordlift-term-jsonld-adapter.php';
+				require_once plugin_dir_path(__DIR__).'public/class-wordlift-term-jsonld-adapter.php';
 
-				$term_jsonld_adapter  = new Wordlift_Term_JsonLd_Adapter( $that->entity_uri_service, $that->cached_postid_to_jsonld_converter );
-				$that->jsonld_service = new Wordlift_Jsonld_Service( Wordlift_Entity_Service::get_instance(), $that->cached_postid_to_jsonld_converter, $that->jsonld_website_converter, $term_jsonld_adapter );
+				$term_jsonld_adapter  = new Wordlift_Term_JsonLd_Adapter($that->entity_uri_service, $that->cached_postid_to_jsonld_converter);
+				$that->jsonld_service = new Wordlift_Jsonld_Service(Wordlift_Entity_Service::get_instance(), $that->cached_postid_to_jsonld_converter, $that->jsonld_website_converter, $term_jsonld_adapter);
 
 				$jsonld_service = new Jsonld_Service(
 					$that->jsonld_service,
 					$term_jsonld_adapter,
-					new Jsonld_User_Service( $that->user_service )
+					new Jsonld_User_Service($that->user_service)
 				);
-				new Jsonld_Endpoint( $jsonld_service, $that->entity_uri_service );
+				new Jsonld_Endpoint($jsonld_service, $that->entity_uri_service);
 
 				// Prints the JSON-LD in the head.
-				new Jsonld_Adapter( $that->jsonld_service );
+				new Jsonld_Adapter($that->jsonld_service);
 
-				new Jsonld_By_Id_Endpoint( $that->jsonld_service, $that->entity_uri_service );
+				new Jsonld_By_Id_Endpoint($that->jsonld_service, $that->entity_uri_service);
 
 				$that->key_validation_service = new Wordlift_Key_Validation_Service();
 
@@ -1154,10 +1154,10 @@ 
 				// Creating Faq Content filter service.
 				$that->faq_content_filter_service = new Faq_Content_Filter();
 				$that->sample_data_service        = Wordlift_Sample_Data_Service::get_instance();
-				$that->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter( $that->sample_data_service );
+				$that->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter($that->sample_data_service);
 
-				$that->loader->add_action( 'enqueue_block_editor_assets', $that, 'add_wl_enabled_blocks' );
-				$that->loader->add_action( 'admin_enqueue_scripts', $that, 'add_wl_enabled_blocks' );
+				$that->loader->add_action('enqueue_block_editor_assets', $that, 'add_wl_enabled_blocks');
+				$that->loader->add_action('admin_enqueue_scripts', $that, 'add_wl_enabled_blocks');
 
 				/**
 				 * Filter: wl_feature__enable__blocks.
@@ -1167,15 +1167,15 @@ 
 				 * @return bool
 				 * @since 3.27.6
 				 */
-				if ( apply_filters( 'wl_feature__enable__blocks', true ) ) {
+				if (apply_filters('wl_feature__enable__blocks', true)) {
 					// Initialize the short-codes.
-					new Async_Template_Decorator( new Wordlift_Navigator_Shortcode() );
+					new Async_Template_Decorator(new Wordlift_Navigator_Shortcode());
 					new Wordlift_Chord_Shortcode();
 					new Wordlift_Geomap_Shortcode();
 					new Wordlift_Timeline_Shortcode();
-					new Wordlift_Related_Entities_Cloud_Shortcode( Wordlift_Relation_Service::get_instance(), Wordlift_Entity_Service::get_instance() );
+					new Wordlift_Related_Entities_Cloud_Shortcode(Wordlift_Relation_Service::get_instance(), Wordlift_Entity_Service::get_instance());
 					new Wordlift_Vocabulary_Shortcode();
-					new Async_Template_Decorator( new Wordlift_Faceted_Search_Shortcode() );
+					new Async_Template_Decorator(new Wordlift_Faceted_Search_Shortcode());
 				}
 
 				new Wordlift_Products_Navigator_Shortcode();
@@ -1187,16 +1187,16 @@ 
 				new Wordlift_Seo_Service();
 
 				// Initialize the AMP service.
-				new Wordlift_AMP_Service( $that->jsonld_service );
+				new Wordlift_AMP_Service($that->jsonld_service);
 
 				/** Services. */
 				$that->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
 				new Wordlift_Image_Service();
 
 				/** Adapters. */
-				$that->entity_type_adapter    = new Wordlift_Entity_Type_Adapter( Wordlift_Entity_Type_Service::get_instance() );
-				$that->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $that->publisher_service );
-				$that->tinymce_adapter        = new Wordlift_Tinymce_Adapter( $that );
+				$that->entity_type_adapter    = new Wordlift_Entity_Type_Adapter(Wordlift_Entity_Type_Service::get_instance());
+				$that->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter($that->publisher_service);
+				$that->tinymce_adapter        = new Wordlift_Tinymce_Adapter($that);
 
 				/*
 				* Exclude our public js from WP-Rocket.
@@ -1220,14 +1220,14 @@ 
 				$that->language_select_element = new Wordlift_Admin_Language_Select_Element();
 				$that->country_select_element  = new Wordlift_Admin_Country_Select_Element();
 				$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-				$that->publisher_element       = new Wordlift_Admin_Publisher_Element( $that->publisher_service, $tabs_element, $that->select2_element );
-				$that->author_element          = new Wordlift_Admin_Author_Element( $that->publisher_service, $that->select2_element );
+				$that->publisher_element       = new Wordlift_Admin_Publisher_Element($that->publisher_service, $tabs_element, $that->select2_element);
+				$that->author_element          = new Wordlift_Admin_Author_Element($that->publisher_service, $that->select2_element);
 
 				$that->settings_page             = Wordlift_Admin_Settings_Page::get_instance();
-				$that->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $that->settings_page );
+				$that->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link($that->settings_page);
 
-				$that->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $that->input_element, $that->radio_input_element );
-				$that->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $that->analytics_settings_page );
+				$that->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page($that->input_element, $that->radio_input_element);
+				$that->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link($that->analytics_settings_page);
 				$that->analytics_connect                   = new Wordlift_Analytics_Connect();
 
 				// Pages.
@@ -1238,9 +1238,9 @@ 
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/914
 				*/
-				if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
-					require_once plugin_dir_path( __DIR__ ) . 'admin/class-wordlift-admin-post-edit-page.php';
-					new Wordlift_Admin_Post_Edit_Page( $that );
+				if (apply_filters('wl_can_see_classification_box', true)) {
+					require_once plugin_dir_path(__DIR__).'admin/class-wordlift-admin-post-edit-page.php';
+					new Wordlift_Admin_Post_Edit_Page($that);
 				}
 				new Wordlift_Entity_Type_Admin_Service();
 
@@ -1248,19 +1248,19 @@ 
 				$that->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
 				// Create an instance of the install wizard.
-				$that->admin_setup = new Wordlift_Admin_Setup( $that->key_validation_service, Wordlift_Entity_Service::get_instance(), $that->language_select_element, $that->country_select_element );
+				$that->admin_setup = new Wordlift_Admin_Setup($that->key_validation_service, Wordlift_Entity_Service::get_instance(), $that->language_select_element, $that->country_select_element);
 
-				$that->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $that->entity_post_type_service );
+				$that->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service($that->entity_post_type_service);
 
 				// User Profile.
-				new Wordlift_Admin_User_Profile_Page( $that->author_element, $that->user_service );
+				new Wordlift_Admin_User_Profile_Page($that->author_element, $that->user_service);
 
 				$that->entity_page_service = new Wordlift_Entity_Page_Service();
 
 				// Load the debug service if WP is in debug mode.
-				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-					require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-debug-service.php';
-					new Wordlift_Debug_Service( Wordlift_Entity_Service::get_instance(), $uri_service );
+				if (defined('WP_DEBUG') && WP_DEBUG) {
+					require_once plugin_dir_path(__DIR__).'includes/class-wordlift-debug-service.php';
+					new Wordlift_Debug_Service(Wordlift_Entity_Service::get_instance(), $uri_service);
 				}
 
 				// Remote Image Service.
@@ -1273,12 +1273,12 @@ 
 				*
 				* @see https://github.com/insideout10/wordlift-plugin/issues/852.
 				*/
-				require_once plugin_dir_path( __DIR__ ) . 'includes/class-wordlift-batch-action.php';
-				require_once plugin_dir_path( __DIR__ ) . 'includes/mapping/class-wordlift-mapping-service.php';
-				require_once plugin_dir_path( __DIR__ ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
+				require_once plugin_dir_path(__DIR__).'includes/class-wordlift-batch-action.php';
+				require_once plugin_dir_path(__DIR__).'includes/mapping/class-wordlift-mapping-service.php';
+				require_once plugin_dir_path(__DIR__).'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
 
 				// Create an instance of the Mapping Service and assign it to the Ajax Adapter.
-				new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
+				new Wordlift_Mapping_Ajax_Adapter(new Wordlift_Mapping_Service(Wordlift_Entity_Type_Service::get_instance()));
 
 				/*
 				* Load the Mappings JSON-LD post processing.
@@ -1292,11 +1292,11 @@ 
 				// Taxonomy term rule validator for validating rules for term pages.
 				new Taxonomy_Term_Rule_Validator();
 				new Post_Taxonomy_Term_Rule_Validator();
-				$rule_validators_registry = new Rule_Validators_Registry( $default_rule_validator );
-				$rule_groups_validator    = new Rule_Groups_Validator( $rule_validators_registry );
-				$mappings_validator       = new Mappings_Validator( $mappings_dbo, $rule_groups_validator );
+				$rule_validators_registry = new Rule_Validators_Registry($default_rule_validator);
+				$rule_groups_validator    = new Rule_Groups_Validator($rule_validators_registry);
+				$mappings_validator       = new Mappings_Validator($mappings_dbo, $rule_groups_validator);
 
-				new Url_To_Entity_Transform_Function( $that->entity_uri_service );
+				new Url_To_Entity_Transform_Function($that->entity_uri_service);
 				new Taxonomy_To_Terms_Transform_Function();
 				new Post_Id_To_Entity_Transform_Function();
 				$mappings_transform_functions_registry = new Mappings_Transform_Functions_Registry();
@@ -1306,7 +1306,7 @@ 
 				 * Intiailize the acf group data formatter.
 				 */
 				new Acf_Group_Formatter();
-				new Jsonld_Converter( $mappings_validator, $mappings_transform_functions_registry );
+				new Jsonld_Converter($mappings_validator, $mappings_transform_functions_registry);
 
 				/**
 				 * @since 3.26.0
@@ -1324,16 +1324,16 @@ 
 				// Call this static method to register FAQ routes to rest api - disabled
 				// Faq_Rest_Controller::register_routes();
 
-				$that->storage_factory = new Wordlift_Storage_Factory( Wordlift_Entity_Service::get_instance(), $that->user_service, $property_getter );
+				$that->storage_factory = new Wordlift_Storage_Factory(Wordlift_Entity_Service::get_instance(), $that->user_service, $property_getter);
 
 				/** WL Autocomplete. */
-				$autocomplete_service       = new All_Autocomplete_Service(
+				$autocomplete_service = new All_Autocomplete_Service(
 					array(
 						new Local_Autocomplete_Service(),
-						new Linked_Data_Autocomplete_Service( Entity_Helper::get_instance(), $that->entity_uri_service, Wordlift_Entity_Service::get_instance() ),
+						new Linked_Data_Autocomplete_Service(Entity_Helper::get_instance(), $that->entity_uri_service, Wordlift_Entity_Service::get_instance()),
 					)
 				);
-				$that->autocomplete_adapter = new Wordlift_Autocomplete_Adapter( $autocomplete_service );
+				$that->autocomplete_adapter = new Wordlift_Autocomplete_Adapter($autocomplete_service);
 
 				/**
 				 * @since 3.27.2
@@ -1342,10 +1342,10 @@ 
 				 */
 				new Recipe_Maker_Post_Type_Hook();
 				$recipe_maker_validation_service = new Recipe_Maker_Validation_Service();
-				new Recipe_Maker_Jsonld_Hook( $attachment_service, $recipe_maker_validation_service );
-				new Recipe_Maker_After_Get_Jsonld_Hook( $recipe_maker_validation_service );
-				new Recipe_Maker_Jsonld_Swap( $recipe_maker_validation_service, $that->jsonld_service );
-				new Recipe_Maker_Warning( $recipe_maker_validation_service );
+				new Recipe_Maker_Jsonld_Hook($attachment_service, $recipe_maker_validation_service);
+				new Recipe_Maker_After_Get_Jsonld_Hook($recipe_maker_validation_service);
+				new Recipe_Maker_Jsonld_Swap($recipe_maker_validation_service, $that->jsonld_service);
+				new Recipe_Maker_Warning($recipe_maker_validation_service);
 
 				/**
 				 * Avada Builder compatibility.
@@ -1360,7 +1360,7 @@ 
 				 * @since 3.27.8
 				 * @see https://github.com/insideout10/wordlift-plugin/issues/1248
 				 */
-				new Key_Validation_Notice( $that->key_validation_service, Wordlift_Configuration_Service::get_instance() );
+				new Key_Validation_Notice($that->key_validation_service, Wordlift_Configuration_Service::get_instance());
 
 				/**
 				 * @since 3.28.0
@@ -1372,7 +1372,7 @@ 
 				 * @since 3.29.0
 				 * @see https://github.com/insideout10/wordlift-plugin/issues/1304
 				 */
-				new Entity_Rest_Service( Wordlift_Entity_Type_Service::get_instance() );
+				new Entity_Rest_Service(Wordlift_Entity_Type_Service::get_instance());
 
 				/**
 				 * Expand author in to references.
@@ -1381,12 +1381,12 @@ 
 				 * @see https://github.com/insideout10/wordlift-plugin/issues/1318
 				 */
 				// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-				if ( apply_filters( 'wl_feature__enable__article-wrapper', false ) ) {
-					new Jsonld_Article_Wrapper( Wordlift_Post_To_Jsonld_Converter::get_instance(), $that->cached_postid_to_jsonld_converter );
+				if (apply_filters('wl_feature__enable__article-wrapper', false)) {
+					new Jsonld_Article_Wrapper(Wordlift_Post_To_Jsonld_Converter::get_instance(), $that->cached_postid_to_jsonld_converter);
 				}
 
 				// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-				if ( apply_filters( 'wl_feature__enable__match-terms', false ) ) {
+				if (apply_filters('wl_feature__enable__match-terms', false)) {
 					$vocabulary_loader = new Vocabulary_Loader();
 					$vocabulary_loader->init_vocabulary();
 				}
@@ -1394,7 +1394,7 @@ 
 				/**
 				 * Added for feature request 1496 (Webhooks)
 				 */
-				if ( apply_filters( 'wl_feature__enable__webhooks', false ) ) {
+				if (apply_filters('wl_feature__enable__webhooks', false)) {
 					$that->webhook_loader = new Webhooks_Loader();
 					$that->webhook_loader->init();
 				}
@@ -1423,7 +1423,7 @@ 
 				 * @since 3.31.5
 				 * Create configuration endpoint for webapp to configure.
 				 */
-				new Config( $that->admin_setup, $that->key_validation_service );
+				new Config($that->admin_setup, $that->key_validation_service);
 				/**
 				 * @since 3.31.7
 				 * Remove duplicate videoobject.
@@ -1435,7 +1435,7 @@ 
 				 * @since 3.32.0
 				 * Create loader for vocabulary terms.
 				 */
-				$vocabulary_terms_loader = new Vocabulary_Terms_Loader( Wordlift_Entity_Type_Service::get_instance(), $property_getter );
+				$vocabulary_terms_loader = new Vocabulary_Terms_Loader(Wordlift_Entity_Type_Service::get_instance(), $property_getter);
 				$vocabulary_terms_loader->init_feature();
 
 				new Entity_Type_Change_Handler(
@@ -1464,9 +1464,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_I18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -1477,7 +1477,7 @@ 
 	 * @since    1.0.0
 	 * @access   private
 	 */
-	private function define_admin_hooks( $that ) {
+	private function define_admin_hooks($that) {
 		$plugin_admin = new Wordlift_Admin(
 			$that->get_plugin_name(),
 			$that->get_version(),
@@ -1485,51 +1485,51 @@ 
 			$that->user_service
 		);
 
-		$that->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$that->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
+		$that->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$that->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11);
 
 		// Hook the `admin_init` function to the Admin Setup.
-		Assertions::is_set( $that->admin_setup, '`admin_setup` must be set' );
-		$that->loader->add_action( 'admin_init', $that->admin_setup, 'admin_init' );
+		Assertions::is_set($that->admin_setup, '`admin_setup` must be set');
+		$that->loader->add_action('admin_init', $that->admin_setup, 'admin_init');
 
 		// Hook the admin_init to the settings page.
-		Assertions::is_set( $that->settings_page, '`setting_page` must be set' );
-		$that->loader->add_action( 'admin_init', $that->settings_page, 'admin_init' );
+		Assertions::is_set($that->settings_page, '`setting_page` must be set');
+		$that->loader->add_action('admin_init', $that->settings_page, 'admin_init');
 
 		// Hook the admin_init to the analytics settings page.
-		Assertions::is_set( $that->analytics_settings_page, '`analytics_setting_page` must be set' );
-		$that->loader->add_action( 'admin_init', $that->analytics_settings_page, 'admin_init' );
+		Assertions::is_set($that->analytics_settings_page, '`analytics_setting_page` must be set');
+		$that->loader->add_action('admin_init', $that->analytics_settings_page, 'admin_init');
 
 		// Hook the init action to taxonomy services.
-		$that->loader->add_action( 'init', $that->topic_taxonomy_service, 'init', 0 );
-		$that->loader->add_action( 'init', $that->entity_types_taxonomy_service, 'init', 0 );
+		$that->loader->add_action('init', $that->topic_taxonomy_service, 'init', 0);
+		$that->loader->add_action('init', $that->entity_types_taxonomy_service, 'init', 0);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$that->loader->add_action( 'wp_ajax_wl_timeline', $that->timeline_service, 'ajax_timeline' );
+		$that->loader->add_action('wp_ajax_wl_timeline', $that->timeline_service, 'ajax_timeline');
 
 		// Register custom allowed redirect hosts.
-		$that->loader->add_filter( 'allowed_redirect_hosts', $that->redirect_service, 'allowed_redirect_hosts' );
+		$that->loader->add_filter('allowed_redirect_hosts', $that->redirect_service, 'allowed_redirect_hosts');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$that->loader->add_action( 'wp_ajax_wordlift_redirect', $that->redirect_service, 'ajax_redirect' );
+		$that->loader->add_action('wp_ajax_wordlift_redirect', $that->redirect_service, 'ajax_redirect');
 
 		// Hook save_post to the entity service to update custom fields (such as alternate labels).
 		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$that->loader->add_action( 'save_post', Wordlift_Entity_Service::get_instance(), 'save_post', 9, 2 );
-		$that->loader->add_action( 'save_post', $that->rating_service, 'set_rating_for', 20, 1 );
+		$that->loader->add_action('save_post', Wordlift_Entity_Service::get_instance(), 'save_post', 9, 2);
+		$that->loader->add_action('save_post', $that->rating_service, 'set_rating_for', 20, 1);
 
-		$that->loader->add_action( 'edit_form_before_permalink', Wordlift_Entity_Service::get_instance(), 'edit_form_before_permalink', 10, 1 );
-		$that->loader->add_action( 'in_admin_header', $that->rating_service, 'in_admin_header' );
+		$that->loader->add_action('edit_form_before_permalink', Wordlift_Entity_Service::get_instance(), 'edit_form_before_permalink', 10, 1);
+		$that->loader->add_action('in_admin_header', $that->rating_service, 'in_admin_header');
 
 		// Entity listing customization (wp-admin/edit.php)
 		// Add custom columns.
-		$that->loader->add_filter( 'manage_entity_posts_columns', $that->entity_list_service, 'register_custom_columns' );
+		$that->loader->add_filter('manage_entity_posts_columns', $that->entity_list_service, 'register_custom_columns');
 		// no explicit entity as it prevents handling of other post types.
-		$that->loader->add_filter( 'manage_posts_custom_column', $that->entity_list_service, 'render_custom_columns', 10, 2 );
+		$that->loader->add_filter('manage_posts_custom_column', $that->entity_list_service, 'render_custom_columns', 10, 2);
 		// Add 4W selection.
-		$that->loader->add_action( 'restrict_manage_posts', $that->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$that->loader->add_filter( 'posts_clauses', $that->entity_list_service, 'posts_clauses_classification_scope' );
-		$that->loader->add_action( 'pre_get_posts', $that->entity_list_service, 'pre_get_posts' );
-		$that->loader->add_action( 'load-edit.php', $that->entity_list_service, 'load_edit' );
+		$that->loader->add_action('restrict_manage_posts', $that->entity_list_service, 'restrict_manage_posts_classification_scope');
+		$that->loader->add_filter('posts_clauses', $that->entity_list_service, 'posts_clauses_classification_scope');
+		$that->loader->add_action('pre_get_posts', $that->entity_list_service, 'pre_get_posts');
+		$that->loader->add_action('load-edit.php', $that->entity_list_service, 'load_edit');
 
 		/*
 		 * If `All Entity Types` is disable, use the radio button Walker.
@@ -1537,18 +1537,18 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES )
+		if ( ! apply_filters('wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES)
 		     // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			 && ! apply_filters( 'wl_feature__enable__entity-types-professional', false )
+			 && ! apply_filters('wl_feature__enable__entity-types-professional', false)
 		     // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-			 && ! apply_filters( 'wl_feature__enable__entity-types-business', false )
+			 && ! apply_filters('wl_feature__enable__entity-types-business', false)
 		) {
-			$that->loader->add_filter( 'wp_terms_checklist_args', $that->entity_types_taxonomy_walker, 'terms_checklist_args' );
+			$that->loader->add_filter('wp_terms_checklist_args', $that->entity_types_taxonomy_walker, 'terms_checklist_args');
 		}
 
 		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
 		// entities.
-		$that->loader->add_filter( 'prima_metabox_entity_header_args', $that->primashop_adapter, 'prima_metabox_entity_header_args', 10 );
+		$that->loader->add_filter('prima_metabox_entity_header_args', $that->primashop_adapter, 'prima_metabox_entity_header_args', 10);
 
 		/**
 		 * Filter: wl_feature__enable__settings-download.
@@ -1568,20 +1568,20 @@ 
 		);
 
 		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$that->loader->add_action( 'wp_ajax_wl_download_your_data', $that->download_your_data_page, 'download_your_data', 10 );
+		$that->loader->add_action('wp_ajax_wl_download_your_data', $that->download_your_data_page, 'download_your_data', 10);
 
 		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$that->loader->add_action( 'wp_ajax_wl_jsonld', $that->jsonld_service, 'get' );
-		$that->loader->add_action( 'admin_post_wl_jsonld', $that->jsonld_service, 'get' );
-		$that->loader->add_action( 'admin_post_nopriv_wl_jsonld', $that->jsonld_service, 'get' );
+		$that->loader->add_action('wp_ajax_wl_jsonld', $that->jsonld_service, 'get');
+		$that->loader->add_action('admin_post_wl_jsonld', $that->jsonld_service, 'get');
+		$that->loader->add_action('admin_post_nopriv_wl_jsonld', $that->jsonld_service, 'get');
 
 		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$that->loader->add_action( 'wp_ajax_wl_validate_key', $that->key_validation_service, 'validate_key' );
+		$that->loader->add_action('wp_ajax_wl_validate_key', $that->key_validation_service, 'validate_key');
 
 		// Hook the AJAX wl_update_country_options action to the countries.
-		$that->loader->add_action( 'wp_ajax_wl_update_country_options', $that->country_select_element, 'get_options_html' );
+		$that->loader->add_action('wp_ajax_wl_update_country_options', $that->country_select_element, 'get_options_html');
 
-		$that->loader->add_filter( 'admin_post_thumbnail_html', $that->publisher_service, 'add_featured_image_instruction' );
+		$that->loader->add_filter('admin_post_thumbnail_html', $that->publisher_service, 'add_featured_image_instruction');
 
 		// Hook the menu creation on the general wordlift menu creation.
 		/**
@@ -1595,16 +1595,16 @@ 
 		 * Since 3.30.0 this feature is registered using registry.
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__settings-screen', true ) || Admin_User_Option::is_wordlift_admin() ) {
-			add_action( 'wl_admin_menu', array( $that->settings_page, 'admin_menu' ), 10, 2 );
+		if (apply_filters('wl_feature__enable__settings-screen', true) || Admin_User_Option::is_wordlift_admin()) {
+			add_action('wl_admin_menu', array($that->settings_page, 'admin_menu'), 10, 2);
 		}
 
 		// Hook key update.
-		$that->loader->add_action( 'pre_update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'maybe_update_dataset_uri', 10, 2 );
-		$that->loader->add_action( 'update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'update_key', 10, 2 );
+		$that->loader->add_action('pre_update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'maybe_update_dataset_uri', 10, 2);
+		$that->loader->add_action('update_option_wl_general_settings', Wordlift_Configuration_Service::get_instance(), 'update_key', 10, 2);
 
 		// Add additional action links to the WordLift plugin in the plugins page.
-		$that->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $that->settings_page_action_link, 'action_links', 10, 1 );
+		$that->loader->add_filter('plugin_action_links_wordlift/wordlift.php', $that->settings_page_action_link, 'action_links', 10, 1);
 
 		/*
 		 * Remove the Analytics Settings link from the plugin page.
@@ -1615,23 +1615,23 @@ 
 		// $that->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $that->analytics_settings_page_action_link, 'action_links', 10, 1 );
 
 		// Hook the AJAX `wl_publisher` action name.
-		$that->loader->add_action( 'wp_ajax_wl_publisher', $that->publisher_ajax_adapter, 'publisher' );
+		$that->loader->add_action('wp_ajax_wl_publisher', $that->publisher_ajax_adapter, 'publisher');
 
 		// Hook row actions for the entity type list admin.
-		$that->loader->add_filter( 'wl_entity_type_row_actions', $that->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+		$that->loader->add_filter('wl_entity_type_row_actions', $that->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2);
 
 		/** Ajax actions. */
-		$that->loader->add_action( 'wp_ajax_wl_google_analytics_export', $that->google_analytics_export_service, 'export' );
+		$that->loader->add_action('wp_ajax_wl_google_analytics_export', $that->google_analytics_export_service, 'export');
 
 		// Hook capabilities manipulation to allow access to entity type admin
 		// page  on WordPress versions before 4.7.
 		global $wp_version;
-		if ( version_compare( $wp_version, '4.7', '<' ) ) {
-			$that->loader->add_filter( 'map_meta_cap', $that->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 2 );
+		if (version_compare($wp_version, '4.7', '<')) {
+			$that->loader->add_filter('map_meta_cap', $that->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 2);
 		}
 
 		/** Adapters. */
-		$that->loader->add_filter( 'mce_external_plugins', $that->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+		$that->loader->add_filter('mce_external_plugins', $that->tinymce_adapter, 'mce_external_plugins', 10, 1);
 		/**
 		 * Disabling Faq temporarily.
 		 * Load the tinymce editor button on the tool bar.
@@ -1642,14 +1642,14 @@ 
 		// $that->loader->add_filter( 'mce_buttons', $that->faq_tinymce_adapter, 'register_faq_toolbar_button', 10, 1 );
 		// $that->loader->add_filter( 'mce_external_plugins', $that->faq_tinymce_adapter, 'register_faq_tinymce_plugin', 10, 1 );
 
-		$that->loader->add_action( 'wp_ajax_wl_sample_data_create', $that->sample_data_ajax_adapter, 'create' );
-		$that->loader->add_action( 'wp_ajax_wl_sample_data_delete', $that->sample_data_ajax_adapter, 'delete' );
+		$that->loader->add_action('wp_ajax_wl_sample_data_create', $that->sample_data_ajax_adapter, 'create');
+		$that->loader->add_action('wp_ajax_wl_sample_data_delete', $that->sample_data_ajax_adapter, 'delete');
 
 		/**
 		 * @since 3.26.0
 		 */
 		$excerpt_adapter = new Post_Excerpt_Meta_Box_Adapter();
-		$that->loader->add_action( 'do_meta_boxes', $excerpt_adapter, 'replace_post_excerpt_meta_box' );
+		$that->loader->add_action('do_meta_boxes', $excerpt_adapter, 'replace_post_excerpt_meta_box');
 		// Adding Rest route for the post excerpt
 		Post_Excerpt_Rest_Controller::register_routes();
 
@@ -1670,13 +1670,13 @@ 
 		);
 
 		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$that->loader->add_filter( 'map_meta_cap', $that->entity_type_admin_page, 'restrict_super_admin', 10, 2 );
+		if (is_multisite()) {
+			$that->loader->add_filter('map_meta_cap', $that->entity_type_admin_page, 'restrict_super_admin', 10, 2);
 		}
 
 		$deactivator_feedback = new Wordlift_Deactivator_Feedback();
 
-		add_action( 'admin_footer', array( $deactivator_feedback, 'render_feedback_popup' ) );
+		add_action('admin_footer', array($deactivator_feedback, 'render_feedback_popup'));
 		add_action(
 			'admin_enqueue_scripts',
 			array(
@@ -1699,13 +1699,13 @@ 
 		 */
 		add_filter(
 			'allowed_block_types',
-			function ( $value ) {
+			function($value) {
 
-				if ( true === $value ) {
+				if (true === $value) {
 					return $value;
 				}
 
-				return array_merge( (array) $value, array( 'wordlift/classification' ) );
+				return array_merge((array) $value, array('wordlift/classification'));
 			},
 			PHP_INT_MAX
 		);
@@ -1718,23 +1718,23 @@ 
 
 		add_action(
 			'admin_notices',
-			function () {
-				if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+			function() {
+				if (apply_filters('wl_feature__enable__notices', true)) {
 					/**
 					 * Fired when the notice feature is enabled.
 					 *
 					 * @since 3.40.4
 					 */
-					do_action( 'wordlift_admin_notices' );
+					do_action('wordlift_admin_notices');
 				}
 			}
 		);
 
 		add_action(
 			'admin_init',
-			function () {
+			function() {
 				// Only show the notice when the key is set or skipped.
-				if ( \Wordlift_Configuration_Service::get_instance()->get_key() && ! \Wordlift_Configuration_Service::get_instance()->get_skip_installation_notice() ) {
+				if (\Wordlift_Configuration_Service::get_instance()->get_key() && ! \Wordlift_Configuration_Service::get_instance()->get_skip_installation_notice()) {
 					$installation_complete_notice = new Installation_Complete_Notice();
 					$installation_complete_notice->init();
 				}
@@ -1750,57 +1750,57 @@ 
 	 * @since    1.0.0
 	 * @access   private
 	 */
-	private function define_public_hooks( $that ) {
+	private function define_public_hooks($that) {
 
-		$plugin_public = new Wordlift_Public( $that->get_plugin_name(), $that->get_version() );
+		$plugin_public = new Wordlift_Public($that->get_plugin_name(), $that->get_version());
 
 		// Register the entity post type.
-		$that->loader->add_action( 'init', $that->entity_post_type_service, 'register' );
+		$that->loader->add_action('init', $that->entity_post_type_service, 'register');
 
 		// Bind the link generation and handling hooks to the entity link service.
-		$that->loader->add_filter( 'post_type_link', $that->entity_link_service, 'post_type_link', 10, 2 );
-		$that->loader->add_action( 'pre_get_posts', $that->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
+		$that->loader->add_filter('post_type_link', $that->entity_link_service, 'post_type_link', 10, 2);
+		$that->loader->add_action('pre_get_posts', $that->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1);
 
-		$that->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$that->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-		$that->loader->add_action( 'wp_enqueue_scripts', $that->context_cards_service, 'enqueue_scripts' );
+		$that->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$that->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
+		$that->loader->add_action('wp_enqueue_scripts', $that->context_cards_service, 'enqueue_scripts');
 
 		// Registering Faq_Content_Filter service used for removing faq question and answer tags from the html.
-		$that->loader->add_filter( 'the_content', $that->faq_content_filter_service, 'remove_all_faq_question_and_answer_tags' );
+		$that->loader->add_filter('the_content', $that->faq_content_filter_service, 'remove_all_faq_question_and_answer_tags');
 		// Hook the content filter service to add entity links.
-		if ( ! defined( 'WL_DISABLE_CONTENT_FILTER' ) || ! WL_DISABLE_CONTENT_FILTER ) {
+		if ( ! defined('WL_DISABLE_CONTENT_FILTER') || ! WL_DISABLE_CONTENT_FILTER) {
 			// We run before other filters.
-			$that->loader->add_filter( 'the_content', $that->content_filter_service, 'the_content', 9 );
+			$that->loader->add_filter('the_content', $that->content_filter_service, 'the_content', 9);
 		}
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$that->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $that->timeline_service, 'ajax_timeline' );
+		$that->loader->add_action('wp_ajax_nopriv_wl_timeline', $that->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$that->loader->add_filter( 'the_content', $that->sharethis_service, 'the_content', 99 );
-		$that->loader->add_filter( 'the_excerpt', $that->sharethis_service, 'the_excerpt', 99 );
+		$that->loader->add_filter('the_content', $that->sharethis_service, 'the_content', 99);
+		$that->loader->add_filter('the_excerpt', $that->sharethis_service, 'the_excerpt', 99);
 
 		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$that->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $that->jsonld_service, 'get' );
+		$that->loader->add_action('wp_ajax_nopriv_wl_jsonld', $that->jsonld_service, 'get');
 
 		// Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
 		// in order to tweak WP's `WP_Query` to include entities in queries related
 		// to categories.
-		$that->loader->add_action( 'pre_get_posts', $that->category_taxonomy_service, 'pre_get_posts', 10, 1 );
+		$that->loader->add_action('pre_get_posts', $that->category_taxonomy_service, 'pre_get_posts', 10, 1);
 
 		/*
 		 * Hook the `pre_get_posts` action to the `Wordlift_Entity_Page_Service`
 		 * in order to tweak WP's `WP_Query` to show event related entities in reverse
 		 * order of start time.
 		 */
-		$that->loader->add_action( 'pre_get_posts', $that->entity_page_service, 'pre_get_posts', 10, 1 );
+		$that->loader->add_action('pre_get_posts', $that->entity_page_service, 'pre_get_posts', 10, 1);
 
 		// This hook have to run before the rating service, as otherwise the post might not be a proper entity when rating is done.
-		$that->loader->add_action( 'save_post', $that->entity_type_adapter, 'save_post', 9, 2 );
+		$that->loader->add_action('save_post', $that->entity_type_adapter, 'save_post', 9, 2);
 
 		// Analytics Script Frontend.
-		if ( apply_filters( 'wl_feature__enable__analytics', true ) && Wordlift_Configuration_Service::get_instance()->is_analytics_enable() ) {
-			$that->loader->add_action( 'wp_enqueue_scripts', $that->analytics_connect, 'enqueue_scripts', 10 );
+		if (apply_filters('wl_feature__enable__analytics', true) && Wordlift_Configuration_Service::get_instance()->is_analytics_enable()) {
+			$that->loader->add_action('wp_enqueue_scripts', $that->analytics_connect, 'enqueue_scripts', 10);
 		}
 
 	}
@@ -1865,7 +1865,7 @@ 
 		 * @since 3.27.6
 		 */
 		// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter,WordPress.WP.EnqueuedResourceParameters.MissingVersion
-		wp_register_script( 'wl_enabled_blocks', false );
+		wp_register_script('wl_enabled_blocks', false);
 
 		$enabled_blocks = array();
 
@@ -1875,11 +1875,11 @@ 
 		 * @since 3.32.3
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__product-navigator', true ) ) {
+		if (apply_filters('wl_feature__enable__product-navigator', true)) {
 			$enabled_blocks[] = 'wordlift/products-navigator';
 		}
 
-		if ( apply_filters( 'wl_feature__enable__blocks', true ) ) {
+		if (apply_filters('wl_feature__enable__blocks', true)) {
 			// To intimate JS
 			$enabled_blocks = array_merge(
 				$enabled_blocks,
@@ -1895,8 +1895,8 @@ 
 			);
 		}
 
-		wp_localize_script( 'wl_enabled_blocks', 'wlEnabledBlocks', $enabled_blocks );
-		wp_enqueue_script( 'wl_enabled_blocks' );
+		wp_localize_script('wl_enabled_blocks', 'wlEnabledBlocks', $enabled_blocks);
+		wp_enqueue_script('wl_enabled_blocks');
 	}
 
 	/**
@@ -1905,8 +1905,8 @@ 
 	public function register_screens() {
 		// Hook the menu to the Download Your Data page.
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__settings-download', true ) ) {
-			Assertions::is_set( $this->download_your_data_page, "`download_your_data_page` can't be null" );
+		if (apply_filters('wl_feature__enable__settings-download', true)) {
+			Assertions::is_set($this->download_your_data_page, "`download_your_data_page` can't be null");
 			add_action(
 				'admin_menu',
 				array(
@@ -1918,7 +1918,7 @@ 
 			);
 		}
 
-		Assertions::is_set( $this->entity_type_settings_admin_page, "`entity_type_settings_admin_page` can't be null" );
+		Assertions::is_set($this->entity_type_settings_admin_page, "`entity_type_settings_admin_page` can't be null");
 		add_action(
 			'admin_menu',
 			array(

src/includes/class-wordlift-entity-post-to-jsonld-converter.php

Indentation +203 added lines, -203 removed lines

@@ -13,214 +13,214 @@
  */
 class Wordlift_Entity_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var null|Wordlift_Schemaorg_Property_Service The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
-	 */
-	private $schemaorg_property_service;
-
-	/**
-	 * The {@link Wordlift_Post_To_Jsonld_Converter} is used to convert entities that also have the `article` term.
-	 *
-	 * @since 3.25.2
-	 * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 */
-	private $post_to_jsonld_converter;
-
-	/**
-	 * Wordlift_Entity_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Type_Service        $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_User_Service               $user_service A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service         $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Property_Getter            $property_getter A {@link Wordlift_Property_Getter} instance.
-	 * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
-	 * @param \Wordlift_Post_To_Jsonld_Converter   $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, $property_getter );
-		$this->schemaorg_property_service = $schemaorg_property_service;
-		$this->post_to_jsonld_converter   = $post_to_jsonld_converter;
-	}
-
-	/**
-	 * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
-	 * found while processing the post is set in the $references array.
-	 *
-	 * @param int   $post_id The {@link WP_Post} id.
-	 * @param array $references An array of entity references.
-	 * @param array $references_infos
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.8.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
-
-		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the base JSON-LD and the list of entities referenced by this entity.
-		if ( has_term( 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id ) ) {
-			$jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
-		} else {
-			$jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
-		}
-
-		// Get the entity name.
-		$jsonld['name'] = html_entity_decode( $post->post_title );
-
-		// 3.13.0, add alternate names.
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
-			$jsonld['alternateName'] = $alternative_labels;
-		}
-
-		// Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
-		//
-		// This allows us to gather the basic properties as defined by the `Thing` entity type.
-		// Get the configured type custom fields.
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_post( $post_id );
-
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
-		}
-
-		/*
+    /**
+     * The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var null|Wordlift_Schemaorg_Property_Service The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
+     */
+    private $schemaorg_property_service;
+
+    /**
+     * The {@link Wordlift_Post_To_Jsonld_Converter} is used to convert entities that also have the `article` term.
+     *
+     * @since 3.25.2
+     * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     */
+    private $post_to_jsonld_converter;
+
+    /**
+     * Wordlift_Entity_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Type_Service        $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_User_Service               $user_service A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service         $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Property_Getter            $property_getter A {@link Wordlift_Property_Getter} instance.
+     * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
+     * @param \Wordlift_Post_To_Jsonld_Converter   $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
+        parent::__construct( $entity_type_service, $user_service, $attachment_service, $property_getter );
+        $this->schemaorg_property_service = $schemaorg_property_service;
+        $this->post_to_jsonld_converter   = $post_to_jsonld_converter;
+    }
+
+    /**
+     * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
+     * found while processing the post is set in the $references array.
+     *
+     * @param int   $post_id The {@link WP_Post} id.
+     * @param array $references An array of entity references.
+     * @param array $references_infos
+     *
+     * @return array A JSON-LD array.
+     * @since 3.8.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+
+        // Get the post instance.
+        $post = get_post( $post_id );
+        if ( null === $post ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the base JSON-LD and the list of entities referenced by this entity.
+        if ( has_term( 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id ) ) {
+            $jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
+        } else {
+            $jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
+        }
+
+        // Get the entity name.
+        $jsonld['name'] = html_entity_decode( $post->post_title );
+
+        // 3.13.0, add alternate names.
+        $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+        if ( 0 < count( $alternative_labels ) ) {
+            $jsonld['alternateName'] = $alternative_labels;
+        }
+
+        // Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
+        //
+        // This allows us to gather the basic properties as defined by the `Thing` entity type.
+        // Get the configured type custom fields.
+        $custom_fields = $this->entity_type_service->get_custom_fields_for_post( $post_id );
+
+        if ( isset( $custom_fields ) ) {
+            $this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
+        }
+
+        /*
 		 * Get the properties attached to the post.
 		 *
 		 * @since 3.20.0 We attach properties directly to the posts.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
-			$this->process_post_properties( $jsonld, $post_id );
-		}
-
-		/**
-		 * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
-		 *
-		 * @param array $value {
-		 *
-		 * @type array $jsonld The JSON-LD structure.
-		 * @type int[] $references An array of post IDs.
-		 * }
-		 * @since 3.25.0
-		 *
-		 * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
-		 *
-		 * @api
-		 */
-		$ret_val    = apply_filters(
-			'wl_entity_jsonld_array',
-			array(
-				'jsonld'     => $jsonld,
-				'references' => $references,
-			),
-			$post_id
-		);
-		$jsonld     = $ret_val['jsonld'];
-		$references = $ret_val['references'];
-
-		/**
-		 * Call the `wl_entity_jsonld` filter.
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 * @param int $post_id The {@link WP_Post} `id`.
-		 * @param array $references The array of referenced entities.
-		 *
-		 * @since 3.20.0
-		 *
-		 * @api
-		 */
-		return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
-	}
-
-	/**
-	 * Process the properties attached to the {@link WP_Post}.
-	 *
-	 * @param array $jsonld The JSON-LD array.
-	 * @param int   $post_id The target {@link WP_Post} id.
-	 *
-	 * @since 3.20.0
-	 */
-	private function process_post_properties( &$jsonld, $post_id ) {
-
-		// Get all the props.
-		$props = $this->schemaorg_property_service->get_all( $post_id );
-
-		// Process all the props.
-		foreach ( $props as $name => $instances ) {
-
-			// Get the values.
-			$values = array_map(
-				function ( $instance ) {
-					return $instance['value'];
-				},
-				$instances
-			);
-
-			// We might receive empty values, remove them.
-			$non_empty_values = array_filter(
-				$values,
-				function ( $value ) {
-					return ! empty( $value );
-				}
-			);
-
-			// Skip empty properties.
-			if ( empty( $non_empty_values ) ) {
-				continue;
-			}
-
-			// @@todo: need to handle maybe Numbers and URLs differently.
-			// Make an array a single value when possible.
-			$jsonld[ $name ] = self::make_one( $non_empty_values );
-		}
-
-	}
-
-	/**
-	 * Post process the generated JSON to reorganize values which are stored as 1st
-	 * level in WP but are really 2nd level.
-	 *
-	 * @param array $jsonld An array of JSON-LD properties and values.
-	 *
-	 * @return array The array remapped.
-	 * @since 3.8.0
-	 */
-	public static function post_process( $jsonld ) {
-
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
-				$jsonld['address']['@type'] = 'PostalAddress';
-				$jsonld['address'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( 'latitude' === $key || 'longitude' === $key ) {
-				$jsonld['geo']['@type'] = 'GeoCoordinates';
-				$jsonld['geo'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( 'calories' === $key ) {
-				$jsonld['nutrition']['@type'] = 'NutritionInformation';
-				$jsonld['nutrition'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-		}
-
-		return $jsonld;
-	}
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
+            $this->process_post_properties( $jsonld, $post_id );
+        }
+
+        /**
+         * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
+         *
+         * @param array $value {
+         *
+         * @type array $jsonld The JSON-LD structure.
+         * @type int[] $references An array of post IDs.
+         * }
+         * @since 3.25.0
+         *
+         * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
+         *
+         * @api
+         */
+        $ret_val    = apply_filters(
+            'wl_entity_jsonld_array',
+            array(
+                'jsonld'     => $jsonld,
+                'references' => $references,
+            ),
+            $post_id
+        );
+        $jsonld     = $ret_val['jsonld'];
+        $references = $ret_val['references'];
+
+        /**
+         * Call the `wl_entity_jsonld` filter.
+         *
+         * @param array $jsonld The JSON-LD structure.
+         * @param int $post_id The {@link WP_Post} `id`.
+         * @param array $references The array of referenced entities.
+         *
+         * @since 3.20.0
+         *
+         * @api
+         */
+        return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
+    }
+
+    /**
+     * Process the properties attached to the {@link WP_Post}.
+     *
+     * @param array $jsonld The JSON-LD array.
+     * @param int   $post_id The target {@link WP_Post} id.
+     *
+     * @since 3.20.0
+     */
+    private function process_post_properties( &$jsonld, $post_id ) {
+
+        // Get all the props.
+        $props = $this->schemaorg_property_service->get_all( $post_id );
+
+        // Process all the props.
+        foreach ( $props as $name => $instances ) {
+
+            // Get the values.
+            $values = array_map(
+                function ( $instance ) {
+                    return $instance['value'];
+                },
+                $instances
+            );
+
+            // We might receive empty values, remove them.
+            $non_empty_values = array_filter(
+                $values,
+                function ( $value ) {
+                    return ! empty( $value );
+                }
+            );
+
+            // Skip empty properties.
+            if ( empty( $non_empty_values ) ) {
+                continue;
+            }
+
+            // @@todo: need to handle maybe Numbers and URLs differently.
+            // Make an array a single value when possible.
+            $jsonld[ $name ] = self::make_one( $non_empty_values );
+        }
+
+    }
+
+    /**
+     * Post process the generated JSON to reorganize values which are stored as 1st
+     * level in WP but are really 2nd level.
+     *
+     * @param array $jsonld An array of JSON-LD properties and values.
+     *
+     * @return array The array remapped.
+     * @since 3.8.0
+     */
+    public static function post_process( $jsonld ) {
+
+        foreach ( $jsonld as $key => $value ) {
+            if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
+                $jsonld['address']['@type'] = 'PostalAddress';
+                $jsonld['address'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( 'latitude' === $key || 'longitude' === $key ) {
+                $jsonld['geo']['@type'] = 'GeoCoordinates';
+                $jsonld['geo'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( 'calories' === $key ) {
+                $jsonld['nutrition']['@type'] = 'NutritionInformation';
+                $jsonld['nutrition'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+        }
+
+        return $jsonld;
+    }
 
 }

Spacing +37 added lines, -37 removed lines

@@ -42,8 +42,8 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, $property_getter );
+	public function __construct($entity_type_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter) {
+		parent::__construct($entity_type_service, $user_service, $attachment_service, $property_getter);
 		$this->schemaorg_property_service = $schemaorg_property_service;
 		$this->post_to_jsonld_converter   = $post_to_jsonld_converter;
 	}
@@ -59,28 +59,28 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.8.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array(), $relations = null) {
 
 		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
+		$post = get_post($post_id);
+		if (null === $post) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the base JSON-LD and the list of entities referenced by this entity.
-		if ( has_term( 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id ) ) {
-			$jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
+		if (has_term('article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id)) {
+			$jsonld = $this->post_to_jsonld_converter->convert($post_id, $references, $references_infos, $relations);
 		} else {
-			$jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
+			$jsonld = parent::convert($post_id, $references, $references_infos, $relations);
 		}
 
 		// Get the entity name.
-		$jsonld['name'] = html_entity_decode( $post->post_title );
+		$jsonld['name'] = html_entity_decode($post->post_title);
 
 		// 3.13.0, add alternate names.
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
+		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
+		if (0 < count($alternative_labels)) {
 			$jsonld['alternateName'] = $alternative_labels;
 		}
 
@@ -88,10 +88,10 @@ 
 		//
 		// This allows us to gather the basic properties as defined by the `Thing` entity type.
 		// Get the configured type custom fields.
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_post( $post_id );
+		$custom_fields = $this->entity_type_service->get_custom_fields_for_post($post_id);
 
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
+		if (isset($custom_fields)) {
+			$this->process_type_custom_fields($jsonld, $custom_fields, $post, $references, $references_infos);
 		}
 
 		/*
@@ -102,8 +102,8 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
-			$this->process_post_properties( $jsonld, $post_id );
+		if (apply_filters('wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES)) {
+			$this->process_post_properties($jsonld, $post_id);
 		}
 
 		/**
@@ -120,7 +120,7 @@ 
 		 *
 		 * @api
 		 */
-		$ret_val    = apply_filters(
+		$ret_val = apply_filters(
 			'wl_entity_jsonld_array',
 			array(
 				'jsonld'     => $jsonld,
@@ -142,7 +142,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
+		return apply_filters('wl_entity_jsonld', $this->post_process($jsonld), $post_id, $references);
 	}
 
 	/**
@@ -153,17 +153,17 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	private function process_post_properties( &$jsonld, $post_id ) {
+	private function process_post_properties(&$jsonld, $post_id) {
 
 		// Get all the props.
-		$props = $this->schemaorg_property_service->get_all( $post_id );
+		$props = $this->schemaorg_property_service->get_all($post_id);
 
 		// Process all the props.
-		foreach ( $props as $name => $instances ) {
+		foreach ($props as $name => $instances) {
 
 			// Get the values.
 			$values = array_map(
-				function ( $instance ) {
+				function($instance) {
 					return $instance['value'];
 				},
 				$instances
@@ -172,19 +172,19 @@ 
 			// We might receive empty values, remove them.
 			$non_empty_values = array_filter(
 				$values,
-				function ( $value ) {
-					return ! empty( $value );
+				function($value) {
+					return ! empty($value);
 				}
 			);
 
 			// Skip empty properties.
-			if ( empty( $non_empty_values ) ) {
+			if (empty($non_empty_values)) {
 				continue;
 			}
 
 			// @@todo: need to handle maybe Numbers and URLs differently.
 			// Make an array a single value when possible.
-			$jsonld[ $name ] = self::make_one( $non_empty_values );
+			$jsonld[$name] = self::make_one($non_empty_values);
 		}
 
 	}
@@ -198,25 +198,25 @@ 
 	 * @return array The array remapped.
 	 * @since 3.8.0
 	 */
-	public static function post_process( $jsonld ) {
+	public static function post_process($jsonld) {
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
+		foreach ($jsonld as $key => $value) {
+			if ('streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key) {
 				$jsonld['address']['@type'] = 'PostalAddress';
-				$jsonld['address'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['address'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 
-			if ( 'latitude' === $key || 'longitude' === $key ) {
+			if ('latitude' === $key || 'longitude' === $key) {
 				$jsonld['geo']['@type'] = 'GeoCoordinates';
-				$jsonld['geo'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['geo'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 
-			if ( 'calories' === $key ) {
+			if ('calories' === $key) {
 				$jsonld['nutrition']['@type'] = 'NutritionInformation';
-				$jsonld['nutrition'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['nutrition'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 		}
 

src/includes/class-wordlift-postid-to-jsonld-converter.php

Indentation +42 added lines, -42 removed lines

@@ -16,56 +16,56 @@
  */
 class Wordlift_Postid_To_Jsonld_Converter implements Wordlift_Post_Converter {
 
-	private $entity_post_to_jsonld_converter;
-	private $post_to_jsonld_converter;
+    private $entity_post_to_jsonld_converter;
+    private $post_to_jsonld_converter;
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * Wordlift_Entity_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
-	 * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
+    /**
+     * Wordlift_Entity_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
+     * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
 
-		$this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
-		$this->post_to_jsonld_converter        = $post_to_jsonld_converter;
+        $this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
+        $this->post_to_jsonld_converter        = $post_to_jsonld_converter;
 
-	}
+    }
 
-	/**
-	 * Convert a post to JSON-LD.
-	 *
-	 * @param string $post_id A post id (post or entity).
-	 * @param array  $references
-	 * @param array  $relations
-	 *
-	 * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
-	 * @since 3.8.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+    /**
+     * Convert a post to JSON-LD.
+     *
+     * @param string $post_id A post id (post or entity).
+     * @param array  $references
+     * @param array  $relations
+     *
+     * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
+     * @since 3.8.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
 
-		$this->log->trace( "Converting post $post_id..." );
+        $this->log->trace( "Converting post $post_id..." );
 
-		$entity_service = Wordlift_Entity_Service::get_instance();
+        $entity_service = Wordlift_Entity_Service::get_instance();
 
-		return $entity_service->is_entity( $post_id )
-			// Entity.
-			? $this->entity_post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations )
-			// Post/Page.
-			: $this->post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
-	}
+        return $entity_service->is_entity( $post_id )
+            // Entity.
+            ? $this->entity_post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations )
+            // Post/Page.
+            : $this->post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -36,9 +36,9 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
+	public function __construct($entity_post_to_jsonld_converter, $post_to_jsonld_converter) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
 		$this->post_to_jsonld_converter        = $post_to_jsonld_converter;
@@ -55,17 +55,17 @@ 
 	 * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
 	 * @since 3.8.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array(), $relations = null) {
 
-		$this->log->trace( "Converting post $post_id..." );
+		$this->log->trace("Converting post $post_id...");
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
-		return $entity_service->is_entity( $post_id )
+		return $entity_service->is_entity($post_id)
 			// Entity.
-			? $this->entity_post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations )
+			? $this->entity_post_to_jsonld_converter->convert($post_id, $references, $references_infos, $relations)
 			// Post/Page.
-			: $this->post_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
+			: $this->post_to_jsonld_converter->convert($post_id, $references, $references_infos, $relations);
 	}
 
 }

src/includes/cache/class-wordlift-cached-post-converter.php

Indentation +360 added lines, -360 removed lines

@@ -21,365 +21,365 @@
  */
 class Wordlift_Cached_Post_Converter implements Wordlift_Post_Converter {
 
-	/**
-	 * A {@link Wordlift_Post_Converter} instance.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @var \Wordlift_Post_Converter $converter A {@link Wordlift_Post_Converter} instance.
-	 */
-	private $converter;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @var Wordlift_Log_Service \$log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A list of meta keys that do not cause the cache to update.
-	 *
-	 * @since 3.17.3
-	 * @var array An array of ignored meta keys.
-	 */
-	private static $ignored_meta_keys = array(
-		'_edit_lock',
-		'_edit_last',
-		'_wp_page_template',
-		'_wp_attachment_is_custom_background',
-		'_wp_attachment_backup_sizes',
-		'_wp_attachment_is_custom_header',
-	);
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $cache;
-
-	/**
-	 * Wordlift_Cached_Post_Converter constructor.
-	 *
-	 * @param \Wordlift_Post_Converter $converter The {@link Wordlift_Post_Converter} implementation.
-	 * @param Ttl_Cache                $cache The {@link Ttl_Cache} cache instance.
-	 */
-	public function __construct( $converter, $cache ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->cache     = $cache;
-		$this->converter = $converter;
-		$this->init_hooks();
-
-	}
-
-	/**
-	 * Hooks to catch post/post meta changes in order to invalidate the cache.
-	 *
-	 * @since 3.16.0
-	 */
-	private function init_hooks() {
-
-		// Hook on post save to flush relevant cache.
-		add_action( 'save_post', array( $this, 'save_post' ) );
-
-		add_action(
-			'added_post_meta',
-			array(
-				$this,
-				'changed_post_meta',
-			),
-			10,
-			3
-		);
-		add_action(
-			'updated_post_meta',
-			array(
-				$this,
-				'changed_post_meta',
-			),
-			10,
-			3
-		);
-		add_action(
-			'deleted_post_meta',
-			array(
-				$this,
-				'changed_post_meta',
-			),
-			10,
-			3
-		);
-
-		// Flush cache when wordlift settings were updated.
-		add_action(
-			'update_option_wl_general_settings',
-			array(
-				$this,
-				'update_option_wl_general_settings',
-			)
-		);
-
-		// Flushes the cache when permalink structure is changed.
-		add_action(
-			'update_option_permalink_structure',
-			array(
-				$this,
-				'permalinks_structure_changed',
-			)
-		);
-
-		// Invalid cache on relationship change.
-		add_action( 'wl_relation_added', array( $this, 'relation_changed' ) );
-		add_action( 'wl_relation_deleted', array( $this, 'relation_changed' ) );
-
-	}
-
-	/**
-	 * Note that the `&$cache` parameter here is used only to report whether the response comes from the cache. It
-	 * used by `test-issue-626.php` and nowhere else in code.
-	 *
-	 * @inheritdoc
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null, &$cache = false ) {
-
-		// Ensure post ID is `int`. Otherwise we may have issues with caching, since caching is strict about
-		// key var types.
-		$post_id = (int) $post_id;
-
-		$this->log->trace( "Converting post $post_id..." );
-
-		// Try to get a cached result.
-		$arr = $this->get_cache( $post_id );
-
-		// Return the cached contents if any.
-		if ( false !== $arr ) {
-			$contents = $arr['jsonld'];
-
-			// Add the cached relations if any.
-			if ( is_a( $arr['relations'], 'Wordlift\Relation\Relations' ) ) {
-				$relations->add( ...$arr['relations']->toArray() );
-			}
-
-			if ( is_array( $arr['references'] ) ) {
-				$references = $arr['references'];
-			}
-
-			$this->log->debug( "Cached contents found for post $post_id." );
-
-			// Inform the caller that this is cached result.
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			$cache = true;
-			$this->add_http_header( $post_id, true );
-
-			// Return the contents.
-			return $contents;
-		}
-
-		// Set cached to false.
-		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		$cache = false;
-		$this->add_http_header( $post_id, false );
-
-		// Convert the post.
-		$jsonld = $this->converter->convert( $post_id, $references, $references_infos, $relations );
-
-		/**
-		 * @since 3.32.0
-		 * We cant apply json_encode on the objects {@link \Wordlift\Jsonld\Reference}, so we decode
-		 * it here before saving it on cache.
-		 */
-		// Cache the results.
-		$this->set_cache( $post_id, $references, $jsonld, $relations );
-
-		// Finally return the JSON-LD.
-		return $jsonld;
-	}
-
-	/**
-	 * Try to get the cached contents.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 * @param array $references The referenced posts.
-	 *
-	 * @return mixed|bool The cached contents or false if the cached isn't found.
-	 * @since 3.16.0
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	private function get_cache( $post_id ) {
-
-		// Ensure post ID is int, because cache is strict about var types.
-		$post_id = (int) $post_id;
-
-		$this->log->trace( "Getting cached contents for post $post_id..." );
-
-		// Get the cache.
-		$modified_date_time = get_post_datetime( $post_id, 'modified', 'gmt' );
-		$contents           = $this->cache->get( $post_id, $modified_date_time ? $modified_date_time->getTimestamp() : 0 );
-
-		// Bail out if we don't have cached contents or the cached contents are
-		// invalid.
-		if ( null === $contents || ! isset( $contents['jsonld'] ) || ! isset( $contents['references'] ) || ! isset( $contents['relations'] ) ) {
-			$this->log->debug( "Cached contents for post $post_id not found." );
-
-			return false;
-		}
-
-		return $contents['jsonld']
-			? array(
-				'jsonld'     => $contents['jsonld'],
-				'relations'  => Relations::from_json( $contents['relations'] ),
-				'references' => $contents['references'],
-			)
-			: false;
-	}
-
-	/**
-	 * Set the cache with the provided results.
-	 *
-	 * The function will prepare the provided results and will ask the {@link Ttl_Cache} to cache them.
-	 *
-	 * @param int   $post_id The {@link WP_Post} id.
-	 * @param array $references An array of references.
-	 * @param array $jsonld A JSON-LD structure.
-	 *
-	 * @since 3.16.0
-	 */
-	private function set_cache( $post_id, $references, $jsonld, $relations ) {
-
-		$this->log->trace( "Caching result for post $post_id..." );
-
-		$this->cache->put(
-			$post_id,
-			array(
-				// @@todo check the `references`.
-				'references' => $references,
-				'jsonld'     => $jsonld,
-				'relations'  => $relations,
-			)
-		);
-
-	}
-
-	/**
-	 * Hook to 'save_post', will invalidate the cache for that post.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @since 3.16.0
-	 */
-	public function save_post( $post_id ) {
-
-		$this->log->trace( "Post $post_id saved, invalidating cache..." );
-
-		$this->cache->delete( $post_id );
-
-		$this->flush_cache_if_publisher( $post_id );
-
-	}
-
-	/**
-	 * Hook to meta changed for a {@link WP_Post}, will cause the cause to
-	 * invalidate.
-	 *
-	 * @param int    $id The {@link WP_Post} meta id.
-	 * @param int    $post_id The {@link WP_Post} id.
-	 * @param string $meta_key The meta key.
-	 *
-	 * @since 3.16.0
-	 */
-	public function changed_post_meta( $id, $post_id, $meta_key ) {
-
-		if ( in_array( $meta_key, self::$ignored_meta_keys, true ) ) {
-			$this->log->trace( "Post $post_id meta $meta_key ignored." );
-
-			return;
-		}
-
-		$this->log->trace( "Post $post_id meta $meta_key changed, invalidating cache..." );
-
-		// Delete the single cache file.
-		$this->cache->delete( $post_id );
-
-		// Flush the cache if it's the publisher.
-		$this->flush_cache_if_publisher( $post_id );
-
-	}
-
-	/**
-	 * Hook to WordLift's options changes, will flush the cache.
-	 *
-	 * @since 3.16.0
-	 */
-	public function update_option_wl_general_settings() {
-		$this->log->trace( 'WordLift options changed, flushing cache...' );
-
-		$this->cache->flush();
-	}
-
-	/**
-	 * Hook when permalinks are changed, will flush the cache.
-	 *
-	 * @since 3.17.0
-	 */
-	public function permalinks_structure_changed() {
-		$this->log->trace( 'Permalinks structure changed, flushing cache...' );
-
-		$this->cache->flush();
-	}
-
-	/**
-	 * Hook to WordLift's post/entity relation changes, will invalidate the cache.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @since 3.16.0
-	 */
-	public function relation_changed( $post_id ) {
-		$this->log->trace( "Post $post_id relations changed, invalidating cache..." );
-
-		$this->cache->delete( $post_id );
-	}
-
-	/**
-	 * When in Ajax, prints an http header with the information whether the
-	 * response is cached or not.
-	 *
-	 * @param int  $post_id The {@link WP_Post} id.
-	 * @param bool $cache Whether the response fragment is cached.
-	 *
-	 * @since 3.16.0
-	 */
-	private function add_http_header( $post_id, $cache ) {
-
-		if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || headers_sent() ) {
-			return;
-		}
-
-		header( "X-WordLift-JsonLd-Cache-$post_id: " . ( $cache ? 'HIT' : 'MISS' ) );
-
-	}
-
-	/**
-	 * Call the `flush` operation on the {@link Ttl_Cache} if
-	 * the publisher has changed.
-	 *
-	 * @param int $post_id The changed {@link WP_Post}'s id.
-	 *
-	 * @since 3.16.0
-	 */
-	private function flush_cache_if_publisher( $post_id ) {
-
-		// Bail out if it's not the publisher.
-		if ( Wordlift_Configuration_Service::get_instance()->get_publisher_id() !== $post_id ) {
-			return;
-		}
-
-		// Flush the cache, since the publisher has changed.
-		$this->cache->flush();
-
-	}
+    /**
+     * A {@link Wordlift_Post_Converter} instance.
+     *
+     * @since 3.16.0
+     *
+     * @var \Wordlift_Post_Converter $converter A {@link Wordlift_Post_Converter} instance.
+     */
+    private $converter;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.16.0
+     *
+     * @var Wordlift_Log_Service \$log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A list of meta keys that do not cause the cache to update.
+     *
+     * @since 3.17.3
+     * @var array An array of ignored meta keys.
+     */
+    private static $ignored_meta_keys = array(
+        '_edit_lock',
+        '_edit_last',
+        '_wp_page_template',
+        '_wp_attachment_is_custom_background',
+        '_wp_attachment_backup_sizes',
+        '_wp_attachment_is_custom_header',
+    );
+    /**
+     * @var Ttl_Cache
+     */
+    private $cache;
+
+    /**
+     * Wordlift_Cached_Post_Converter constructor.
+     *
+     * @param \Wordlift_Post_Converter $converter The {@link Wordlift_Post_Converter} implementation.
+     * @param Ttl_Cache                $cache The {@link Ttl_Cache} cache instance.
+     */
+    public function __construct( $converter, $cache ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->cache     = $cache;
+        $this->converter = $converter;
+        $this->init_hooks();
+
+    }
+
+    /**
+     * Hooks to catch post/post meta changes in order to invalidate the cache.
+     *
+     * @since 3.16.0
+     */
+    private function init_hooks() {
+
+        // Hook on post save to flush relevant cache.
+        add_action( 'save_post', array( $this, 'save_post' ) );
+
+        add_action(
+            'added_post_meta',
+            array(
+                $this,
+                'changed_post_meta',
+            ),
+            10,
+            3
+        );
+        add_action(
+            'updated_post_meta',
+            array(
+                $this,
+                'changed_post_meta',
+            ),
+            10,
+            3
+        );
+        add_action(
+            'deleted_post_meta',
+            array(
+                $this,
+                'changed_post_meta',
+            ),
+            10,
+            3
+        );
+
+        // Flush cache when wordlift settings were updated.
+        add_action(
+            'update_option_wl_general_settings',
+            array(
+                $this,
+                'update_option_wl_general_settings',
+            )
+        );
+
+        // Flushes the cache when permalink structure is changed.
+        add_action(
+            'update_option_permalink_structure',
+            array(
+                $this,
+                'permalinks_structure_changed',
+            )
+        );
+
+        // Invalid cache on relationship change.
+        add_action( 'wl_relation_added', array( $this, 'relation_changed' ) );
+        add_action( 'wl_relation_deleted', array( $this, 'relation_changed' ) );
+
+    }
+
+    /**
+     * Note that the `&$cache` parameter here is used only to report whether the response comes from the cache. It
+     * used by `test-issue-626.php` and nowhere else in code.
+     *
+     * @inheritdoc
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null, &$cache = false ) {
+
+        // Ensure post ID is `int`. Otherwise we may have issues with caching, since caching is strict about
+        // key var types.
+        $post_id = (int) $post_id;
+
+        $this->log->trace( "Converting post $post_id..." );
+
+        // Try to get a cached result.
+        $arr = $this->get_cache( $post_id );
+
+        // Return the cached contents if any.
+        if ( false !== $arr ) {
+            $contents = $arr['jsonld'];
+
+            // Add the cached relations if any.
+            if ( is_a( $arr['relations'], 'Wordlift\Relation\Relations' ) ) {
+                $relations->add( ...$arr['relations']->toArray() );
+            }
+
+            if ( is_array( $arr['references'] ) ) {
+                $references = $arr['references'];
+            }
+
+            $this->log->debug( "Cached contents found for post $post_id." );
+
+            // Inform the caller that this is cached result.
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+            $cache = true;
+            $this->add_http_header( $post_id, true );
+
+            // Return the contents.
+            return $contents;
+        }
+
+        // Set cached to false.
+        // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+        $cache = false;
+        $this->add_http_header( $post_id, false );
+
+        // Convert the post.
+        $jsonld = $this->converter->convert( $post_id, $references, $references_infos, $relations );
+
+        /**
+         * @since 3.32.0
+         * We cant apply json_encode on the objects {@link \Wordlift\Jsonld\Reference}, so we decode
+         * it here before saving it on cache.
+         */
+        // Cache the results.
+        $this->set_cache( $post_id, $references, $jsonld, $relations );
+
+        // Finally return the JSON-LD.
+        return $jsonld;
+    }
+
+    /**
+     * Try to get the cached contents.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     * @param array $references The referenced posts.
+     *
+     * @return mixed|bool The cached contents or false if the cached isn't found.
+     * @since 3.16.0
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    private function get_cache( $post_id ) {
+
+        // Ensure post ID is int, because cache is strict about var types.
+        $post_id = (int) $post_id;
+
+        $this->log->trace( "Getting cached contents for post $post_id..." );
+
+        // Get the cache.
+        $modified_date_time = get_post_datetime( $post_id, 'modified', 'gmt' );
+        $contents           = $this->cache->get( $post_id, $modified_date_time ? $modified_date_time->getTimestamp() : 0 );
+
+        // Bail out if we don't have cached contents or the cached contents are
+        // invalid.
+        if ( null === $contents || ! isset( $contents['jsonld'] ) || ! isset( $contents['references'] ) || ! isset( $contents['relations'] ) ) {
+            $this->log->debug( "Cached contents for post $post_id not found." );
+
+            return false;
+        }
+
+        return $contents['jsonld']
+            ? array(
+                'jsonld'     => $contents['jsonld'],
+                'relations'  => Relations::from_json( $contents['relations'] ),
+                'references' => $contents['references'],
+            )
+            : false;
+    }
+
+    /**
+     * Set the cache with the provided results.
+     *
+     * The function will prepare the provided results and will ask the {@link Ttl_Cache} to cache them.
+     *
+     * @param int   $post_id The {@link WP_Post} id.
+     * @param array $references An array of references.
+     * @param array $jsonld A JSON-LD structure.
+     *
+     * @since 3.16.0
+     */
+    private function set_cache( $post_id, $references, $jsonld, $relations ) {
+
+        $this->log->trace( "Caching result for post $post_id..." );
+
+        $this->cache->put(
+            $post_id,
+            array(
+                // @@todo check the `references`.
+                'references' => $references,
+                'jsonld'     => $jsonld,
+                'relations'  => $relations,
+            )
+        );
+
+    }
+
+    /**
+     * Hook to 'save_post', will invalidate the cache for that post.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @since 3.16.0
+     */
+    public function save_post( $post_id ) {
+
+        $this->log->trace( "Post $post_id saved, invalidating cache..." );
+
+        $this->cache->delete( $post_id );
+
+        $this->flush_cache_if_publisher( $post_id );
+
+    }
+
+    /**
+     * Hook to meta changed for a {@link WP_Post}, will cause the cause to
+     * invalidate.
+     *
+     * @param int    $id The {@link WP_Post} meta id.
+     * @param int    $post_id The {@link WP_Post} id.
+     * @param string $meta_key The meta key.
+     *
+     * @since 3.16.0
+     */
+    public function changed_post_meta( $id, $post_id, $meta_key ) {
+
+        if ( in_array( $meta_key, self::$ignored_meta_keys, true ) ) {
+            $this->log->trace( "Post $post_id meta $meta_key ignored." );
+
+            return;
+        }
+
+        $this->log->trace( "Post $post_id meta $meta_key changed, invalidating cache..." );
+
+        // Delete the single cache file.
+        $this->cache->delete( $post_id );
+
+        // Flush the cache if it's the publisher.
+        $this->flush_cache_if_publisher( $post_id );
+
+    }
+
+    /**
+     * Hook to WordLift's options changes, will flush the cache.
+     *
+     * @since 3.16.0
+     */
+    public function update_option_wl_general_settings() {
+        $this->log->trace( 'WordLift options changed, flushing cache...' );
+
+        $this->cache->flush();
+    }
+
+    /**
+     * Hook when permalinks are changed, will flush the cache.
+     *
+     * @since 3.17.0
+     */
+    public function permalinks_structure_changed() {
+        $this->log->trace( 'Permalinks structure changed, flushing cache...' );
+
+        $this->cache->flush();
+    }
+
+    /**
+     * Hook to WordLift's post/entity relation changes, will invalidate the cache.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @since 3.16.0
+     */
+    public function relation_changed( $post_id ) {
+        $this->log->trace( "Post $post_id relations changed, invalidating cache..." );
+
+        $this->cache->delete( $post_id );
+    }
+
+    /**
+     * When in Ajax, prints an http header with the information whether the
+     * response is cached or not.
+     *
+     * @param int  $post_id The {@link WP_Post} id.
+     * @param bool $cache Whether the response fragment is cached.
+     *
+     * @since 3.16.0
+     */
+    private function add_http_header( $post_id, $cache ) {
+
+        if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || headers_sent() ) {
+            return;
+        }
+
+        header( "X-WordLift-JsonLd-Cache-$post_id: " . ( $cache ? 'HIT' : 'MISS' ) );
+
+    }
+
+    /**
+     * Call the `flush` operation on the {@link Ttl_Cache} if
+     * the publisher has changed.
+     *
+     * @param int $post_id The changed {@link WP_Post}'s id.
+     *
+     * @since 3.16.0
+     */
+    private function flush_cache_if_publisher( $post_id ) {
+
+        // Bail out if it's not the publisher.
+        if ( Wordlift_Configuration_Service::get_instance()->get_publisher_id() !== $post_id ) {
+            return;
+        }
+
+        // Flush the cache, since the publisher has changed.
+        $this->cache->flush();
+
+    }
 
 }

Spacing +46 added lines, -46 removed lines

@@ -64,9 +64,9 @@ 
 	 * @param \Wordlift_Post_Converter $converter The {@link Wordlift_Post_Converter} implementation.
 	 * @param Ttl_Cache                $cache The {@link Ttl_Cache} cache instance.
 	 */
-	public function __construct( $converter, $cache ) {
+	public function __construct($converter, $cache) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->cache     = $cache;
 		$this->converter = $converter;
@@ -82,7 +82,7 @@ 
 	private function init_hooks() {
 
 		// Hook on post save to flush relevant cache.
-		add_action( 'save_post', array( $this, 'save_post' ) );
+		add_action('save_post', array($this, 'save_post'));
 
 		add_action(
 			'added_post_meta',
@@ -131,8 +131,8 @@ 
 		);
 
 		// Invalid cache on relationship change.
-		add_action( 'wl_relation_added', array( $this, 'relation_changed' ) );
-		add_action( 'wl_relation_deleted', array( $this, 'relation_changed' ) );
+		add_action('wl_relation_added', array($this, 'relation_changed'));
+		add_action('wl_relation_deleted', array($this, 'relation_changed'));
 
 	}
 
@@ -143,36 +143,36 @@ 
 	 * @inheritdoc
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null, &$cache = false ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array(), $relations = null, &$cache = false) {
 
 		// Ensure post ID is `int`. Otherwise we may have issues with caching, since caching is strict about
 		// key var types.
 		$post_id = (int) $post_id;
 
-		$this->log->trace( "Converting post $post_id..." );
+		$this->log->trace("Converting post $post_id...");
 
 		// Try to get a cached result.
-		$arr = $this->get_cache( $post_id );
+		$arr = $this->get_cache($post_id);
 
 		// Return the cached contents if any.
-		if ( false !== $arr ) {
+		if (false !== $arr) {
 			$contents = $arr['jsonld'];
 
 			// Add the cached relations if any.
-			if ( is_a( $arr['relations'], 'Wordlift\Relation\Relations' ) ) {
-				$relations->add( ...$arr['relations']->toArray() );
+			if (is_a($arr['relations'], 'Wordlift\Relation\Relations')) {
+				$relations->add(...$arr['relations']->toArray());
 			}
 
-			if ( is_array( $arr['references'] ) ) {
+			if (is_array($arr['references'])) {
 				$references = $arr['references'];
 			}
 
-			$this->log->debug( "Cached contents found for post $post_id." );
+			$this->log->debug("Cached contents found for post $post_id.");
 
 			// Inform the caller that this is cached result.
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 			$cache = true;
-			$this->add_http_header( $post_id, true );
+			$this->add_http_header($post_id, true);
 
 			// Return the contents.
 			return $contents;
@@ -181,10 +181,10 @@ 
 		// Set cached to false.
 		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 		$cache = false;
-		$this->add_http_header( $post_id, false );
+		$this->add_http_header($post_id, false);
 
 		// Convert the post.
-		$jsonld = $this->converter->convert( $post_id, $references, $references_infos, $relations );
+		$jsonld = $this->converter->convert($post_id, $references, $references_infos, $relations);
 
 		/**
 		 * @since 3.32.0
@@ -192,7 +192,7 @@ 
 		 * it here before saving it on cache.
 		 */
 		// Cache the results.
-		$this->set_cache( $post_id, $references, $jsonld, $relations );
+		$this->set_cache($post_id, $references, $jsonld, $relations);
 
 		// Finally return the JSON-LD.
 		return $jsonld;
@@ -208,21 +208,21 @@ 
 	 * @since 3.16.0
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	private function get_cache( $post_id ) {
+	private function get_cache($post_id) {
 
 		// Ensure post ID is int, because cache is strict about var types.
 		$post_id = (int) $post_id;
 
-		$this->log->trace( "Getting cached contents for post $post_id..." );
+		$this->log->trace("Getting cached contents for post $post_id...");
 
 		// Get the cache.
-		$modified_date_time = get_post_datetime( $post_id, 'modified', 'gmt' );
-		$contents           = $this->cache->get( $post_id, $modified_date_time ? $modified_date_time->getTimestamp() : 0 );
+		$modified_date_time = get_post_datetime($post_id, 'modified', 'gmt');
+		$contents           = $this->cache->get($post_id, $modified_date_time ? $modified_date_time->getTimestamp() : 0);
 
 		// Bail out if we don't have cached contents or the cached contents are
 		// invalid.
-		if ( null === $contents || ! isset( $contents['jsonld'] ) || ! isset( $contents['references'] ) || ! isset( $contents['relations'] ) ) {
-			$this->log->debug( "Cached contents for post $post_id not found." );
+		if (null === $contents || ! isset($contents['jsonld']) || ! isset($contents['references']) || ! isset($contents['relations'])) {
+			$this->log->debug("Cached contents for post $post_id not found.");
 
 			return false;
 		}
@@ -230,7 +230,7 @@ 
 		return $contents['jsonld']
 			? array(
 				'jsonld'     => $contents['jsonld'],
-				'relations'  => Relations::from_json( $contents['relations'] ),
+				'relations'  => Relations::from_json($contents['relations']),
 				'references' => $contents['references'],
 			)
 			: false;
@@ -247,9 +247,9 @@ 
 	 *
 	 * @since 3.16.0
 	 */
-	private function set_cache( $post_id, $references, $jsonld, $relations ) {
+	private function set_cache($post_id, $references, $jsonld, $relations) {
 
-		$this->log->trace( "Caching result for post $post_id..." );
+		$this->log->trace("Caching result for post $post_id...");
 
 		$this->cache->put(
 			$post_id,
@@ -270,13 +270,13 @@ 
 	 *
 	 * @since 3.16.0
 	 */
-	public function save_post( $post_id ) {
+	public function save_post($post_id) {
 
-		$this->log->trace( "Post $post_id saved, invalidating cache..." );
+		$this->log->trace("Post $post_id saved, invalidating cache...");
 
-		$this->cache->delete( $post_id );
+		$this->cache->delete($post_id);
 
-		$this->flush_cache_if_publisher( $post_id );
+		$this->flush_cache_if_publisher($post_id);
 
 	}
 
@@ -290,21 +290,21 @@ 
 	 *
 	 * @since 3.16.0
 	 */
-	public function changed_post_meta( $id, $post_id, $meta_key ) {
+	public function changed_post_meta($id, $post_id, $meta_key) {
 
-		if ( in_array( $meta_key, self::$ignored_meta_keys, true ) ) {
-			$this->log->trace( "Post $post_id meta $meta_key ignored." );
+		if (in_array($meta_key, self::$ignored_meta_keys, true)) {
+			$this->log->trace("Post $post_id meta $meta_key ignored.");
 
 			return;
 		}
 
-		$this->log->trace( "Post $post_id meta $meta_key changed, invalidating cache..." );
+		$this->log->trace("Post $post_id meta $meta_key changed, invalidating cache...");
 
 		// Delete the single cache file.
-		$this->cache->delete( $post_id );
+		$this->cache->delete($post_id);
 
 		// Flush the cache if it's the publisher.
-		$this->flush_cache_if_publisher( $post_id );
+		$this->flush_cache_if_publisher($post_id);
 
 	}
 
@@ -314,7 +314,7 @@ 
 	 * @since 3.16.0
 	 */
 	public function update_option_wl_general_settings() {
-		$this->log->trace( 'WordLift options changed, flushing cache...' );
+		$this->log->trace('WordLift options changed, flushing cache...');
 
 		$this->cache->flush();
 	}
@@ -325,7 +325,7 @@ 
 	 * @since 3.17.0
 	 */
 	public function permalinks_structure_changed() {
-		$this->log->trace( 'Permalinks structure changed, flushing cache...' );
+		$this->log->trace('Permalinks structure changed, flushing cache...');
 
 		$this->cache->flush();
 	}
@@ -337,10 +337,10 @@ 
 	 *
 	 * @since 3.16.0
 	 */
-	public function relation_changed( $post_id ) {
-		$this->log->trace( "Post $post_id relations changed, invalidating cache..." );
+	public function relation_changed($post_id) {
+		$this->log->trace("Post $post_id relations changed, invalidating cache...");
 
-		$this->cache->delete( $post_id );
+		$this->cache->delete($post_id);
 	}
 
 	/**
@@ -352,13 +352,13 @@ 
 	 *
 	 * @since 3.16.0
 	 */
-	private function add_http_header( $post_id, $cache ) {
+	private function add_http_header($post_id, $cache) {
 
-		if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || headers_sent() ) {
+		if ( ! defined('DOING_AJAX') || ! DOING_AJAX || headers_sent()) {
 			return;
 		}
 
-		header( "X-WordLift-JsonLd-Cache-$post_id: " . ( $cache ? 'HIT' : 'MISS' ) );
+		header("X-WordLift-JsonLd-Cache-$post_id: ".($cache ? 'HIT' : 'MISS'));
 
 	}
 
@@ -370,10 +370,10 @@ 
 	 *
 	 * @since 3.16.0
 	 */
-	private function flush_cache_if_publisher( $post_id ) {
+	private function flush_cache_if_publisher($post_id) {
 
 		// Bail out if it's not the publisher.
-		if ( Wordlift_Configuration_Service::get_instance()->get_publisher_id() !== $post_id ) {
+		if (Wordlift_Configuration_Service::get_instance()->get_publisher_id() !== $post_id) {
 			return;
 		}
 

src/includes/class-wordlift-post-adapter.php

Indentation +219 added lines, -219 removed lines

@@ -19,229 +19,229 @@
  */
 class Wordlift_Post_Adapter {
 
-	/**
-	 * The post id to which the adopter relates.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @var integer $post_id .
-	 */
-	private $post_id;
-
-	const TYPE_ENTITY_LINK = 0;
-	const TYPE_TERM_LINK   = 1;
-
-	/**
-	 * Create the {@link Wordlift_Post_Adatpter} instance.
-	 *
-	 * @param integer $post_id the post ID of the post the adopter relates to.
-	 *
-	 * @since 3.14.0
-	 */
-	public function __construct( $post_id ) {
-
-		$this->post_id = $post_id;
-
-	}
-
-	/**
-	 * Get the word count of the post content.
-	 *
-	 * The count is calculated over the post content after stripping shortcodes and html tags.
-	 *
-	 * @return integer the number of words in the content after stripping shortcodes and html tags..
-	 * @since 3.14.0
-	 */
-	public function word_count() {
-
-		$post = get_post( $this->post_id );
-
-		/*
+    /**
+     * The post id to which the adopter relates.
+     *
+     * @since 3.14.0
+     *
+     * @var integer $post_id .
+     */
+    private $post_id;
+
+    const TYPE_ENTITY_LINK = 0;
+    const TYPE_TERM_LINK   = 1;
+
+    /**
+     * Create the {@link Wordlift_Post_Adatpter} instance.
+     *
+     * @param integer $post_id the post ID of the post the adopter relates to.
+     *
+     * @since 3.14.0
+     */
+    public function __construct( $post_id ) {
+
+        $this->post_id = $post_id;
+
+    }
+
+    /**
+     * Get the word count of the post content.
+     *
+     * The count is calculated over the post content after stripping shortcodes and html tags.
+     *
+     * @return integer the number of words in the content after stripping shortcodes and html tags..
+     * @since 3.14.0
+     */
+    public function word_count() {
+
+        $post = get_post( $this->post_id );
+
+        /*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
 		 * because the content is written elsewhere.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-
-		return self::str_word_count_utf8( wp_strip_all_tags( strip_shortcodes( $post_content ) ) );
-	}
-
-	/**
-	 * Count words in the string, taking into account UTF-8 characters.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/884
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $str The target string.
-	 *
-	 * @return int The number of words.
-	 */
-	private static function str_word_count_utf8( $str ) {
-
-		$words = preg_split( '~[^\p{L}\p{N}\']+~u', $str );
-
-		return $words ? count( $words ) : 0;
-	}
-
-	/**
-	 * Get the {@link WP_Post} permalink allowing 3rd parties to alter the URL.
-	 *
-	 * @param int $post_id Post ID.
-	 *
-	 * @return string The post permalink.
-	 * @since 3.20.0
-	 */
-	public static function get_production_permalink( $post_id, $object_type = Object_Type_Enum::POST ) {
-
-		$object_link_service = Object_Link_Provider::get_instance();
-		$permalink           = $object_link_service->get_permalink( $post_id, $object_type );
-
-		/**
-		 * WordPress 4.4 doesn't support meta queries for terms, therefore we only support post permalinks here.
-		 *
-		 * Later on for WordPress 4.5+ we look for terms bound to the entity and we use the term link instead of the
-		 * post permalink if we find them.
-		 */
-		global $wp_version;
-		if ( version_compare( $wp_version, '4.5', '<' ) ) {
-			return apply_filters( 'wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null );
-		}
-
-		/**
-		 * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
-		 * when the production environment is copied over from a staging environment with staging
-		 * URLs.
-		 *
-		 * @param string $permalink_url The default permalink.
-		 * @param int $post_id The post id.
-		 *
-		 * @since 3.23.0 we check whether the entity is bound to a term and, in that case, we link to the term.
-		 * @since 3.20.0
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/850
-		 */
-
-		$uris = $object_link_service->get_same_as_uris(
-			$post_id,
-			$object_type
-		);
-
-		// Only try to link a term if `WL_ENABLE_TERM_LINKING` is enabled.
-		$terms = array();
-		if ( defined( 'WL_ENABLE_TERM_LINKING' ) && WL_ENABLE_TERM_LINKING ) {
-			// Try to find one term matching the entity.
-			$terms = get_terms(
-				array(
-					'number'                 => 1,
-					'hide_empty'             => false,
-					'update_term_meta_cache' => false,
-					'meta_key'               => '_wl_entity_id',
-					'meta_value'             => $uris,
-					'meta_compare'           => 'IN',
-				)
-			);
-		}
-
-		$type = self::TYPE_ENTITY_LINK;
-		$term = null;
-		// If found use the term link, otherwise the permalink.
-		if ( 1 === count( $terms ) ) {
-			$term      = current( $terms );
-			$permalink = get_term_link( $term );
-			$type      = self::TYPE_TERM_LINK;
-		}
-
-		/**
-		 * Apply the `wl_production_permalink` filter.
-		 *
-		 * @param string $permalink The permalink.
-		 * @param int $post_id The post id.
-		 * @param int $type The permalink type: 0 = entity permalink, 1 = term link.
-		 * @param WP_Term $term The term if type is term link, otherwise null.
-		 *
-		 * @since 3.23.0 add the permalink type and term parameters.
-		 */
-		return apply_filters( 'wl_production_permalink', $permalink, $post_id, $type, $term );
-	}
-
-	/**
-	 * Get comma separated tags to be used as keywords
-	 *
-	 * @return string|void Comma separated tags
-	 *
-	 * @since 3.27.2
-	 */
-	public function keywords() {
-		$tags = get_the_tags( $this->post_id );
-
-		if ( empty( $tags ) ) {
-			return;
-		}
-
-		return implode(
-			',',
-			array_map(
-				function ( $tag ) {
-					return $tag->name;
-				},
-				$tags
-			)
-		);
-	}
-
-	/**
-	 * Get comma separated categories to be used as article section
-	 *
-	 * @return string[] Comma separated categories
-	 *
-	 * @since 3.27.2
-	 */
-	public function article_section() {
-		$categories = get_the_category( $this->post_id );
-
-		return wp_list_pluck( $categories, 'cat_name' );
-	}
-
-	/**
-	 * Get comment count
-	 *
-	 * @return string|void Comment count
-	 *
-	 * @since 3.27.2
-	 */
-	public function comment_count() {
-		return get_comments_number( $this->post_id );
-	}
-
-	/**
-	 * Get Language
-	 * Try WPML, Polylang for post specific languages, else fallback on get_locale()
-	 *
-	 * @return string|void Language code (locale)
-	 *
-	 * @since 3.27.2
-	 */
-	public function locale() {
-		$language = 'en-US';
-
-		if ( function_exists( 'wpml_get_language_information' ) ) {
-			// WPML handling
-			// WPML: Updated function signature.
-			// function wpml_get_language_information( $empty_value = null, $post_id = null )
-			$post_language = wpml_get_language_information( null, $this->post_id );
-			if ( ! $post_language instanceof WP_Error ) {
-				$language = $post_language['locale'];
-			}
-		} elseif ( function_exists( 'pll_get_post_language' ) ) {
-			// Polylang handling
-			$language = pll_get_post_language( $this->post_id, 'locale' );
-		} else {
-			$language = get_locale();
-		}
-
-		return str_replace( '_', '-', $language );
-	}
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+
+        return self::str_word_count_utf8( wp_strip_all_tags( strip_shortcodes( $post_content ) ) );
+    }
+
+    /**
+     * Count words in the string, taking into account UTF-8 characters.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/884
+     *
+     * @since 3.20.0
+     *
+     * @param string $str The target string.
+     *
+     * @return int The number of words.
+     */
+    private static function str_word_count_utf8( $str ) {
+
+        $words = preg_split( '~[^\p{L}\p{N}\']+~u', $str );
+
+        return $words ? count( $words ) : 0;
+    }
+
+    /**
+     * Get the {@link WP_Post} permalink allowing 3rd parties to alter the URL.
+     *
+     * @param int $post_id Post ID.
+     *
+     * @return string The post permalink.
+     * @since 3.20.0
+     */
+    public static function get_production_permalink( $post_id, $object_type = Object_Type_Enum::POST ) {
+
+        $object_link_service = Object_Link_Provider::get_instance();
+        $permalink           = $object_link_service->get_permalink( $post_id, $object_type );
+
+        /**
+         * WordPress 4.4 doesn't support meta queries for terms, therefore we only support post permalinks here.
+         *
+         * Later on for WordPress 4.5+ we look for terms bound to the entity and we use the term link instead of the
+         * post permalink if we find them.
+         */
+        global $wp_version;
+        if ( version_compare( $wp_version, '4.5', '<' ) ) {
+            return apply_filters( 'wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null );
+        }
+
+        /**
+         * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
+         * when the production environment is copied over from a staging environment with staging
+         * URLs.
+         *
+         * @param string $permalink_url The default permalink.
+         * @param int $post_id The post id.
+         *
+         * @since 3.23.0 we check whether the entity is bound to a term and, in that case, we link to the term.
+         * @since 3.20.0
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/850
+         */
+
+        $uris = $object_link_service->get_same_as_uris(
+            $post_id,
+            $object_type
+        );
+
+        // Only try to link a term if `WL_ENABLE_TERM_LINKING` is enabled.
+        $terms = array();
+        if ( defined( 'WL_ENABLE_TERM_LINKING' ) && WL_ENABLE_TERM_LINKING ) {
+            // Try to find one term matching the entity.
+            $terms = get_terms(
+                array(
+                    'number'                 => 1,
+                    'hide_empty'             => false,
+                    'update_term_meta_cache' => false,
+                    'meta_key'               => '_wl_entity_id',
+                    'meta_value'             => $uris,
+                    'meta_compare'           => 'IN',
+                )
+            );
+        }
+
+        $type = self::TYPE_ENTITY_LINK;
+        $term = null;
+        // If found use the term link, otherwise the permalink.
+        if ( 1 === count( $terms ) ) {
+            $term      = current( $terms );
+            $permalink = get_term_link( $term );
+            $type      = self::TYPE_TERM_LINK;
+        }
+
+        /**
+         * Apply the `wl_production_permalink` filter.
+         *
+         * @param string $permalink The permalink.
+         * @param int $post_id The post id.
+         * @param int $type The permalink type: 0 = entity permalink, 1 = term link.
+         * @param WP_Term $term The term if type is term link, otherwise null.
+         *
+         * @since 3.23.0 add the permalink type and term parameters.
+         */
+        return apply_filters( 'wl_production_permalink', $permalink, $post_id, $type, $term );
+    }
+
+    /**
+     * Get comma separated tags to be used as keywords
+     *
+     * @return string|void Comma separated tags
+     *
+     * @since 3.27.2
+     */
+    public function keywords() {
+        $tags = get_the_tags( $this->post_id );
+
+        if ( empty( $tags ) ) {
+            return;
+        }
+
+        return implode(
+            ',',
+            array_map(
+                function ( $tag ) {
+                    return $tag->name;
+                },
+                $tags
+            )
+        );
+    }
+
+    /**
+     * Get comma separated categories to be used as article section
+     *
+     * @return string[] Comma separated categories
+     *
+     * @since 3.27.2
+     */
+    public function article_section() {
+        $categories = get_the_category( $this->post_id );
+
+        return wp_list_pluck( $categories, 'cat_name' );
+    }
+
+    /**
+     * Get comment count
+     *
+     * @return string|void Comment count
+     *
+     * @since 3.27.2
+     */
+    public function comment_count() {
+        return get_comments_number( $this->post_id );
+    }
+
+    /**
+     * Get Language
+     * Try WPML, Polylang for post specific languages, else fallback on get_locale()
+     *
+     * @return string|void Language code (locale)
+     *
+     * @since 3.27.2
+     */
+    public function locale() {
+        $language = 'en-US';
+
+        if ( function_exists( 'wpml_get_language_information' ) ) {
+            // WPML handling
+            // WPML: Updated function signature.
+            // function wpml_get_language_information( $empty_value = null, $post_id = null )
+            $post_language = wpml_get_language_information( null, $this->post_id );
+            if ( ! $post_language instanceof WP_Error ) {
+                $language = $post_language['locale'];
+            }
+        } elseif ( function_exists( 'pll_get_post_language' ) ) {
+            // Polylang handling
+            $language = pll_get_post_language( $this->post_id, 'locale' );
+        } else {
+            $language = get_locale();
+        }
+
+        return str_replace( '_', '-', $language );
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function __construct( $post_id ) {
+	public function __construct($post_id) {
 
 		$this->post_id = $post_id;
 
@@ -54,7 +54,7 @@ 
 	 */
 	public function word_count() {
 
-		$post = get_post( $this->post_id );
+		$post = get_post($this->post_id);
 
 		/*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
@@ -62,9 +62,9 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
 
-		return self::str_word_count_utf8( wp_strip_all_tags( strip_shortcodes( $post_content ) ) );
+		return self::str_word_count_utf8(wp_strip_all_tags(strip_shortcodes($post_content)));
 	}
 
 	/**
@@ -78,11 +78,11 @@ 
 	 *
 	 * @return int The number of words.
 	 */
-	private static function str_word_count_utf8( $str ) {
+	private static function str_word_count_utf8($str) {
 
-		$words = preg_split( '~[^\p{L}\p{N}\']+~u', $str );
+		$words = preg_split('~[^\p{L}\p{N}\']+~u', $str);
 
-		return $words ? count( $words ) : 0;
+		return $words ? count($words) : 0;
 	}
 
 	/**
@@ -93,10 +93,10 @@ 
 	 * @return string The post permalink.
 	 * @since 3.20.0
 	 */
-	public static function get_production_permalink( $post_id, $object_type = Object_Type_Enum::POST ) {
+	public static function get_production_permalink($post_id, $object_type = Object_Type_Enum::POST) {
 
 		$object_link_service = Object_Link_Provider::get_instance();
-		$permalink           = $object_link_service->get_permalink( $post_id, $object_type );
+		$permalink           = $object_link_service->get_permalink($post_id, $object_type);
 
 		/**
 		 * WordPress 4.4 doesn't support meta queries for terms, therefore we only support post permalinks here.
@@ -105,8 +105,8 @@ 
 		 * post permalink if we find them.
 		 */
 		global $wp_version;
-		if ( version_compare( $wp_version, '4.5', '<' ) ) {
-			return apply_filters( 'wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null );
+		if (version_compare($wp_version, '4.5', '<')) {
+			return apply_filters('wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null);
 		}
 
 		/**
@@ -130,7 +130,7 @@ 
 
 		// Only try to link a term if `WL_ENABLE_TERM_LINKING` is enabled.
 		$terms = array();
-		if ( defined( 'WL_ENABLE_TERM_LINKING' ) && WL_ENABLE_TERM_LINKING ) {
+		if (defined('WL_ENABLE_TERM_LINKING') && WL_ENABLE_TERM_LINKING) {
 			// Try to find one term matching the entity.
 			$terms = get_terms(
 				array(
@@ -147,9 +147,9 @@ 
 		$type = self::TYPE_ENTITY_LINK;
 		$term = null;
 		// If found use the term link, otherwise the permalink.
-		if ( 1 === count( $terms ) ) {
-			$term      = current( $terms );
-			$permalink = get_term_link( $term );
+		if (1 === count($terms)) {
+			$term      = current($terms);
+			$permalink = get_term_link($term);
 			$type      = self::TYPE_TERM_LINK;
 		}
 
@@ -163,7 +163,7 @@ 
 		 *
 		 * @since 3.23.0 add the permalink type and term parameters.
 		 */
-		return apply_filters( 'wl_production_permalink', $permalink, $post_id, $type, $term );
+		return apply_filters('wl_production_permalink', $permalink, $post_id, $type, $term);
 	}
 
 	/**
@@ -174,16 +174,16 @@ 
 	 * @since 3.27.2
 	 */
 	public function keywords() {
-		$tags = get_the_tags( $this->post_id );
+		$tags = get_the_tags($this->post_id);
 
-		if ( empty( $tags ) ) {
+		if (empty($tags)) {
 			return;
 		}
 
 		return implode(
 			',',
 			array_map(
-				function ( $tag ) {
+				function($tag) {
 					return $tag->name;
 				},
 				$tags
@@ -199,9 +199,9 @@ 
 	 * @since 3.27.2
 	 */
 	public function article_section() {
-		$categories = get_the_category( $this->post_id );
+		$categories = get_the_category($this->post_id);
 
-		return wp_list_pluck( $categories, 'cat_name' );
+		return wp_list_pluck($categories, 'cat_name');
 	}
 
 	/**
@@ -212,7 +212,7 @@ 
 	 * @since 3.27.2
 	 */
 	public function comment_count() {
-		return get_comments_number( $this->post_id );
+		return get_comments_number($this->post_id);
 	}
 
 	/**
@@ -226,22 +226,22 @@ 
 	public function locale() {
 		$language = 'en-US';
 
-		if ( function_exists( 'wpml_get_language_information' ) ) {
+		if (function_exists('wpml_get_language_information')) {
 			// WPML handling
 			// WPML: Updated function signature.
 			// function wpml_get_language_information( $empty_value = null, $post_id = null )
-			$post_language = wpml_get_language_information( null, $this->post_id );
-			if ( ! $post_language instanceof WP_Error ) {
+			$post_language = wpml_get_language_information(null, $this->post_id);
+			if ( ! $post_language instanceof WP_Error) {
 				$language = $post_language['locale'];
 			}
-		} elseif ( function_exists( 'pll_get_post_language' ) ) {
+		} elseif (function_exists('pll_get_post_language')) {
 			// Polylang handling
-			$language = pll_get_post_language( $this->post_id, 'locale' );
+			$language = pll_get_post_language($this->post_id, 'locale');
 		} else {
 			$language = get_locale();
 		}
 
-		return str_replace( '_', '-', $language );
+		return str_replace('_', '-', $language);
 	}
 
 }

src/modules/linked_data/wordlift-linked-data.php

Indentation +462 added lines, -462 removed lines

@@ -23,61 +23,61 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
-
-	$log->trace( "Saving post $post_id to Linked Data..." );
-
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
-
-		return;
-	}
-
-	// Get the post type and check whether it supports the editor.
-	//
-	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
-	/**
-	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
-
-	$is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id );
-	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported
-		 && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
-
-		return;
-	}
-
-	/**
-	 * Only process valid post types
-	 *
-	 * @since 3.25.6
-	 */
-	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
-
-	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types, true ) && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
-
-		return;
-	}
-
-	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
-
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
-
-	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+
+    $log->trace( "Saving post $post_id to Linked Data..." );
+
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        $log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+
+        return;
+    }
+
+    // Get the post type and check whether it supports the editor.
+    //
+    // @see https://github.com/insideout10/wordlift-plugin/issues/659.
+    $post_type = get_post_type( $post_id );
+    /**
+     * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     */
+    $is_editor_supported = wl_post_type_supports_editor( $post_type );
+
+    $is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id );
+    // Bail out if it's not an entity.
+    if ( ! $is_editor_supported
+         && ! $is_no_editor_analysis_enabled ) {
+        $log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+
+        return;
+    }
+
+    /**
+     * Only process valid post types
+     *
+     * @since 3.25.6
+     */
+    $supported_types = Wordlift_Entity_Service::valid_entity_post_types();
+
+    // Bail out if it's not a valid entity.
+    if ( ! in_array( $post_type, $supported_types, true ) && ! $is_no_editor_analysis_enabled ) {
+        $log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+
+        return;
+    }
+
+    // Unhook this function so it doesn't loop infinitely.
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
+
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
+
+    // Re-hook this function.
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -93,204 +93,204 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
-
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
-
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
-
-		return;
-	}
-
-	// get the current post.
-	$post = get_post( $post_id );
-
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
-
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
-
-	// Get the entity service instance.
-	$entity_service  = Wordlift_Entity_Service::get_instance();
-	$uri_service     = Wordlift_Entity_Uri_Service::get_instance();
-	$content_service = Wordpress_Content_Service::get_instance();
-
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
-
-	// Save all the selected internal entity uris to this variable.
-	$internal_entity_uris = array();
-
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$data              = filter_var_array( $_POST, array( 'wl_entities' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$entities_via_post = $data['wl_entities'];
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( wp_json_encode( $entities_via_post ) );
-		wl_write_log( ']' );
-
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
-
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) ) {
-				$existing_entity = get_page_by_title( $entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types() );
-				if ( isset( $existing_entity ) ) {
-					$existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get( $existing_entity->ID );
-					// Type doesn't match, continue to create a new entity.
-					if ( ! isset( $existing_entity_type ) || $existing_entity_type['css_class'] !== $entity['main_type'] ) {
-						$existing_entity = null;
-					}
-				}
-			} else {
-				// Look if current entity uri matches an internal existing entity, meaning:
-				// 1. when $entity_uri is an internal uri
-				// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-				$existing_entity = $entity_service->get_entity_post_by_uri( $entity_uri );
-			}
-
-			// Don't save the entities which are not found, but also local.
-			if ( ! isset( $existing_entity ) && $uri_service->is_internal( $entity_uri ) ) {
-				$internal_entity_uris[] = $entity_uri;
-				continue;
-			}
-
-			if ( ! isset( $existing_entity ) ) {
-				// Update entity data with related post
-				$entity['related_post_id'] = $post_id;
-				// New entity, save it.
-				$existing_entity = wl_save_entity( $entity );
-			} else {
-				// Existing entity, update post status.
-				if ( $existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-					$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
-						? $post->post_status : 'draft';
-					wl_update_post_status( $existing_entity->ID, $post_status );
-				}
-			}
-
-			$uri = $content_service->get_entity_id( Wordpress_Content_Id::create_post( $existing_entity->ID ) );
-
-			$internal_entity_uris[] = $uri;
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
-
-		}
-	}
-
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
-
-	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
-		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
-				continue;
-			}
-
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-		}
-
-		// Update the post content.
-		/**
-		 * Note: wp_update_post do stripslashes before saving the
-		 * content, so add the slashes to prevent back slash getting
-		 * removed.
-		 */
-		wp_update_post(
-			array(
-				'ID'           => $post->ID,
-				'post_content' => addslashes( $updated_post_content ),
-			)
-		);
-	}
-
-	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
-
-	$content_id = Wordpress_Content_Id::create_post( $post->ID );
-	$relations  = Relation_Service::get_instance()->get_relations( $content_id );
-
-	if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
-		$relations->add( ...Relation_Service::get_relations_from_uris( $content_id, $internal_entity_uris ) );
-	}
-	/**
-	 * Filter the relations, we dont want to create a relation
-	 * to uncategorized term, we are already filtering this on jsonld,
-	 *
-	 * @todo: do i need to move this to post-term-relation-service ?
-	 */
-	$filtered_relations = array_filter(
-		$relations->toArray(),
-		function ( $item ) {
-			/**
-			 * @var $item Relation
-			 */
-			$object = $item->get_object();
-
-			return ! ( $object->get_type() === Object_Type_Enum::TERM
-			&& $object->get_id() === 1 );
-		}
-	);
-
-	// Save relation instances
-	/** @var Relation $relation */
-	foreach ( $filtered_relations  as $relation ) {
-		$subject = $relation->get_subject();
-		$object  = $relation->get_object();
-
-		wl_core_add_relation_instance(
-		// subject id.
-			$subject->get_id(),
-			// what, where, when, who
-			$relation->get_predicate(),
-			// object id.
-			$object->get_id(),
-			// Subject type.
-			$subject->get_type(),
-			// Object type.
-			$object->get_type()
-		);
-
-	}
-
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ? filter_input_array( INPUT_POST, array( 'wl_metadata' => FILTER_DEFAULT ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC,
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			if ( empty( $uri ) ) {
-				continue;
-			}
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( Wordlift_Schema_Service::FIELD_TOPIC === $field ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+
+    $log->trace( "Saving $post_id to Linked Data along with related entities..." );
+
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        $log->trace( 'Doing autosave, skipping...' );
+
+        return;
+    }
+
+    // get the current post.
+    $post = get_post( $post_id );
+
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+
+    // Get the entity service instance.
+    $entity_service  = Wordlift_Entity_Service::get_instance();
+    $uri_service     = Wordlift_Entity_Uri_Service::get_instance();
+    $content_service = Wordpress_Content_Service::get_instance();
+
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
+
+    // Save all the selected internal entity uris to this variable.
+    $internal_entity_uris = array();
+
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $data              = filter_var_array( $_POST, array( 'wl_entities' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $entities_via_post = $data['wl_entities'];
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( wp_json_encode( $entities_via_post ) );
+        wl_write_log( ']' );
+
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
+
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) ) {
+                $existing_entity = get_page_by_title( $entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types() );
+                if ( isset( $existing_entity ) ) {
+                    $existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get( $existing_entity->ID );
+                    // Type doesn't match, continue to create a new entity.
+                    if ( ! isset( $existing_entity_type ) || $existing_entity_type['css_class'] !== $entity['main_type'] ) {
+                        $existing_entity = null;
+                    }
+                }
+            } else {
+                // Look if current entity uri matches an internal existing entity, meaning:
+                // 1. when $entity_uri is an internal uri
+                // 2. when $entity_uri is an external uri used as sameAs of an internal entity
+                $existing_entity = $entity_service->get_entity_post_by_uri( $entity_uri );
+            }
+
+            // Don't save the entities which are not found, but also local.
+            if ( ! isset( $existing_entity ) && $uri_service->is_internal( $entity_uri ) ) {
+                $internal_entity_uris[] = $entity_uri;
+                continue;
+            }
+
+            if ( ! isset( $existing_entity ) ) {
+                // Update entity data with related post
+                $entity['related_post_id'] = $post_id;
+                // New entity, save it.
+                $existing_entity = wl_save_entity( $entity );
+            } else {
+                // Existing entity, update post status.
+                if ( $existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+                    $post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
+                        ? $post->post_status : 'draft';
+                    wl_update_post_status( $existing_entity->ID, $post_status );
+                }
+            }
+
+            $uri = $content_service->get_entity_id( Wordpress_Content_Id::create_post( $existing_entity->ID ) );
+
+            $internal_entity_uris[] = $uri;
+            wl_write_log( "Map $entity_uri on $uri" );
+            $entities_uri_mapping[ $entity_uri ] = $uri;
+
+        }
+    }
+
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+
+    // Update the post content if we found mappings of new entities.
+    if ( ! empty( $entities_uri_mapping ) ) {
+        // Save each entity and store the post id.
+        foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+            if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+                continue;
+            }
+
+            $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+        }
+
+        // Update the post content.
+        /**
+         * Note: wp_update_post do stripslashes before saving the
+         * content, so add the slashes to prevent back slash getting
+         * removed.
+         */
+        wp_update_post(
+            array(
+                'ID'           => $post->ID,
+                'post_content' => addslashes( $updated_post_content ),
+            )
+        );
+    }
+
+    // Reset previously saved instances.
+    wl_core_delete_relation_instances( $post_id );
+
+    $content_id = Wordpress_Content_Id::create_post( $post->ID );
+    $relations  = Relation_Service::get_instance()->get_relations( $content_id );
+
+    if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
+        $relations->add( ...Relation_Service::get_relations_from_uris( $content_id, $internal_entity_uris ) );
+    }
+    /**
+     * Filter the relations, we dont want to create a relation
+     * to uncategorized term, we are already filtering this on jsonld,
+     *
+     * @todo: do i need to move this to post-term-relation-service ?
+     */
+    $filtered_relations = array_filter(
+        $relations->toArray(),
+        function ( $item ) {
+            /**
+             * @var $item Relation
+             */
+            $object = $item->get_object();
+
+            return ! ( $object->get_type() === Object_Type_Enum::TERM
+            && $object->get_id() === 1 );
+        }
+    );
+
+    // Save relation instances
+    /** @var Relation $relation */
+    foreach ( $filtered_relations  as $relation ) {
+        $subject = $relation->get_subject();
+        $object  = $relation->get_object();
+
+        wl_core_add_relation_instance(
+        // subject id.
+            $subject->get_id(),
+            // what, where, when, who
+            $relation->get_predicate(),
+            // object id.
+            $object->get_id(),
+            // Subject type.
+            $subject->get_type(),
+            // Object type.
+            $object->get_type()
+        );
+
+    }
+
+    if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        // Save post metadata if available
+        $metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ? filter_input_array( INPUT_POST, array( 'wl_metadata' => FILTER_DEFAULT ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC,
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri = ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            if ( empty( $uri ) ) {
+                continue;
+            }
+            $entity = $entity_service->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( Wordlift_Schema_Service::FIELD_TOPIC === $field ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -313,221 +313,221 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/image.php';
-	}
+    // Required for REST API calls
+    if ( ! function_exists( 'wp_crop_image' ) ) {
+        require_once ABSPATH . 'wp-admin/includes/image.php';
+    }
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
 
-	/*
+    /*
 	 * Data is coming from a $_POST, sanitize it.
 	 *
 	 * @since 3.19.4
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
-	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
-	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
-	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
-
-	// Check whether an entity already exists with the provided URI.
-	$uri = $entity_data['uri'];
-	if ( isset( $uri ) ) {
-		$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-		if ( isset( $post ) ) {
-			$log->debug( "Post already exists for URI $uri." );
-
-			return $post;
-		}
-	}
-
-	// Prepare properties of the new entity.
-	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true ) && is_numeric( $related_post_id )
-		? get_post_status( $related_post_id ) : 'draft';
-
-	$params = array(
-		// @@todo: we don't want an entity to be automatically published.
-		'post_status'  => $post_status,
-		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-		'post_title'   => $label,
-		'post_content' => $description,
-		'post_excerpt' => '',
-		// Ensure we're using a valid slug. We're not overwriting an existing
-		// entity with a post_name already set, since this call is made only for
-		// new entities.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
-	);
-
-	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
-	// the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
-	// Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
-	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
-	// is created when saving a post.
-	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action(
-			'wp_insert_post',
-			array(
-				$wpseo_metabox,
-				'save_postdata',
-			)
-		);
-	}
-
-	if ( isset( $seo_ultimate ) ) {
-		remove_action(
-			'save_post',
-			array(
-				$seo_ultimate,
-				'save_postmeta_box',
-			)
-		);
-	}
-
-	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
-	// save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
-	// to the save_post and restore them after we saved the entity.
-	// see https://github.com/insideout10/wordlift-plugin/issues/203
-	// see https://github.com/insideout10/wordlift-plugin/issues/156
-	// see https://github.com/insideout10/wordlift-plugin/issues/148
-	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-
-	$log->trace( 'Going to insert new post...' );
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Setting the alternative labels for this entity.
-	Wordlift_Entity_Service::get_instance()
-						   ->set_alternative_labels( $post_id, $synonyms );
-
-	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-
-	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action(
-			'wp_insert_post',
-			array(
-				$wpseo_metabox,
-				'save_postdata',
-			)
-		);
-	}
-
-	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action(
-			'save_post',
-			array(
-				$seo_ultimate,
-				'save_postmeta_box',
-			),
-			10,
-			2
-		);
-	}
-
-	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
-
-		// inform an error occurred.
-		return null;
-	}
-
-	wl_set_entity_main_type( $post_id, $type_uri );
-
-	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
-
-	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
-
-	// Add the uri to the sameAs data if it's not a local URI.
-	if ( isset( $uri ) && preg_match( '@https?://.*@', $uri ) &&
-		 $wl_uri !== $uri &&
-		 // Only remote entities
-		 0 !== strpos( $uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri() )
-	) {
-		array_push( $same_as, $uri );
-	}
-
-	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
-
-	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
-
-		if ( false === $image || is_wp_error( $image ) ) {
-			continue;
-		}
-
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
-
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
-
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
-
-		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
-
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
-
-		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
-	}
-
-	// finally return the entity post.
-	return get_post( $post_id );
+    $label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+    $type_uri         = $entity_data['main_type'];
+    $entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+    $description      = $entity_data['description'];
+    $images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
+    $same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
+    $related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
+    $other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+    // Get the synonyms.
+    $synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+
+    // Check whether an entity already exists with the provided URI.
+    $uri = $entity_data['uri'];
+    if ( isset( $uri ) ) {
+        $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+        if ( isset( $post ) ) {
+            $log->debug( "Post already exists for URI $uri." );
+
+            return $post;
+        }
+    }
+
+    // Prepare properties of the new entity.
+    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+    $post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true ) && is_numeric( $related_post_id )
+        ? get_post_status( $related_post_id ) : 'draft';
+
+    $params = array(
+        // @@todo: we don't want an entity to be automatically published.
+        'post_status'  => $post_status,
+        'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+        'post_title'   => $label,
+        'post_content' => $description,
+        'post_excerpt' => '',
+        // Ensure we're using a valid slug. We're not overwriting an existing
+        // entity with a post_name already set, since this call is made only for
+        // new entities.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/282
+        'post_name'    => sanitize_title( $label ),
+    );
+
+    // If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
+    // the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
+    // Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
+    // This does NOT affect saving an entity from the entity admin page since this function is called when an entity
+    // is created when saving a post.
+    global $wpseo_metabox, $seo_ultimate;
+    if ( isset( $wpseo_metabox ) ) {
+        remove_action(
+            'wp_insert_post',
+            array(
+                $wpseo_metabox,
+                'save_postdata',
+            )
+        );
+    }
+
+    if ( isset( $seo_ultimate ) ) {
+        remove_action(
+            'save_post',
+            array(
+                $seo_ultimate,
+                'save_postmeta_box',
+            )
+        );
+    }
+
+    // The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
+    // save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
+    // to the save_post and restore them after we saved the entity.
+    // see https://github.com/insideout10/wordlift-plugin/issues/203
+    // see https://github.com/insideout10/wordlift-plugin/issues/156
+    // see https://github.com/insideout10/wordlift-plugin/issues/148
+    global $wp_filter;
+    $save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+    $log->trace( 'Going to insert new post...' );
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Setting the alternative labels for this entity.
+    Wordlift_Entity_Service::get_instance()
+                            ->set_alternative_labels( $post_id, $synonyms );
+
+    // Restore all the existing filters.
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+    // If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
+    if ( isset( $wpseo_metabox ) ) {
+        add_action(
+            'wp_insert_post',
+            array(
+                $wpseo_metabox,
+                'save_postdata',
+            )
+        );
+    }
+
+    // If SEO Ultimate is installed, add back the hook we removed a few lines above.
+    if ( isset( $seo_ultimate ) ) {
+        add_action(
+            'save_post',
+            array(
+                $seo_ultimate,
+                'save_postmeta_box',
+            ),
+            10,
+            2
+        );
+    }
+
+    // TODO: handle errors.
+    if ( is_wp_error( $post_id ) ) {
+        $log->error( 'An error occurred: ' . $post_id->get_error_message() );
+
+        // inform an error occurred.
+        return null;
+    }
+
+    wl_set_entity_main_type( $post_id, $type_uri );
+
+    // Save the entity types.
+    wl_set_entity_rdf_types( $post_id, $entity_types );
+
+    // Get a dataset URI for the entity.
+    $wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+
+    // Add the uri to the sameAs data if it's not a local URI.
+    if ( isset( $uri ) && preg_match( '@https?://.*@', $uri ) &&
+         $wl_uri !== $uri &&
+         // Only remote entities
+         0 !== strpos( $uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri() )
+    ) {
+        array_push( $same_as, $uri );
+    }
+
+    // Save the sameAs data for the entity.
+    wl_schema_set_value( $post_id, 'sameAs', $same_as );
+
+    // Save the other properties (latitude, langitude, startDate, endDate, etc.)
+    foreach ( $other_properties as $property_name => $property_value ) {
+        wl_schema_set_value( $post_id, $property_name, $property_value );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+
+        if ( false === $image || is_wp_error( $image ) ) {
+            continue;
+        }
+
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
+
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
+
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
+
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
+
+        // Set it as the featured image.
+        set_post_thumbnail( $post_id, $attachment_id );
+    }
+
+    // finally return the entity post.
+    return get_post( $post_id );
 }

Spacing +125 added lines, -125 removed lines

@@ -21,15 +21,15 @@ 
  *
  * @since 3.0.0
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post');
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+	$log->trace("Saving post $post_id to Linked Data...");
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
+		$log->debug("Skipping $post_id, because id is not numeric or is a post revision.");
 
 		return;
 	}
@@ -37,7 +37,7 @@ 
 	// Get the post type and check whether it supports the editor.
 	//
 	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
+	$post_type = get_post_type($post_id);
 	/**
 	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
 	 *
@@ -45,13 +45,13 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
 	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
+	$is_editor_supported = wl_post_type_supports_editor($post_type);
 
-	$is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id );
+	$is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used($post_id);
 	// Bail out if it's not an entity.
 	if ( ! $is_editor_supported
-		 && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+		 && ! $is_no_editor_analysis_enabled) {
+		$log->debug("Skipping $post_id, because $post_type doesn't support the editor (content).");
 
 		return;
 	}
@@ -64,23 +64,23 @@ 
 	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types, true ) && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+	if ( ! in_array($post_type, $supported_types, true) && ! $is_no_editor_analysis_enabled) {
+		$log->debug("Skipping $post_id, because $post_type is not a valid entity.");
 
 		return;
 	}
 
 	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -91,23 +91,23 @@ 
  *
  * @since 3.0.0
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -123,21 +123,21 @@ 
 	$internal_entity_uris = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$data              = filter_var_array( $_POST, array( 'wl_entities' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+	if (isset($_POST['wl_entities'])) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$data              = filter_var_array($_POST, array('wl_entities' => array('flags' => FILTER_REQUIRE_ARRAY))); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$entities_via_post = $data['wl_entities'];
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( wp_json_encode( $entities_via_post ) );
-		wl_write_log( ']' );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(wp_json_encode($entities_via_post));
+		wl_write_log(']');
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) ) {
-				$existing_entity = get_page_by_title( $entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types() );
-				if ( isset( $existing_entity ) ) {
-					$existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get( $existing_entity->ID );
+			if (preg_match('/^local-entity-.+/', $entity_uri)) {
+				$existing_entity = get_page_by_title($entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types());
+				if (isset($existing_entity)) {
+					$existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get($existing_entity->ID);
 					// Type doesn't match, continue to create a new entity.
-					if ( ! isset( $existing_entity_type ) || $existing_entity_type['css_class'] !== $entity['main_type'] ) {
+					if ( ! isset($existing_entity_type) || $existing_entity_type['css_class'] !== $entity['main_type']) {
 						$existing_entity = null;
 					}
 				}
@@ -145,35 +145,35 @@ 
 				// Look if current entity uri matches an internal existing entity, meaning:
 				// 1. when $entity_uri is an internal uri
 				// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-				$existing_entity = $entity_service->get_entity_post_by_uri( $entity_uri );
+				$existing_entity = $entity_service->get_entity_post_by_uri($entity_uri);
 			}
 
 			// Don't save the entities which are not found, but also local.
-			if ( ! isset( $existing_entity ) && $uri_service->is_internal( $entity_uri ) ) {
+			if ( ! isset($existing_entity) && $uri_service->is_internal($entity_uri)) {
 				$internal_entity_uris[] = $entity_uri;
 				continue;
 			}
 
-			if ( ! isset( $existing_entity ) ) {
+			if ( ! isset($existing_entity)) {
 				// Update entity data with related post
 				$entity['related_post_id'] = $post_id;
 				// New entity, save it.
-				$existing_entity = wl_save_entity( $entity );
+				$existing_entity = wl_save_entity($entity);
 			} else {
 				// Existing entity, update post status.
-				if ( $existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status ) {
+				if ($existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status) {
 					// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-					$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
+					$post_status = apply_filters('wl_feature__enable__entity-auto-publish', true)
 						? $post->post_status : 'draft';
-					wl_update_post_status( $existing_entity->ID, $post_status );
+					wl_update_post_status($existing_entity->ID, $post_status);
 				}
 			}
 
-			$uri = $content_service->get_entity_id( Wordpress_Content_Id::create_post( $existing_entity->ID ) );
+			$uri = $content_service->get_entity_id(Wordpress_Content_Id::create_post($existing_entity->ID));
 
 			$internal_entity_uris[] = $uri;
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 		}
 	}
@@ -182,14 +182,14 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+		foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+			if (1 !== preg_match('@^(https?://|local-entity-)@', $tmp_uri)) {
 				continue;
 			}
 
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+			$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 		}
 
 		// Update the post content.
@@ -201,19 +201,19 @@ 
 		wp_update_post(
 			array(
 				'ID'           => $post->ID,
-				'post_content' => addslashes( $updated_post_content ),
+				'post_content' => addslashes($updated_post_content),
 			)
 		);
 	}
 
 	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
-	$content_id = Wordpress_Content_Id::create_post( $post->ID );
-	$relations  = Relation_Service::get_instance()->get_relations( $content_id );
+	$content_id = Wordpress_Content_Id::create_post($post->ID);
+	$relations  = Relation_Service::get_instance()->get_relations($content_id);
 
-	if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
-		$relations->add( ...Relation_Service::get_relations_from_uris( $content_id, $internal_entity_uris ) );
+	if (No_Editor_Analysis_Feature::can_no_editor_analysis_be_used($post_id)) {
+		$relations->add(...Relation_Service::get_relations_from_uris($content_id, $internal_entity_uris));
 	}
 	/**
 	 * Filter the relations, we dont want to create a relation
@@ -223,20 +223,20 @@ 
 	 */
 	$filtered_relations = array_filter(
 		$relations->toArray(),
-		function ( $item ) {
+		function($item) {
 			/**
 			 * @var $item Relation
 			 */
 			$object = $item->get_object();
 
-			return ! ( $object->get_type() === Object_Type_Enum::TERM
-			&& $object->get_id() === 1 );
+			return ! ($object->get_type() === Object_Type_Enum::TERM
+			&& $object->get_id() === 1);
 		}
 	);
 
 	// Save relation instances
 	/** @var Relation $relation */
-	foreach ( $filtered_relations  as $relation ) {
+	foreach ($filtered_relations  as $relation) {
 		$subject = $relation->get_subject();
 		$object  = $relation->get_object();
 
@@ -255,9 +255,9 @@ 
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+	if (isset($_POST['wl_entities'])) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ? filter_input_array( INPUT_POST, array( 'wl_metadata' => FILTER_DEFAULT ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ? filter_input_array(INPUT_POST, array('wl_metadata' => FILTER_DEFAULT)) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 		$fields = array(
 			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
@@ -265,35 +265,35 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			if ( empty( $uri ) ) {
+			if (empty($uri)) {
 				continue;
 			}
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
+			$entity = $entity_service->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( Wordlift_Schema_Service::FIELD_TOPIC === $field ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if (Wordlift_Schema_Service::FIELD_TOPIC === $field) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -311,14 +311,14 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
 	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/image.php';
+	if ( ! function_exists('wp_crop_image')) {
+		require_once ABSPATH.'wp-admin/includes/image.php';
 	}
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+	$log = Wordlift_Log_Service::get_logger('wl_save_entity');
 
 	/*
 	 * Data is coming from a $_POST, sanitize it.
@@ -327,23 +327,23 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+	$label            = preg_replace('/\xEF\xBB\xBF/', '', sanitize_text_field($entity_data['label']));
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+	$images           = isset($entity_data['image']) ? (array) $entity_data['image'] : array();
+	$same_as          = isset($entity_data['sameas']) ? (array) $entity_data['sameas'] : array();
+	$related_post_id  = isset($entity_data['related_post_id']) ? $entity_data['related_post_id'] : null;
+	$other_properties = isset($entity_data['properties']) ? $entity_data['properties'] : array();
 	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+	$synonyms = isset($entity_data['synonym']) ? $entity_data['synonym'] : array();
 
 	// Check whether an entity already exists with the provided URI.
 	$uri = $entity_data['uri'];
-	if ( isset( $uri ) ) {
-		$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-		if ( isset( $post ) ) {
-			$log->debug( "Post already exists for URI $uri." );
+	if (isset($uri)) {
+		$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
+		if (isset($post)) {
+			$log->debug("Post already exists for URI $uri.");
 
 			return $post;
 		}
@@ -351,8 +351,8 @@ 
 
 	// Prepare properties of the new entity.
 	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true ) && is_numeric( $related_post_id )
-		? get_post_status( $related_post_id ) : 'draft';
+	$post_status = apply_filters('wl_feature__enable__entity-auto-publish', true) && is_numeric($related_post_id)
+		? get_post_status($related_post_id) : 'draft';
 
 	$params = array(
 		// @@todo: we don't want an entity to be automatically published.
@@ -366,7 +366,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -375,7 +375,7 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
+	if (isset($wpseo_metabox)) {
 		remove_action(
 			'wp_insert_post',
 			array(
@@ -385,7 +385,7 @@ 
 		);
 	}
 
-	if ( isset( $seo_ultimate ) ) {
+	if (isset($seo_ultimate)) {
 		remove_action(
 			'save_post',
 			array(
@@ -402,23 +402,23 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
-	$log->trace( 'Going to insert new post...' );
+	$log->trace('Going to insert new post...');
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Setting the alternative labels for this entity.
 	Wordlift_Entity_Service::get_instance()
-						   ->set_alternative_labels( $post_id, $synonyms );
+						   ->set_alternative_labels($post_id, $synonyms);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
+	if (isset($wpseo_metabox)) {
 		add_action(
 			'wp_insert_post',
 			array(
@@ -429,7 +429,7 @@ 
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
+	if (isset($seo_ultimate)) {
 		add_action(
 			'save_post',
 			array(
@@ -442,61 +442,61 @@ 
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
+	if (is_wp_error($post_id)) {
+		$log->error('An error occurred: '.$post_id->get_error_message());
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri($post_id);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( isset( $uri ) && preg_match( '@https?://.*@', $uri ) &&
+	if (isset($uri) && preg_match('@https?://.*@', $uri) &&
 		 $wl_uri !== $uri &&
 		 // Only remote entities
-		 0 !== strpos( $uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri() )
+		 0 !== strpos($uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri())
 	) {
-		array_push( $same_as, $uri );
+		array_push($same_as, $uri);
 	}
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+		$image = Wordlift_Remote_Image_Service::save_from_url($image_remote_url);
 
-		if ( false === $image || is_wp_error( $image ) ) {
+		if (false === $image || is_wp_error($image)) {
 			continue;
 		}
 
@@ -516,18 +516,18 @@ 
 		);
 
 		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+		$attachment_id = wp_insert_attachment($attachment, $filename, $post_id);
 
 		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+		wl_set_source_url($attachment_id, $image_remote_url);
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
+		set_post_thumbnail($post_id, $attachment_id);
 	}
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }

src/modules/gardening-kg/includes/Jsonld.php

Spacing +18 added lines, -18 removed lines

@@ -12,37 +12,37 @@ 
 	 */
 	private $content_service;
 
-	public function __construct( Content_Service $content_service ) {
+	public function __construct(Content_Service $content_service) {
 		$this->content_service = $content_service;
 	}
 
 	public function register_hooks() {
-		add_action( 'wl_post_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
-		add_action( 'wl_entity_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
+		add_action('wl_post_jsonld', array($this, 'post_jsonld'), 10, 2);
+		add_action('wl_entity_jsonld', array($this, 'post_jsonld'), 10, 2);
 
 	}
 
-	public function post_jsonld( $jsonld, $post_id ) {
+	public function post_jsonld($jsonld, $post_id) {
 
 		$mentions = array();
-		$term_ids = $this->get_term_ids( $post_id );
+		$term_ids = $this->get_term_ids($post_id);
 
-		foreach ( $term_ids as $term_id ) {
-			$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_term( $term_id ) );
+		foreach ($term_ids as $term_id) {
+			$this->add_about_jsonld($mentions, Wordpress_Content_Id::create_term($term_id));
 		}
 
 		// Add also the post jsonld.
-		$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_post( $post_id ) );
+		$this->add_about_jsonld($mentions, Wordpress_Content_Id::create_post($post_id));
 
-		$existing_mentions = array_key_exists( 'mentions', $jsonld ) ? $jsonld['mentions'] : array();
+		$existing_mentions = array_key_exists('mentions', $jsonld) ? $jsonld['mentions'] : array();
 
-		if ( count( $mentions ) > 0 ) {
-			$jsonld['mentions'] = array_merge( $existing_mentions, $mentions );
+		if (count($mentions) > 0) {
+			$jsonld['mentions'] = array_merge($existing_mentions, $mentions);
 		}
 		return $jsonld;
 	}
 
-	private function get_term_ids( $post_id ) {
+	private function get_term_ids($post_id) {
 		global $wpdb;
 		$result = $wpdb->get_col(
 			$wpdb->prepare(
@@ -52,7 +52,7 @@ 
 			)
 		);
 
-		return is_array( $result ) ? $result : array();
+		return is_array($result) ? $result : array();
 	}
 
 	/**
@@ -61,19 +61,19 @@ 
 	 *
 	 * @return void
 	 */
-	private function add_about_jsonld( &$list, $content_id ) {
+	private function add_about_jsonld(&$list, $content_id) {
 		$about_jsonld   = $this->content_service->get_about_jsonld(
 			$content_id
 		);
-		$decoded_jsonld = json_decode( $about_jsonld, true );
+		$decoded_jsonld = json_decode($about_jsonld, true);
 
-		if ( null === $decoded_jsonld ) {
+		if (null === $decoded_jsonld) {
 			return;
 		}
 
-		$value = wp_is_numeric_array( $decoded_jsonld ) ? $decoded_jsonld : array( $decoded_jsonld );
+		$value = wp_is_numeric_array($decoded_jsonld) ? $decoded_jsonld : array($decoded_jsonld);
 
-		$list = array_merge( $list, $value );
+		$list = array_merge($list, $value);
 
 	}
 

Indentation +58 added lines, -58 removed lines

@@ -7,74 +7,74 @@
 
 class Jsonld {
 
-	/**
-	 * @var Content_Service $content_service
-	 */
-	private $content_service;
+    /**
+     * @var Content_Service $content_service
+     */
+    private $content_service;
 
-	public function __construct( Content_Service $content_service ) {
-		$this->content_service = $content_service;
-	}
+    public function __construct( Content_Service $content_service ) {
+        $this->content_service = $content_service;
+    }
 
-	public function register_hooks() {
-		add_action( 'wl_post_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
-		add_action( 'wl_entity_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
+    public function register_hooks() {
+        add_action( 'wl_post_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
+        add_action( 'wl_entity_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
 
-	}
+    }
 
-	public function post_jsonld( $jsonld, $post_id ) {
+    public function post_jsonld( $jsonld, $post_id ) {
 
-		$mentions = array();
-		$term_ids = $this->get_term_ids( $post_id );
+        $mentions = array();
+        $term_ids = $this->get_term_ids( $post_id );
 
-		foreach ( $term_ids as $term_id ) {
-			$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_term( $term_id ) );
-		}
+        foreach ( $term_ids as $term_id ) {
+            $this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_term( $term_id ) );
+        }
 
-		// Add also the post jsonld.
-		$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_post( $post_id ) );
+        // Add also the post jsonld.
+        $this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_post( $post_id ) );
 
-		$existing_mentions = array_key_exists( 'mentions', $jsonld ) ? $jsonld['mentions'] : array();
+        $existing_mentions = array_key_exists( 'mentions', $jsonld ) ? $jsonld['mentions'] : array();
 
-		if ( count( $mentions ) > 0 ) {
-			$jsonld['mentions'] = array_merge( $existing_mentions, $mentions );
-		}
-		return $jsonld;
-	}
+        if ( count( $mentions ) > 0 ) {
+            $jsonld['mentions'] = array_merge( $existing_mentions, $mentions );
+        }
+        return $jsonld;
+    }
 
-	private function get_term_ids( $post_id ) {
-		global $wpdb;
-		$result = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT tt.term_id from {$wpdb->prefix}term_relationships r 
+    private function get_term_ids( $post_id ) {
+        global $wpdb;
+        $result = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT tt.term_id from {$wpdb->prefix}term_relationships r 
     INNER JOIN {$wpdb->prefix}term_taxonomy tt ON r.term_taxonomy_id=tt.term_taxonomy_id WHERE r.object_id= %d",
-				$post_id
-			)
-		);
-
-		return is_array( $result ) ? $result : array();
-	}
-
-	/**
-	 * @param $list array Adds the jsonld to the list if valid.
-	 * @param $content_id \Wordlift\Content\Wordpress\Wordpress_Content_Id
-	 *
-	 * @return void
-	 */
-	private function add_about_jsonld( &$list, $content_id ) {
-		$about_jsonld   = $this->content_service->get_about_jsonld(
-			$content_id
-		);
-		$decoded_jsonld = json_decode( $about_jsonld, true );
-
-		if ( null === $decoded_jsonld ) {
-			return;
-		}
-
-		$value = wp_is_numeric_array( $decoded_jsonld ) ? $decoded_jsonld : array( $decoded_jsonld );
-
-		$list = array_merge( $list, $value );
-
-	}
+                $post_id
+            )
+        );
+
+        return is_array( $result ) ? $result : array();
+    }
+
+    /**
+     * @param $list array Adds the jsonld to the list if valid.
+     * @param $content_id \Wordlift\Content\Wordpress\Wordpress_Content_Id
+     *
+     * @return void
+     */
+    private function add_about_jsonld( &$list, $content_id ) {
+        $about_jsonld   = $this->content_service->get_about_jsonld(
+            $content_id
+        );
+        $decoded_jsonld = json_decode( $about_jsonld, true );
+
+        if ( null === $decoded_jsonld ) {
+            return;
+        }
+
+        $value = wp_is_numeric_array( $decoded_jsonld ) ? $decoded_jsonld : array( $decoded_jsonld );
+
+        $list = array_merge( $list, $value );
+
+    }
 
 }

src/includes/class-wordlift-entity-type-service.php

Indentation +468 added lines, -468 removed lines

@@ -19,147 +19,147 @@ 
  */
 class Wordlift_Entity_Type_Service {
 
-	/**
-	 * The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	private $schema_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Entity_Type_Service constructor.
-	 *
-	 * @since 3.7.0
-	 */
-	protected function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
-
-		$this->schema_service = Wordlift_Schema_Service::get_instance();
-
-		$this->prepare_post_types();
-
-	}
-
-	/**
-	 * Prepare post types for Gutenberg use
-	 *
-	 * @since 3.26.0
-	 */
-	private function prepare_post_types() {
-
-		add_action(
-			'init',
-			function () {
-				// Add post type support for 'custom-fields' for all post types. Specifically needed in Gutenberg
-				$post_types = get_post_types();
-				foreach ( $post_types as $post_type ) {
-					add_post_type_support( $post_type, 'custom-fields' );
-				}
-			}
-		);
-	}
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 */
-	private static $instance = null;
-
-	/**
-	 * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 * @since 3.7.0
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the types associated with the specified entity post id.
-	 *
-	 * We have a strategy to define the entity type, given that everything is
-	 * an entity, i.e. also posts/pages and custom post types.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|null {
-	 * An array of type properties or null if no term is associated
-	 *
-	 * @type string css_class     The css class, e.g. `wl-thing`.
-	 * @type string uri           The schema.org class URI, e.g. `http://schema.org/Thing`.
-	 * @type array  same_as       An array of same as attributes.
-	 * @type array  custom_fields An array of custom fields.
-	 * }
-	 * @since 3.33.9 The `linked_data` key has been removed.
-	 *
-	 * @since 3.20.0 This function will **not** return entity types introduced with 3.20.0.
-	 *
-	 * @since 3.18.0 The cases are the following:
-	 *  1. the post has a term from the Entity Types Taxonomy: the term defines
-	 *     the entity type, e.g. Organization, Person, ...
-	 *  2. the post doesn't have a term from the Entity Types Taxonomy:
-	 *      a) the post is a `wl_entity` custom post type, then the post is
-	 *           assigned the `Thing` entity type by default.
-	 *      b) the post is a `post` post type, then the post is
-	 *           assigned the `Article` entity type by default.
-	 *      c) the post is a custom post type then it is
-	 *          assigned the `WebPage` entity type by default.
-	 */
-	public function get( $post_id ) {
-
-		$this->log->trace( "Getting the post type for post $post_id..." );
-
-		// Get the post type.
-		$post_type = get_post_type( $post_id );
-
-		// Return `web-page` for non entities.
-		if ( ! self::is_valid_entity_post_type( $post_type ) ) {
-			$this->log->info( "Returning `web-page` for post $post_id." );
-
-			return $this->schema_service->get_schema( 'web-page' );
-		}
-
-		// Get the type from the associated classification.
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		// Return the schema type if there is a term found.
-		if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
-			// Cycle through the terms and return the first one with a valid schema.
-			foreach ( $terms as $term ) {
-				$this->log->debug( "Found `{$term->slug}` term for post $post_id." );
-
-				// Try to get the schema for the term.
-				$schema = $this->schema_service->get_schema( $term->slug );
-
-				// If found, return it, ignoring the other types.
-				if ( null !== $schema ) {
-					// Return the entity type with the specified id.
-					return $schema;
-				}
-			}
-
-			/*
+    /**
+     * The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    private $schema_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Wordlift_Entity_Type_Service constructor.
+     *
+     * @since 3.7.0
+     */
+    protected function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+
+        $this->schema_service = Wordlift_Schema_Service::get_instance();
+
+        $this->prepare_post_types();
+
+    }
+
+    /**
+     * Prepare post types for Gutenberg use
+     *
+     * @since 3.26.0
+     */
+    private function prepare_post_types() {
+
+        add_action(
+            'init',
+            function () {
+                // Add post type support for 'custom-fields' for all post types. Specifically needed in Gutenberg
+                $post_types = get_post_types();
+                foreach ( $post_types as $post_type ) {
+                    add_post_type_support( $post_type, 'custom-fields' );
+                }
+            }
+        );
+    }
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
+     */
+    private static $instance = null;
+
+    /**
+     * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
+     * @since 3.7.0
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the types associated with the specified entity post id.
+     *
+     * We have a strategy to define the entity type, given that everything is
+     * an entity, i.e. also posts/pages and custom post types.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|null {
+     * An array of type properties or null if no term is associated
+     *
+     * @type string css_class     The css class, e.g. `wl-thing`.
+     * @type string uri           The schema.org class URI, e.g. `http://schema.org/Thing`.
+     * @type array  same_as       An array of same as attributes.
+     * @type array  custom_fields An array of custom fields.
+     * }
+     * @since 3.33.9 The `linked_data` key has been removed.
+     *
+     * @since 3.20.0 This function will **not** return entity types introduced with 3.20.0.
+     *
+     * @since 3.18.0 The cases are the following:
+     *  1. the post has a term from the Entity Types Taxonomy: the term defines
+     *     the entity type, e.g. Organization, Person, ...
+     *  2. the post doesn't have a term from the Entity Types Taxonomy:
+     *      a) the post is a `wl_entity` custom post type, then the post is
+     *           assigned the `Thing` entity type by default.
+     *      b) the post is a `post` post type, then the post is
+     *           assigned the `Article` entity type by default.
+     *      c) the post is a custom post type then it is
+     *          assigned the `WebPage` entity type by default.
+     */
+    public function get( $post_id ) {
+
+        $this->log->trace( "Getting the post type for post $post_id..." );
+
+        // Get the post type.
+        $post_type = get_post_type( $post_id );
+
+        // Return `web-page` for non entities.
+        if ( ! self::is_valid_entity_post_type( $post_type ) ) {
+            $this->log->info( "Returning `web-page` for post $post_id." );
+
+            return $this->schema_service->get_schema( 'web-page' );
+        }
+
+        // Get the type from the associated classification.
+        $terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        // Return the schema type if there is a term found.
+        if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
+            // Cycle through the terms and return the first one with a valid schema.
+            foreach ( $terms as $term ) {
+                $this->log->debug( "Found `{$term->slug}` term for post $post_id." );
+
+                // Try to get the schema for the term.
+                $schema = $this->schema_service->get_schema( $term->slug );
+
+                // If found, return it, ignoring the other types.
+                if ( null !== $schema ) {
+                    // Return the entity type with the specified id.
+                    return $schema;
+                }
+            }
+
+            /*
 			 * When a schema isn't found, we return `thing`. Schema may not be found because
 			 * the new schema classes that we support since #852 aren't configured in the schema
 			 * service.
@@ -169,93 +169,93 @@ 
 			 * @since 3.20.0
 			 */
 
-			return $this->schema_service->get_schema( 'thing' );
-		}
-
-		// If it's a page or post return `Article`.
-		if ( in_array( $post_type, array( 'post', 'page' ), true ) ) {
-			$this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
-
-			// Return "Article" schema type for posts.
-			return $this->schema_service->get_schema( 'article' );
-		}
-
-		// Return "Thing" schema type for entities.
-		$this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
-
-		// Return the entity type with the specified id.
-		return $this->schema_service->get_schema( 'thing' );
-
-	}
-
-	/**
-	 * Get the term ids of the entity types associated to the specified post.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
-	 * @since 3.20.0
-	 */
-	public function get_ids( $post_id ) {
-
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids' ) );
-	}
-
-	/**
-	 * Get the camel case names of the entity types associated to the specified post.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
-	 * @since 3.20.0
-	 */
-	public function get_names( $post_id ) {
-
-		$ids = $this->get_ids( $post_id );
-
-		// Filter out invalid terms (ones without _wl_name term meta)
-		return array_values(
-			array_filter(
-				array_map(
-					function ( $id ) {
-						return get_term_meta( $id, '_wl_name', true );
-					},
-					$ids
-				)
-			)
-		);
-	}
-
-	/**
-	 * Set the main type for the specified entity post, given the type URI.
-	 *
-	 * @param int    $post_id The post id.
-	 * @param string $type_uri The type URI.
-	 * @param bool   $replace Whether the provided type must replace the existing types, by default `true`.
-	 *
-	 * @since 3.8.0
-	 */
-	public function set( $post_id, $type_uri, $replace = true ) {
-
-		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-			$this->log->debug( "Removing entity type for post $post_id..." );
-
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-
-		$this->log->debug( "Setting entity type for post $post_id..." );
-
-		// if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
-		$term = ( 0 === strpos( $type_uri, 'wl-' ) )
-			// Get term by slug.
-			? $this->get_term_by_slug( substr( $type_uri, 3 ) )
-			// Get term by URI.
-			: $this->get_term_by_uri( $type_uri );
-
-		/*
+            return $this->schema_service->get_schema( 'thing' );
+        }
+
+        // If it's a page or post return `Article`.
+        if ( in_array( $post_type, array( 'post', 'page' ), true ) ) {
+            $this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
+
+            // Return "Article" schema type for posts.
+            return $this->schema_service->get_schema( 'article' );
+        }
+
+        // Return "Thing" schema type for entities.
+        $this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
+
+        // Return the entity type with the specified id.
+        return $this->schema_service->get_schema( 'thing' );
+
+    }
+
+    /**
+     * Get the term ids of the entity types associated to the specified post.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
+     * @since 3.20.0
+     */
+    public function get_ids( $post_id ) {
+
+        return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids' ) );
+    }
+
+    /**
+     * Get the camel case names of the entity types associated to the specified post.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
+     * @since 3.20.0
+     */
+    public function get_names( $post_id ) {
+
+        $ids = $this->get_ids( $post_id );
+
+        // Filter out invalid terms (ones without _wl_name term meta)
+        return array_values(
+            array_filter(
+                array_map(
+                    function ( $id ) {
+                        return get_term_meta( $id, '_wl_name', true );
+                    },
+                    $ids
+                )
+            )
+        );
+    }
+
+    /**
+     * Set the main type for the specified entity post, given the type URI.
+     *
+     * @param int    $post_id The post id.
+     * @param string $type_uri The type URI.
+     * @param bool   $replace Whether the provided type must replace the existing types, by default `true`.
+     *
+     * @since 3.8.0
+     */
+    public function set( $post_id, $type_uri, $replace = true ) {
+
+        // If the type URI is empty we remove the type.
+        if ( empty( $type_uri ) ) {
+            $this->log->debug( "Removing entity type for post $post_id..." );
+
+            wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+
+        $this->log->debug( "Setting entity type for post $post_id..." );
+
+        // if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
+        $term = ( 0 === strpos( $type_uri, 'wl-' ) )
+            // Get term by slug.
+            ? $this->get_term_by_slug( substr( $type_uri, 3 ) )
+            // Get term by URI.
+            : $this->get_term_by_uri( $type_uri );
+
+        /*
 		 * We always want to assign a type to an entity otherwise it won't show in the Vocabulary and it won't be
 		 * connected to Articles via mentions. We realized that the client JS code is passing `wl-other` when the
 		 * entity type isn't "notable". In which case we couldn't find an entity type.
@@ -266,245 +266,245 @@ 
 		 *
 		 * @since 3.23.4
 		 */
-		if ( false === $term ) {
-			$this->log->warn( "No term found for URI $type_uri, will use Thing." );
-
-			$term = $this->get_term_by_slug( 'thing' );
-
-			// We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
-			// is installed.
-			if ( false === $term ) {
-				return;
-			}
-		}
-
-		$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
-
-		// `$replace` is passed to decide whether to replace or append the term.
-		wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
-
-	}
-
-	/**
-	 * Get an entity type term given its slug.
-	 *
-	 * @param string $slug The slug.
-	 *
-	 * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
-	 *                             or `$term` was not found.
-	 * @since 3.20.0
-	 */
-	private function get_term_by_slug( $slug ) {
-
-		return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-	}
-
-	/**
-	 * Get an entity type term given its URI.
-	 *
-	 * @param string $uri The uri.
-	 *
-	 * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
-	 *                             or `$term` was not found.
-	 * @since 3.20.0
-	 */
-	public function get_term_by_uri( $uri ) {
-
-		$terms = get_terms(
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-			array(
-				'fields'     => 'all',
-				'get'        => 'all',
-				'number'     => 1,
-				'meta_query' => array(
-					array(
-						// Don't use a reference to Wordlift_Schemaorg_Class_Service, unless
-						// `WL_ALL_ENTITY_TYPES` is set to true.
-						'key'   => '_wl_uri',
-						'value' => $uri,
-					),
-				),
-				'orderby'    => 'term_id',
-				'order'      => 'ASC',
-			)
-		);
-
-		return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
-	}
-
-	/**
-	 * Check whether an entity type is set for the {@link WP_Post} with the
-	 * specified id.
-	 *
-	 * @param int    $post_id The {@link WP_Post}'s `id`.
-	 * @param string $uri The entity type URI.
-	 *
-	 * @return bool True if an entity type is set otherwise false.
-	 * @since 3.15.0
-	 */
-	public function has_entity_type( $post_id, $uri = null ) {
-
-		$this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
-
-		// If an URI hasn't been specified just check whether we have at least
-		// one entity type.
-		if ( null === $uri ) {
-			return has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id );
-		}
-
-		$has_entity_type = $this->has_post_term_by_uri( $post_id, $uri );
-
-		$this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
-
-		// Check whether the post has an entity type with that URI.
-		return $has_entity_type;
-	}
-
-	/**
-	 * Get the list of entity types' terms for the specified {@link WP_Post}.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
-	 * @since 3.15.0
-	 */
-	private function get_post_terms( $post_id ) {
-
-		return wp_get_object_terms(
-			$post_id,
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-			array(
-				'hide_empty' => false,
-				// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
-				// An issue has been opened with the AAM plugin author as well.
-				//
-				// see https://github.com/insideout10/wordlift-plugin/issues/334
-				// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
-				'fields'     => 'all',
-			)
-		);
-	}
-
-	/**
-	 * Get an entity type term given its URI.
-	 *
-	 * @param int    $post_id The {@link WP_Post} id.
-	 * @param string $uri The entity type URI.
-	 *
-	 * @return bool True if the post has that type URI bound to it otherwise false.
-	 * @since 3.15.0
-	 *
-	 * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
-	 */
-	private function has_post_term_by_uri( $post_id, $uri ) {
-
-		// Get the post terms bound to the specified post.
-		$terms = $this->get_post_terms( $post_id );
-
-		// Look for a term if the specified URI.
-		foreach ( $terms as $term ) {
-			$term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
-			if ( $uri === $term_uri ) {
-				return true;
-			}
-		}
-
-		// Return null.
-		return false;
-	}
-
-	/**
-	 * Get the custom fields for a specific post.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
-	 * @since 3.25.2
-	 */
-	public function get_custom_fields_for_post( $post_id ) {
-
-		// Return custom fields for this specific entity's type.
-		$types = $this->get_ids( $post_id );
-
-		/** @var WP_Term[] $terms */
-		$terms = array_filter(
-			array_map(
-				function ( $item ) {
-					return get_term( $item );
-				},
-				$types
-			),
-			function ( $item ) {
-				return isset( $item ) && is_a( $item, 'WP_Term' );
-			}
-		);
-
-		$term_slugs = array_map(
-			function ( $item ) {
-				return $item->slug;
-			},
-			$terms
-		);
-
-		$term_slugs[] = 'thing';
-
-		return $this->get_custom_fields_by_term_slugs( $term_slugs );
-	}
-
-	/**
-	 * Get the custom fields for a specific term.
-	 *
-	 * @param int $term_id The term ID.
-	 *
-	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
-	 * @since 3.32.0
-	 */
-	public function get_custom_fields_for_term( $term_id ) {
-		$selected_entity_types   = get_term_meta( $term_id, 'wl_entity_type' );
-		$selected_entity_types[] = 'thing';
-		$selected_entity_types   = array_unique( $selected_entity_types );
-
-		return $this->get_custom_fields_by_term_slugs( $selected_entity_types );
-	}
-
-	/**
-	 * Determines whether a post type can be used for entities.
-	 *
-	 * Criteria is that the post type is public. The list of valid post types
-	 * can be overridden with a filter.
-	 *
-	 * @param string $post_type A post type name.
-	 *
-	 * @return bool Return true if the post type can be used for entities, otherwise false.
-	 * @since 3.15.0
-	 */
-	public static function is_valid_entity_post_type( $post_type ) {
-
-		return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
-	}
-
-	/**
-	 * @param $term_slugs
-	 *
-	 * @return array
-	 */
-	private function get_custom_fields_by_term_slugs( $term_slugs ) {
-		$schema_service = Wordlift_Schema_Service::get_instance();
-
-		return array_reduce(
-			$term_slugs,
-			function ( $carry, $item ) use ( $schema_service ) {
-
-				$schema = $schema_service->get_schema( $item );
-
-				if ( ! isset( $schema['custom_fields'] ) ) {
-					return $carry;
-				}
-
-				return $carry + $schema['custom_fields'];
-			},
-			array()
-		);
-	}
+        if ( false === $term ) {
+            $this->log->warn( "No term found for URI $type_uri, will use Thing." );
+
+            $term = $this->get_term_by_slug( 'thing' );
+
+            // We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
+            // is installed.
+            if ( false === $term ) {
+                return;
+            }
+        }
+
+        $this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
+
+        // `$replace` is passed to decide whether to replace or append the term.
+        wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
+
+    }
+
+    /**
+     * Get an entity type term given its slug.
+     *
+     * @param string $slug The slug.
+     *
+     * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
+     *                             or `$term` was not found.
+     * @since 3.20.0
+     */
+    private function get_term_by_slug( $slug ) {
+
+        return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+    }
+
+    /**
+     * Get an entity type term given its URI.
+     *
+     * @param string $uri The uri.
+     *
+     * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
+     *                             or `$term` was not found.
+     * @since 3.20.0
+     */
+    public function get_term_by_uri( $uri ) {
+
+        $terms = get_terms(
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+            array(
+                'fields'     => 'all',
+                'get'        => 'all',
+                'number'     => 1,
+                'meta_query' => array(
+                    array(
+                        // Don't use a reference to Wordlift_Schemaorg_Class_Service, unless
+                        // `WL_ALL_ENTITY_TYPES` is set to true.
+                        'key'   => '_wl_uri',
+                        'value' => $uri,
+                    ),
+                ),
+                'orderby'    => 'term_id',
+                'order'      => 'ASC',
+            )
+        );
+
+        return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
+    }
+
+    /**
+     * Check whether an entity type is set for the {@link WP_Post} with the
+     * specified id.
+     *
+     * @param int    $post_id The {@link WP_Post}'s `id`.
+     * @param string $uri The entity type URI.
+     *
+     * @return bool True if an entity type is set otherwise false.
+     * @since 3.15.0
+     */
+    public function has_entity_type( $post_id, $uri = null ) {
+
+        $this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
+
+        // If an URI hasn't been specified just check whether we have at least
+        // one entity type.
+        if ( null === $uri ) {
+            return has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id );
+        }
+
+        $has_entity_type = $this->has_post_term_by_uri( $post_id, $uri );
+
+        $this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
+
+        // Check whether the post has an entity type with that URI.
+        return $has_entity_type;
+    }
+
+    /**
+     * Get the list of entity types' terms for the specified {@link WP_Post}.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
+     * @since 3.15.0
+     */
+    private function get_post_terms( $post_id ) {
+
+        return wp_get_object_terms(
+            $post_id,
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+            array(
+                'hide_empty' => false,
+                // Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
+                // An issue has been opened with the AAM plugin author as well.
+                //
+                // see https://github.com/insideout10/wordlift-plugin/issues/334
+                // see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
+                'fields'     => 'all',
+            )
+        );
+    }
+
+    /**
+     * Get an entity type term given its URI.
+     *
+     * @param int    $post_id The {@link WP_Post} id.
+     * @param string $uri The entity type URI.
+     *
+     * @return bool True if the post has that type URI bound to it otherwise false.
+     * @since 3.15.0
+     *
+     * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
+     */
+    private function has_post_term_by_uri( $post_id, $uri ) {
+
+        // Get the post terms bound to the specified post.
+        $terms = $this->get_post_terms( $post_id );
+
+        // Look for a term if the specified URI.
+        foreach ( $terms as $term ) {
+            $term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
+            if ( $uri === $term_uri ) {
+                return true;
+            }
+        }
+
+        // Return null.
+        return false;
+    }
+
+    /**
+     * Get the custom fields for a specific post.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
+     * @since 3.25.2
+     */
+    public function get_custom_fields_for_post( $post_id ) {
+
+        // Return custom fields for this specific entity's type.
+        $types = $this->get_ids( $post_id );
+
+        /** @var WP_Term[] $terms */
+        $terms = array_filter(
+            array_map(
+                function ( $item ) {
+                    return get_term( $item );
+                },
+                $types
+            ),
+            function ( $item ) {
+                return isset( $item ) && is_a( $item, 'WP_Term' );
+            }
+        );
+
+        $term_slugs = array_map(
+            function ( $item ) {
+                return $item->slug;
+            },
+            $terms
+        );
+
+        $term_slugs[] = 'thing';
+
+        return $this->get_custom_fields_by_term_slugs( $term_slugs );
+    }
+
+    /**
+     * Get the custom fields for a specific term.
+     *
+     * @param int $term_id The term ID.
+     *
+     * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
+     * @since 3.32.0
+     */
+    public function get_custom_fields_for_term( $term_id ) {
+        $selected_entity_types   = get_term_meta( $term_id, 'wl_entity_type' );
+        $selected_entity_types[] = 'thing';
+        $selected_entity_types   = array_unique( $selected_entity_types );
+
+        return $this->get_custom_fields_by_term_slugs( $selected_entity_types );
+    }
+
+    /**
+     * Determines whether a post type can be used for entities.
+     *
+     * Criteria is that the post type is public. The list of valid post types
+     * can be overridden with a filter.
+     *
+     * @param string $post_type A post type name.
+     *
+     * @return bool Return true if the post type can be used for entities, otherwise false.
+     * @since 3.15.0
+     */
+    public static function is_valid_entity_post_type( $post_type ) {
+
+        return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
+    }
+
+    /**
+     * @param $term_slugs
+     *
+     * @return array
+     */
+    private function get_custom_fields_by_term_slugs( $term_slugs ) {
+        $schema_service = Wordlift_Schema_Service::get_instance();
+
+        return array_reduce(
+            $term_slugs,
+            function ( $carry, $item ) use ( $schema_service ) {
+
+                $schema = $schema_service->get_schema( $item );
+
+                if ( ! isset( $schema['custom_fields'] ) ) {
+                    return $carry;
+                }
+
+                return $carry + $schema['custom_fields'];
+            },
+            array()
+        );
+    }
 
 }

Spacing +77 added lines, -77 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	protected function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Type_Service');
 
 		$this->schema_service = Wordlift_Schema_Service::get_instance();
 
@@ -61,11 +61,11 @@ 
 
 		add_action(
 			'init',
-			function () {
+			function() {
 				// Add post type support for 'custom-fields' for all post types. Specifically needed in Gutenberg
 				$post_types = get_post_types();
-				foreach ( $post_types as $post_type ) {
-					add_post_type_support( $post_type, 'custom-fields' );
+				foreach ($post_types as $post_type) {
+					add_post_type_support($post_type, 'custom-fields');
 				}
 			}
 		);
@@ -88,7 +88,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -126,34 +126,34 @@ 
 	 *      c) the post is a custom post type then it is
 	 *          assigned the `WebPage` entity type by default.
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
-		$this->log->trace( "Getting the post type for post $post_id..." );
+		$this->log->trace("Getting the post type for post $post_id...");
 
 		// Get the post type.
-		$post_type = get_post_type( $post_id );
+		$post_type = get_post_type($post_id);
 
 		// Return `web-page` for non entities.
-		if ( ! self::is_valid_entity_post_type( $post_type ) ) {
-			$this->log->info( "Returning `web-page` for post $post_id." );
+		if ( ! self::is_valid_entity_post_type($post_type)) {
+			$this->log->info("Returning `web-page` for post $post_id.");
 
-			return $this->schema_service->get_schema( 'web-page' );
+			return $this->schema_service->get_schema('web-page');
 		}
 
 		// Get the type from the associated classification.
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$terms = wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 		// Return the schema type if there is a term found.
-		if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
+		if ( ! is_wp_error($terms) && ! empty($terms)) {
 			// Cycle through the terms and return the first one with a valid schema.
-			foreach ( $terms as $term ) {
-				$this->log->debug( "Found `{$term->slug}` term for post $post_id." );
+			foreach ($terms as $term) {
+				$this->log->debug("Found `{$term->slug}` term for post $post_id.");
 
 				// Try to get the schema for the term.
-				$schema = $this->schema_service->get_schema( $term->slug );
+				$schema = $this->schema_service->get_schema($term->slug);
 
 				// If found, return it, ignoring the other types.
-				if ( null !== $schema ) {
+				if (null !== $schema) {
 					// Return the entity type with the specified id.
 					return $schema;
 				}
@@ -169,22 +169,22 @@ 
 			 * @since 3.20.0
 			 */
 
-			return $this->schema_service->get_schema( 'thing' );
+			return $this->schema_service->get_schema('thing');
 		}
 
 		// If it's a page or post return `Article`.
-		if ( in_array( $post_type, array( 'post', 'page' ), true ) ) {
-			$this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
+		if (in_array($post_type, array('post', 'page'), true)) {
+			$this->log->debug("Post $post_id has no terms, and it's a `post` type, returning `Article`.");
 
 			// Return "Article" schema type for posts.
-			return $this->schema_service->get_schema( 'article' );
+			return $this->schema_service->get_schema('article');
 		}
 
 		// Return "Thing" schema type for entities.
-		$this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
+		$this->log->debug("Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`.");
 
 		// Return the entity type with the specified id.
-		return $this->schema_service->get_schema( 'thing' );
+		return $this->schema_service->get_schema('thing');
 
 	}
 
@@ -196,9 +196,9 @@ 
 	 * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
 	 * @since 3.20.0
 	 */
-	public function get_ids( $post_id ) {
+	public function get_ids($post_id) {
 
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids' ) );
+		return wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('fields' => 'ids'));
 	}
 
 	/**
@@ -209,16 +209,16 @@ 
 	 * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
 	 * @since 3.20.0
 	 */
-	public function get_names( $post_id ) {
+	public function get_names($post_id) {
 
-		$ids = $this->get_ids( $post_id );
+		$ids = $this->get_ids($post_id);
 
 		// Filter out invalid terms (ones without _wl_name term meta)
 		return array_values(
 			array_filter(
 				array_map(
-					function ( $id ) {
-						return get_term_meta( $id, '_wl_name', true );
+					function($id) {
+						return get_term_meta($id, '_wl_name', true);
 					},
 					$ids
 				)
@@ -235,25 +235,25 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function set( $post_id, $type_uri, $replace = true ) {
+	public function set($post_id, $type_uri, $replace = true) {
 
 		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-			$this->log->debug( "Removing entity type for post $post_id..." );
+		if (empty($type_uri)) {
+			$this->log->debug("Removing entity type for post $post_id...");
 
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			wp_set_object_terms($post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
 
-		$this->log->debug( "Setting entity type for post $post_id..." );
+		$this->log->debug("Setting entity type for post $post_id...");
 
 		// if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
-		$term = ( 0 === strpos( $type_uri, 'wl-' ) )
+		$term = (0 === strpos($type_uri, 'wl-'))
 			// Get term by slug.
-			? $this->get_term_by_slug( substr( $type_uri, 3 ) )
+			? $this->get_term_by_slug(substr($type_uri, 3))
 			// Get term by URI.
-			: $this->get_term_by_uri( $type_uri );
+			: $this->get_term_by_uri($type_uri);
 
 		/*
 		 * We always want to assign a type to an entity otherwise it won't show in the Vocabulary and it won't be
@@ -266,22 +266,22 @@ 
 		 *
 		 * @since 3.23.4
 		 */
-		if ( false === $term ) {
-			$this->log->warn( "No term found for URI $type_uri, will use Thing." );
+		if (false === $term) {
+			$this->log->warn("No term found for URI $type_uri, will use Thing.");
 
-			$term = $this->get_term_by_slug( 'thing' );
+			$term = $this->get_term_by_slug('thing');
 
 			// We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
 			// is installed.
-			if ( false === $term ) {
+			if (false === $term) {
 				return;
 			}
 		}
 
-		$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
+		$this->log->debug("Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]...");
 
 		// `$replace` is passed to decide whether to replace or append the term.
-		wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
+		wp_set_object_terms($post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace);
 
 	}
 
@@ -294,9 +294,9 @@ 
 	 *                             or `$term` was not found.
 	 * @since 3.20.0
 	 */
-	private function get_term_by_slug( $slug ) {
+	private function get_term_by_slug($slug) {
 
-		return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		return get_term_by('slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 	}
 
 	/**
@@ -308,7 +308,7 @@ 
 	 *                             or `$term` was not found.
 	 * @since 3.20.0
 	 */
-	public function get_term_by_uri( $uri ) {
+	public function get_term_by_uri($uri) {
 
 		$terms = get_terms(
 			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
@@ -329,7 +329,7 @@ 
 			)
 		);
 
-		return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
+		return is_array($terms) && ! empty($terms) ? $terms[0] : false;
 	}
 
 	/**
@@ -342,19 +342,19 @@ 
 	 * @return bool True if an entity type is set otherwise false.
 	 * @since 3.15.0
 	 */
-	public function has_entity_type( $post_id, $uri = null ) {
+	public function has_entity_type($post_id, $uri = null) {
 
-		$this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
+		$this->log->debug("Checking if post $post_id has an entity type [ $uri ]...");
 
 		// If an URI hasn't been specified just check whether we have at least
 		// one entity type.
-		if ( null === $uri ) {
-			return has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id );
+		if (null === $uri) {
+			return has_term('', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id);
 		}
 
-		$has_entity_type = $this->has_post_term_by_uri( $post_id, $uri );
+		$has_entity_type = $this->has_post_term_by_uri($post_id, $uri);
 
-		$this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
+		$this->log->debug("Post $post_id has $uri type: ".($has_entity_type ? 'yes' : 'no'));
 
 		// Check whether the post has an entity type with that URI.
 		return $has_entity_type;
@@ -368,7 +368,7 @@ 
 	 * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
 	 * @since 3.15.0
 	 */
-	private function get_post_terms( $post_id ) {
+	private function get_post_terms($post_id) {
 
 		return wp_get_object_terms(
 			$post_id,
@@ -396,15 +396,15 @@ 
 	 *
 	 * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
 	 */
-	private function has_post_term_by_uri( $post_id, $uri ) {
+	private function has_post_term_by_uri($post_id, $uri) {
 
 		// Get the post terms bound to the specified post.
-		$terms = $this->get_post_terms( $post_id );
+		$terms = $this->get_post_terms($post_id);
 
 		// Look for a term if the specified URI.
-		foreach ( $terms as $term ) {
-			$term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
-			if ( $uri === $term_uri ) {
+		foreach ($terms as $term) {
+			$term_uri = get_term_meta($term->term_id, '_wl_uri', true);
+			if ($uri === $term_uri) {
 				return true;
 			}
 		}
@@ -421,26 +421,26 @@ 
 	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
 	 * @since 3.25.2
 	 */
-	public function get_custom_fields_for_post( $post_id ) {
+	public function get_custom_fields_for_post($post_id) {
 
 		// Return custom fields for this specific entity's type.
-		$types = $this->get_ids( $post_id );
+		$types = $this->get_ids($post_id);
 
 		/** @var WP_Term[] $terms */
 		$terms = array_filter(
 			array_map(
-				function ( $item ) {
-					return get_term( $item );
+				function($item) {
+					return get_term($item);
 				},
 				$types
 			),
-			function ( $item ) {
-				return isset( $item ) && is_a( $item, 'WP_Term' );
+			function($item) {
+				return isset($item) && is_a($item, 'WP_Term');
 			}
 		);
 
 		$term_slugs = array_map(
-			function ( $item ) {
+			function($item) {
 				return $item->slug;
 			},
 			$terms
@@ -448,7 +448,7 @@ 
 
 		$term_slugs[] = 'thing';
 
-		return $this->get_custom_fields_by_term_slugs( $term_slugs );
+		return $this->get_custom_fields_by_term_slugs($term_slugs);
 	}
 
 	/**
@@ -459,12 +459,12 @@ 
 	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
 	 * @since 3.32.0
 	 */
-	public function get_custom_fields_for_term( $term_id ) {
-		$selected_entity_types   = get_term_meta( $term_id, 'wl_entity_type' );
+	public function get_custom_fields_for_term($term_id) {
+		$selected_entity_types   = get_term_meta($term_id, 'wl_entity_type');
 		$selected_entity_types[] = 'thing';
-		$selected_entity_types   = array_unique( $selected_entity_types );
+		$selected_entity_types   = array_unique($selected_entity_types);
 
-		return $this->get_custom_fields_by_term_slugs( $selected_entity_types );
+		return $this->get_custom_fields_by_term_slugs($selected_entity_types);
 	}
 
 	/**
@@ -478,9 +478,9 @@ 
 	 * @return bool Return true if the post type can be used for entities, otherwise false.
 	 * @since 3.15.0
 	 */
-	public static function is_valid_entity_post_type( $post_type ) {
+	public static function is_valid_entity_post_type($post_type) {
 
-		return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
+		return in_array($post_type, Wordlift_Entity_Service::valid_entity_post_types(), true);
 	}
 
 	/**
@@ -488,16 +488,16 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_custom_fields_by_term_slugs( $term_slugs ) {
+	private function get_custom_fields_by_term_slugs($term_slugs) {
 		$schema_service = Wordlift_Schema_Service::get_instance();
 
 		return array_reduce(
 			$term_slugs,
-			function ( $carry, $item ) use ( $schema_service ) {
+			function($carry, $item) use ($schema_service) {
 
-				$schema = $schema_service->get_schema( $item );
+				$schema = $schema_service->get_schema($item);
 
-				if ( ! isset( $schema['custom_fields'] ) ) {
+				if ( ! isset($schema['custom_fields'])) {
 					return $carry;
 				}