insideout10 / wordlift-plugin

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

Indentation +446 added lines, -446 removed lines

@@ -24,114 +24,114 @@ 
  */
 abstract class Wordlift_Abstract_Post_To_Jsonld_Converter implements Wordlift_Post_Converter {
 
-	/**
-	 * The JSON-LD context.
-	 *
-	 * @since 3.10.0
-	 */
-	const CONTEXT = 'http://schema.org';
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	protected $entity_type_service;
-
-	/**
-	 * A {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
-	 */
-	protected $user_service;
-
-	/**
-	 * A {@link Wordlift_Attachment_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 */
-	protected $attachment_service;
-
-	/**
-	 * @var Wordlift_Property_Getter
-	 */
-	private $property_getter;
-
-	/**
-	 * Wordlift_Post_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
-	 *
-	 * @since 3.10.0
-	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
-		$this->entity_type_service = $entity_type_service;
-		$this->user_service        = $user_service;
-		$this->attachment_service  = $attachment_service;
-		$this->property_getter     = $property_getter;
-	}
-
-	/**
-	 * 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 post id.
-	 * @param array $references An array of entity references.
-	 * @param array $relations
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.0
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	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 post URI @id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-		if ( $id === null ) {
-			$id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
-		}
-
-		/*
+    /**
+     * The JSON-LD context.
+     *
+     * @since 3.10.0
+     */
+    const CONTEXT = 'http://schema.org';
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    protected $entity_type_service;
+
+    /**
+     * A {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
+     */
+    protected $user_service;
+
+    /**
+     * A {@link Wordlift_Attachment_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     */
+    protected $attachment_service;
+
+    /**
+     * @var Wordlift_Property_Getter
+     */
+    private $property_getter;
+
+    /**
+     * Wordlift_Post_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
+     *
+     * @since 3.10.0
+     */
+    public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
+        $this->entity_type_service = $entity_type_service;
+        $this->user_service        = $user_service;
+        $this->attachment_service  = $attachment_service;
+        $this->property_getter     = $property_getter;
+    }
+
+    /**
+     * 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 post id.
+     * @param array $references An array of entity references.
+     * @param array $relations
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.0
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    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 post URI @id.
+        $id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
+        if ( $id === null ) {
+            $id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
+        }
+
+        /*
 		 * The `types` variable holds one or more entity types. The `type` variable isn't used anymore.
 		 *
 		 * @since 3.20.0 We support more than one entity type.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		// Get the entity @type. We consider `post` BlogPostings.
-		// $type = $this->entity_type_service->get( $post_id );
-		$types = $this->entity_type_service->get_names( $post_id );
-		$type  = self::make_one( $types );
-
-		// Prepare the response.
-		$jsonld = array(
-			'@context' => self::CONTEXT,
-			'@id'      => $id,
-			'@type'    => $type,
-		);
-
-		if ( post_type_supports( $post->post_type, 'excerpt' ) ) {
-			$jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post );
-		}
-
-		// Set the `mainEntityOfPage` property if the post has some contents.
-		/*
+        // Get the entity @type. We consider `post` BlogPostings.
+        // $type = $this->entity_type_service->get( $post_id );
+        $types = $this->entity_type_service->get_names( $post_id );
+        $type  = self::make_one( $types );
+
+        // Prepare the response.
+        $jsonld = array(
+            '@context' => self::CONTEXT,
+            '@id'      => $id,
+            '@type'    => $type,
+        );
+
+        if ( post_type_supports( $post->post_type, 'excerpt' ) ) {
+            $jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post );
+        }
+
+        // Set the `mainEntityOfPage` property if the post has some contents.
+        /*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
 		 * because the content is written elsewhere.
 		 *
@@ -139,353 +139,353 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		if ( ! empty( $post_content ) || in_array( 'Product', (array) $type, true ) ) {
-			// We're setting the `mainEntityOfPage` to signal which one is the
-			// main entity for the specified URL. It might be however that the
-			// post/page is actually about another specific entity. How WL deals
-			// with that hasn't been defined yet (see https://github.com/insideout10/wordlift-plugin/issues/451).
-			//
-			// See http://schema.org/mainEntityOfPage
-			//
-			// No need to specify `'@type' => 'WebPage'.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/451.
-			$jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
-
-			/**
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/1207
-			 *
-			 * @since 3.27.7
-			 */
-			if ( in_array(
-				$type,
-				array(
-					'Occupation',
-					'OccupationAggregationByEmployer',
-				),
-				true
-			) ) {
-				$jsonld['mainEntityOfPage'] = array(
-					'@type'        => 'WebPage',
-					'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false ),
-				);
-			}
-		};
-
-		$this->set_images( $this->attachment_service, $post, $jsonld );
-
-		// Naveen: Get the entities referenced by this post and set it to the `references`
-		// array so that the caller can do further processing, such as printing out
-		// more of those references.
-		//
-		// David: you can't set this to the `references`, because `references` it's an array of post
-		// IDs and client are using this. As of 3.42.1 (2023-04-20) I am refactoring this to use a
-		// new variable $relations.
-		// ** @var Object_Relation_Service $object_relation_service */
-		// $object_relation_service      = Object_Relation_Service::get_instance();
-		// $references_without_locations = $object_relation_service->get_references( $post_id, Object_Type_Enum::POST );
-
-		$relation_service = Relation_Service::get_instance();
-		$content_id       = Wordpress_Content_Id::create_post( $post_id );
-		$relation_service->add_relations( $content_id, $relations );
-		$this->add_relations_to_references( $relations, $references );
-
-		$this->expand_references_with_location( $references );
-
-		return $jsonld;
-	}
-
-	public function expand_references_with_location( &$references ) {
-		$entity_type_service = Wordlift_Entity_Type_Service::get_instance();
-
-		// check if any of the references has the entity type set to Action, Event or organisation.
-		$references_with_location = array_filter(
-			$references,
-			function ( $post_id ) use ( $entity_type_service ) {
-				return ( $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Action' )
-				|| $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Event' )
-				|| $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Organization' ) );
-			}
-		);
-
-		// If set, then get all the location ids and push them to references.
-		foreach ( $references_with_location as $post_id ) {
-			$post_location_ids = get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_LOCATION );
-			$post_location_ids = is_array( $post_location_ids ) ? $post_location_ids : array();
-			$references        = array_merge( $post_location_ids, $references );
-		}
-	}
-
-	/**
-	 * Copies the Post relations to referenced post IDs (legacy).
-	 *
-	 * @param Relations $relations
-	 */
-	private function add_relations_to_references( $relations, &$references ) {
-		/** @var Relation $relation */
-		foreach ( $relations->toArray() as $relation ) {
-			$object    = $relation->get_object();
-			$object_id = $object->get_id();
-			if ( $object->get_type() === Object_Type_Enum::POST && ! in_array( $object_id, $references, true ) ) {
-				$references[] = $object_id;
-			}
-		}
-	}
-
-	// private function add_location_reference_objects() {
-	// array_reduce(
-	// $references_without_locations,
-	// function ( $carry, $reference ) use ( $entity_type_service ) {
-	// **
-	// * @var $reference Reference
-	// */
-	// @see https://schema.org/location for the schema.org types using the `location` property.
-	// if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
-	// && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
-	// && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
-	//
-	// return $carry;
-	// }
-	// $post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
-	// $post_location_references = array_map(
-	// function ( $post_id ) {
-	// return new Post_Reference( $post_id );
-	// },
-	// $post_location_ids
-	// );
-	//
-	// return array_merge( $carry, $post_location_references );
-	// },
-	// array()
-	// );
-	// }
-
-	/**
-	 * If the provided value starts with the schema.org context, we remove the schema.org
-	 * part since it is set with the '@context'.
-	 *
-	 * @param string $value The property value.
-	 *
-	 * @return string The property value without the context.
-	 * @since 3.10.0
-	 */
-	public function relative_to_context( $value ) {
-		return ! is_array( $value ) && 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
-	}
-
-	/**
-	 * Set the images, by looking for embedded images, for images loaded via the
-	 * gallery and for the featured image.
-	 *
-	 * Uses the cache service to store the results of this function for a day.
-	 *
-	 * @param $attachment_service Wordlift_Attachment_Service
-	 * @param WP_Post                                        $post The target {@link WP_Post}.
-	 * @param array                                          $jsonld The JSON-LD array.
-	 *
-	 * @since 3.10.0
-	 */
-	public static function set_images( $attachment_service, $post, &$jsonld ) {
-
-		// Prepare the attachment ids array.
-		$ids = array();
-
-		// Set the thumbnail id as first attachment id, if any.
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$ids[] = $thumbnail_id;
-		}
-
-		// For the time being the following is being removed since the query
-		// initiated by `get_image_embeds` is consuming lots of CPU.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/689.
-		//
-		// Get the embeds, removing existing ids.
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
-			$embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
-		} else {
-			$embeds = array();
-		}
-
-		// Get the gallery, removing existing ids.
-		$gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
-
-		// Map the attachment ids to images' data structured for schema.org use.
-		$images_with_sizes = array_filter(
-			array_reduce(
-				array_merge( $ids, $embeds, $gallery ),
-				function ( $carry, $item ) {
-					/*
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        if ( ! empty( $post_content ) || in_array( 'Product', (array) $type, true ) ) {
+            // We're setting the `mainEntityOfPage` to signal which one is the
+            // main entity for the specified URL. It might be however that the
+            // post/page is actually about another specific entity. How WL deals
+            // with that hasn't been defined yet (see https://github.com/insideout10/wordlift-plugin/issues/451).
+            //
+            // See http://schema.org/mainEntityOfPage
+            //
+            // No need to specify `'@type' => 'WebPage'.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/451.
+            $jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
+
+            /**
+             * @see https://github.com/insideout10/wordlift-plugin/issues/1207
+             *
+             * @since 3.27.7
+             */
+            if ( in_array(
+                $type,
+                array(
+                    'Occupation',
+                    'OccupationAggregationByEmployer',
+                ),
+                true
+            ) ) {
+                $jsonld['mainEntityOfPage'] = array(
+                    '@type'        => 'WebPage',
+                    'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false ),
+                );
+            }
+        };
+
+        $this->set_images( $this->attachment_service, $post, $jsonld );
+
+        // Naveen: Get the entities referenced by this post and set it to the `references`
+        // array so that the caller can do further processing, such as printing out
+        // more of those references.
+        //
+        // David: you can't set this to the `references`, because `references` it's an array of post
+        // IDs and client are using this. As of 3.42.1 (2023-04-20) I am refactoring this to use a
+        // new variable $relations.
+        // ** @var Object_Relation_Service $object_relation_service */
+        // $object_relation_service      = Object_Relation_Service::get_instance();
+        // $references_without_locations = $object_relation_service->get_references( $post_id, Object_Type_Enum::POST );
+
+        $relation_service = Relation_Service::get_instance();
+        $content_id       = Wordpress_Content_Id::create_post( $post_id );
+        $relation_service->add_relations( $content_id, $relations );
+        $this->add_relations_to_references( $relations, $references );
+
+        $this->expand_references_with_location( $references );
+
+        return $jsonld;
+    }
+
+    public function expand_references_with_location( &$references ) {
+        $entity_type_service = Wordlift_Entity_Type_Service::get_instance();
+
+        // check if any of the references has the entity type set to Action, Event or organisation.
+        $references_with_location = array_filter(
+            $references,
+            function ( $post_id ) use ( $entity_type_service ) {
+                return ( $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Action' )
+                || $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Event' )
+                || $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Organization' ) );
+            }
+        );
+
+        // If set, then get all the location ids and push them to references.
+        foreach ( $references_with_location as $post_id ) {
+            $post_location_ids = get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_LOCATION );
+            $post_location_ids = is_array( $post_location_ids ) ? $post_location_ids : array();
+            $references        = array_merge( $post_location_ids, $references );
+        }
+    }
+
+    /**
+     * Copies the Post relations to referenced post IDs (legacy).
+     *
+     * @param Relations $relations
+     */
+    private function add_relations_to_references( $relations, &$references ) {
+        /** @var Relation $relation */
+        foreach ( $relations->toArray() as $relation ) {
+            $object    = $relation->get_object();
+            $object_id = $object->get_id();
+            if ( $object->get_type() === Object_Type_Enum::POST && ! in_array( $object_id, $references, true ) ) {
+                $references[] = $object_id;
+            }
+        }
+    }
+
+    // private function add_location_reference_objects() {
+    // array_reduce(
+    // $references_without_locations,
+    // function ( $carry, $reference ) use ( $entity_type_service ) {
+    // **
+    // * @var $reference Reference
+    // */
+    // @see https://schema.org/location for the schema.org types using the `location` property.
+    // if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
+    // && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
+    // && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
+    //
+    // return $carry;
+    // }
+    // $post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
+    // $post_location_references = array_map(
+    // function ( $post_id ) {
+    // return new Post_Reference( $post_id );
+    // },
+    // $post_location_ids
+    // );
+    //
+    // return array_merge( $carry, $post_location_references );
+    // },
+    // array()
+    // );
+    // }
+
+    /**
+     * If the provided value starts with the schema.org context, we remove the schema.org
+     * part since it is set with the '@context'.
+     *
+     * @param string $value The property value.
+     *
+     * @return string The property value without the context.
+     * @since 3.10.0
+     */
+    public function relative_to_context( $value ) {
+        return ! is_array( $value ) && 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
+    }
+
+    /**
+     * Set the images, by looking for embedded images, for images loaded via the
+     * gallery and for the featured image.
+     *
+     * Uses the cache service to store the results of this function for a day.
+     *
+     * @param $attachment_service Wordlift_Attachment_Service
+     * @param WP_Post                                        $post The target {@link WP_Post}.
+     * @param array                                          $jsonld The JSON-LD array.
+     *
+     * @since 3.10.0
+     */
+    public static function set_images( $attachment_service, $post, &$jsonld ) {
+
+        // Prepare the attachment ids array.
+        $ids = array();
+
+        // Set the thumbnail id as first attachment id, if any.
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+            $ids[] = $thumbnail_id;
+        }
+
+        // For the time being the following is being removed since the query
+        // initiated by `get_image_embeds` is consuming lots of CPU.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/689.
+        //
+        // Get the embeds, removing existing ids.
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
+            $embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
+        } else {
+            $embeds = array();
+        }
+
+        // Get the gallery, removing existing ids.
+        $gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
+
+        // Map the attachment ids to images' data structured for schema.org use.
+        $images_with_sizes = array_filter(
+            array_reduce(
+                array_merge( $ids, $embeds, $gallery ),
+                function ( $carry, $item ) {
+                    /*
 					* @todo: we're not sure that we're getting attachment data here, we
 					* should filter `false`s.
 					*/
 
-					$sources = array_merge(
-						Wordlift_Image_Service::get_sources( $item ),
-						array( wp_get_attachment_image_src( $item, 'full' ) )
-					);
-
-					$sources_with_image = array_filter(
-						$sources,
-						function ( $source ) {
-							return ! empty( $source[0] );
-						}
-					);
-
-					// Get the attachment data.
-					// $attachment = wp_get_attachment_image_src( $item, 'full' );
-
-					// var_dump( array( "sources-$item" => Wordlift_Image_Service::get_sources( $item ) ) );
-
-					// Bail if image is not found.
-					// In some cases, you can delete the image from the database
-					// or from uploads dir, but the image id still exists as featured image
-					// or in [gallery] shortcode.
-					// if ( empty( $attachment[0] ) ) {
-					if ( empty( $sources_with_image ) ) {
-						return $carry;
-					}
-
-					// Merge the arrays.
-					return array_merge(
-						$carry,
-						$sources_with_image
-					);
-				},
-				// Initial array.
-
-				array()
-			)
-		);
-
-		// Refactor data as per schema.org specifications.
-		$images = array_map(
-			function ( $attachment ) {
-				return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
-					array(
-						'@type' => 'ImageObject',
-						'url'   => $attachment[0],
-					),
-					$attachment
-				);
-			},
-			$images_with_sizes
-		);
-
-		// Add images if present.
-		if ( 0 < count( $images ) ) {
-			$jsonld['image'] = $images;
-		}
-
-	}
-
-	/**
-	 * If the provided array of values contains only one value, then one single
-	 * value is returned, otherwise the original array is returned.
-	 *
-	 * @param array $value An array of values.
-	 *
-	 * @return mixed|array A single value or the original array.
-	 * @since 3.20.0 The function has been moved from {@link Wordlift_Entity_Post_To_Jsonld_Converter} to
-	 *  {@link Wordlift_Abstract_Post_To_Jsonld_Converter}.
-	 * @since  3.8.0
-	 * @access private
-	 */
-	protected static function make_one( $value ) {
-
-		return 1 === count( $value ) ? $value[0] : $value;
-	}
-
-	/**
-	 * Process the provided array by adding the width / height if the values
-	 * are available and are greater than 0.
-	 *
-	 * @param array $image The `ImageObject` array.
-	 * @param array $attachment The attachment array.
-	 *
-	 * @return array The enriched `ImageObject` array.
-	 * @since 3.14.0
-	 */
-	public static function set_image_size( $image, $attachment ) {
-
-		// If you specify a "width" or "height" value you should leave out
-		// 'px'. For example: "width":"4608px" should be "width":"4608".
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
-			$image['width'] = $attachment[1];
-		}
-
-		if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
-			$image['height'] = $attachment[2];
-		}
-
-		return $image;
-	}
-
-	/**
-	 * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
-	 * for the post entity type.
-	 *
-	 * @param array   $jsonld The JSON-LD array.
-	 * @param array   $fields The entity types field array.
-	 * @param WP_Post $post The target {@link WP_Post} instance.
-	 * @param array   $references The references array.
-	 *
-	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
-	 *  the {@link Wordlift_Schema_Service} class.
-	 */
-	protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
-
-		// Set a reference to use in closures.
-		$converter = $this;
-
-		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
-
-			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
-
-			// Get the value, the property service will get the right extractor
-			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
-
-			if ( empty( $value ) ) {
-				continue;
-			}
-
-			// Map the value to the property name.
-			// If we got an array with just one value, we return that one value.
-			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one(
-				array_map(
-					function ( $item ) use ( $converter, &$references, &$references_infos ) {
-
-						if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-
-							$url = $item->get_url();
-
-							// The refactored converters require the entity id.
-							// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-							$references[] = $item->get_id();
-
-							// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-							$references_infos[] = array( 'reference' => $item );
-
-							return array( '@id' => $url );
-						}
-
-						return $converter->relative_to_context( $item );
-					},
-					$value
-				)
-			);
-
-		}
-
-	}
+                    $sources = array_merge(
+                        Wordlift_Image_Service::get_sources( $item ),
+                        array( wp_get_attachment_image_src( $item, 'full' ) )
+                    );
+
+                    $sources_with_image = array_filter(
+                        $sources,
+                        function ( $source ) {
+                            return ! empty( $source[0] );
+                        }
+                    );
+
+                    // Get the attachment data.
+                    // $attachment = wp_get_attachment_image_src( $item, 'full' );
+
+                    // var_dump( array( "sources-$item" => Wordlift_Image_Service::get_sources( $item ) ) );
+
+                    // Bail if image is not found.
+                    // In some cases, you can delete the image from the database
+                    // or from uploads dir, but the image id still exists as featured image
+                    // or in [gallery] shortcode.
+                    // if ( empty( $attachment[0] ) ) {
+                    if ( empty( $sources_with_image ) ) {
+                        return $carry;
+                    }
+
+                    // Merge the arrays.
+                    return array_merge(
+                        $carry,
+                        $sources_with_image
+                    );
+                },
+                // Initial array.
+
+                array()
+            )
+        );
+
+        // Refactor data as per schema.org specifications.
+        $images = array_map(
+            function ( $attachment ) {
+                return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
+                    array(
+                        '@type' => 'ImageObject',
+                        'url'   => $attachment[0],
+                    ),
+                    $attachment
+                );
+            },
+            $images_with_sizes
+        );
+
+        // Add images if present.
+        if ( 0 < count( $images ) ) {
+            $jsonld['image'] = $images;
+        }
+
+    }
+
+    /**
+     * If the provided array of values contains only one value, then one single
+     * value is returned, otherwise the original array is returned.
+     *
+     * @param array $value An array of values.
+     *
+     * @return mixed|array A single value or the original array.
+     * @since 3.20.0 The function has been moved from {@link Wordlift_Entity_Post_To_Jsonld_Converter} to
+     *  {@link Wordlift_Abstract_Post_To_Jsonld_Converter}.
+     * @since  3.8.0
+     * @access private
+     */
+    protected static function make_one( $value ) {
+
+        return 1 === count( $value ) ? $value[0] : $value;
+    }
+
+    /**
+     * Process the provided array by adding the width / height if the values
+     * are available and are greater than 0.
+     *
+     * @param array $image The `ImageObject` array.
+     * @param array $attachment The attachment array.
+     *
+     * @return array The enriched `ImageObject` array.
+     * @since 3.14.0
+     */
+    public static function set_image_size( $image, $attachment ) {
+
+        // If you specify a "width" or "height" value you should leave out
+        // 'px'. For example: "width":"4608px" should be "width":"4608".
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/451.
+        if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
+            $image['width'] = $attachment[1];
+        }
+
+        if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
+            $image['height'] = $attachment[2];
+        }
+
+        return $image;
+    }
+
+    /**
+     * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
+     * for the post entity type.
+     *
+     * @param array   $jsonld The JSON-LD array.
+     * @param array   $fields The entity types field array.
+     * @param WP_Post $post The target {@link WP_Post} instance.
+     * @param array   $references The references array.
+     *
+     * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
+     *  the {@link Wordlift_Schema_Service} class.
+     */
+    protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
+
+        // Set a reference to use in closures.
+        $converter = $this;
+
+        // Try each field on the entity.
+        foreach ( $fields as $key => $value ) {
+
+            // Get the predicate.
+            $name = $this->relative_to_context( $value['predicate'] );
+
+            // Get the value, the property service will get the right extractor
+            // for that property.
+            $value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
+
+            if ( empty( $value ) ) {
+                continue;
+            }
+
+            // Map the value to the property name.
+            // If we got an array with just one value, we return that one value.
+            // If we got a Wordlift_Property_Entity_Reference we get the URL.
+            $jsonld[ $name ] = self::make_one(
+                array_map(
+                    function ( $item ) use ( $converter, &$references, &$references_infos ) {
+
+                        if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+
+                            $url = $item->get_url();
+
+                            // The refactored converters require the entity id.
+                            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                            $references[] = $item->get_id();
+
+                            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                            $references_infos[] = array( 'reference' => $item );
+
+                            return array( '@id' => $url );
+                        }
+
+                        return $converter->relative_to_context( $item );
+                    },
+                    $value
+                )
+            );
+
+        }
+
+    }
 
 }

Spacing +67 added lines, -67 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
+	public function __construct($entity_type_service, $user_service, $attachment_service, $property_getter) {
 		$this->entity_type_service = $entity_type_service;
 		$this->user_service        = $user_service;
 		$this->attachment_service  = $attachment_service;
@@ -92,19 +92,19 @@ 
 	 * @since 3.10.0
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	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 post URI @id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-		if ( $id === null ) {
-			$id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
+		$id = Wordlift_Entity_Service::get_instance()->get_uri($post->ID);
+		if ($id === null) {
+			$id = 'get_uri returned null, dataset is '.wl_configuration_get_redlink_dataset_uri();
 		}
 
 		/*
@@ -116,8 +116,8 @@ 
 		 */
 		// Get the entity @type. We consider `post` BlogPostings.
 		// $type = $this->entity_type_service->get( $post_id );
-		$types = $this->entity_type_service->get_names( $post_id );
-		$type  = self::make_one( $types );
+		$types = $this->entity_type_service->get_names($post_id);
+		$type  = self::make_one($types);
 
 		// Prepare the response.
 		$jsonld = array(
@@ -126,8 +126,8 @@ 
 			'@type'    => $type,
 		);
 
-		if ( post_type_supports( $post->post_type, 'excerpt' ) ) {
-			$jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post );
+		if (post_type_supports($post->post_type, 'excerpt')) {
+			$jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt($post);
 		}
 
 		// Set the `mainEntityOfPage` property if the post has some contents.
@@ -139,8 +139,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		if ( ! empty( $post_content ) || in_array( 'Product', (array) $type, true ) ) {
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
+		if ( ! empty($post_content) || in_array('Product', (array) $type, true)) {
 			// We're setting the `mainEntityOfPage` to signal which one is the
 			// main entity for the specified URL. It might be however that the
 			// post/page is actually about another specific entity. How WL deals
@@ -151,29 +151,29 @@ 
 			// No need to specify `'@type' => 'WebPage'.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/451.
-			$jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
+			$jsonld['mainEntityOfPage'] = get_the_permalink($post->ID);
 
 			/**
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/1207
 			 *
 			 * @since 3.27.7
 			 */
-			if ( in_array(
+			if (in_array(
 				$type,
 				array(
 					'Occupation',
 					'OccupationAggregationByEmployer',
 				),
 				true
-			) ) {
+			)) {
 				$jsonld['mainEntityOfPage'] = array(
 					'@type'        => 'WebPage',
-					'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false ),
+					'lastReviewed' => get_post_time('Y-m-d\TH:i:sP', true, $post, false),
 				);
 			}
 		};
 
-		$this->set_images( $this->attachment_service, $post, $jsonld );
+		$this->set_images($this->attachment_service, $post, $jsonld);
 
 		// Naveen: Get the entities referenced by this post and set it to the `references`
 		// array so that the caller can do further processing, such as printing out
@@ -187,33 +187,33 @@ 
 		// $references_without_locations = $object_relation_service->get_references( $post_id, Object_Type_Enum::POST );
 
 		$relation_service = Relation_Service::get_instance();
-		$content_id       = Wordpress_Content_Id::create_post( $post_id );
-		$relation_service->add_relations( $content_id, $relations );
-		$this->add_relations_to_references( $relations, $references );
+		$content_id       = Wordpress_Content_Id::create_post($post_id);
+		$relation_service->add_relations($content_id, $relations);
+		$this->add_relations_to_references($relations, $references);
 
-		$this->expand_references_with_location( $references );
+		$this->expand_references_with_location($references);
 
 		return $jsonld;
 	}
 
-	public function expand_references_with_location( &$references ) {
+	public function expand_references_with_location(&$references) {
 		$entity_type_service = Wordlift_Entity_Type_Service::get_instance();
 
 		// check if any of the references has the entity type set to Action, Event or organisation.
 		$references_with_location = array_filter(
 			$references,
-			function ( $post_id ) use ( $entity_type_service ) {
-				return ( $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Action' )
-				|| $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Event' )
-				|| $entity_type_service->has_entity_type( $post_id, 'http://schema.org/Organization' ) );
+			function($post_id) use ($entity_type_service) {
+				return ($entity_type_service->has_entity_type($post_id, 'http://schema.org/Action')
+				|| $entity_type_service->has_entity_type($post_id, 'http://schema.org/Event')
+				|| $entity_type_service->has_entity_type($post_id, 'http://schema.org/Organization'));
 			}
 		);
 
 		// If set, then get all the location ids and push them to references.
-		foreach ( $references_with_location as $post_id ) {
-			$post_location_ids = get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_LOCATION );
-			$post_location_ids = is_array( $post_location_ids ) ? $post_location_ids : array();
-			$references        = array_merge( $post_location_ids, $references );
+		foreach ($references_with_location as $post_id) {
+			$post_location_ids = get_post_meta($post_id, Wordlift_Schema_Service::FIELD_LOCATION);
+			$post_location_ids = is_array($post_location_ids) ? $post_location_ids : array();
+			$references        = array_merge($post_location_ids, $references);
 		}
 	}
 
@@ -222,12 +222,12 @@ 
 	 *
 	 * @param Relations $relations
 	 */
-	private function add_relations_to_references( $relations, &$references ) {
+	private function add_relations_to_references($relations, &$references) {
 		/** @var Relation $relation */
-		foreach ( $relations->toArray() as $relation ) {
+		foreach ($relations->toArray() as $relation) {
 			$object    = $relation->get_object();
 			$object_id = $object->get_id();
-			if ( $object->get_type() === Object_Type_Enum::POST && ! in_array( $object_id, $references, true ) ) {
+			if ($object->get_type() === Object_Type_Enum::POST && ! in_array($object_id, $references, true)) {
 				$references[] = $object_id;
 			}
 		}
@@ -270,8 +270,8 @@ 
 	 * @return string The property value without the context.
 	 * @since 3.10.0
 	 */
-	public function relative_to_context( $value ) {
-		return ! is_array( $value ) && 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
+	public function relative_to_context($value) {
+		return ! is_array($value) && 0 === strpos($value, self::CONTEXT.'/') ? substr($value, strlen(self::CONTEXT) + 1) : $value;
 	}
 
 	/**
@@ -286,14 +286,14 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public static function set_images( $attachment_service, $post, &$jsonld ) {
+	public static function set_images($attachment_service, $post, &$jsonld) {
 
 		// Prepare the attachment ids array.
 		$ids = array();
 
 		// Set the thumbnail id as first attachment id, if any.
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id && 0 !== $thumbnail_id) {
 			$ids[] = $thumbnail_id;
 		}
 
@@ -304,34 +304,34 @@ 
 		//
 		// Get the embeds, removing existing ids.
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
-			$embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
+		if (apply_filters('wl_feature__enable__image-embeds', false)) {
+			$embeds = array_diff($attachment_service->get_image_embeds($post->post_content), $ids);
 		} else {
 			$embeds = array();
 		}
 
 		// Get the gallery, removing existing ids.
-		$gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
+		$gallery = array_diff($attachment_service->get_gallery($post), $ids, $embeds);
 
 		// Map the attachment ids to images' data structured for schema.org use.
 		$images_with_sizes = array_filter(
 			array_reduce(
-				array_merge( $ids, $embeds, $gallery ),
-				function ( $carry, $item ) {
+				array_merge($ids, $embeds, $gallery),
+				function($carry, $item) {
 					/*
 					* @todo: we're not sure that we're getting attachment data here, we
 					* should filter `false`s.
 					*/
 
 					$sources = array_merge(
-						Wordlift_Image_Service::get_sources( $item ),
-						array( wp_get_attachment_image_src( $item, 'full' ) )
+						Wordlift_Image_Service::get_sources($item),
+						array(wp_get_attachment_image_src($item, 'full'))
 					);
 
 					$sources_with_image = array_filter(
 						$sources,
-						function ( $source ) {
-							return ! empty( $source[0] );
+						function($source) {
+							return ! empty($source[0]);
 						}
 					);
 
@@ -345,7 +345,7 @@ 
 					// or from uploads dir, but the image id still exists as featured image
 					// or in [gallery] shortcode.
 					// if ( empty( $attachment[0] ) ) {
-					if ( empty( $sources_with_image ) ) {
+					if (empty($sources_with_image)) {
 						return $carry;
 					}
 
@@ -363,7 +363,7 @@ 
 
 		// Refactor data as per schema.org specifications.
 		$images = array_map(
-			function ( $attachment ) {
+			function($attachment) {
 				return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
 					array(
 						'@type' => 'ImageObject',
@@ -376,7 +376,7 @@ 
 		);
 
 		// Add images if present.
-		if ( 0 < count( $images ) ) {
+		if (0 < count($images)) {
 			$jsonld['image'] = $images;
 		}
 
@@ -394,9 +394,9 @@ 
 	 * @since  3.8.0
 	 * @access private
 	 */
-	protected static function make_one( $value ) {
+	protected static function make_one($value) {
 
-		return 1 === count( $value ) ? $value[0] : $value;
+		return 1 === count($value) ? $value[0] : $value;
 	}
 
 	/**
@@ -409,17 +409,17 @@ 
 	 * @return array The enriched `ImageObject` array.
 	 * @since 3.14.0
 	 */
-	public static function set_image_size( $image, $attachment ) {
+	public static function set_image_size($image, $attachment) {
 
 		// If you specify a "width" or "height" value you should leave out
 		// 'px'. For example: "width":"4608px" should be "width":"4608".
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
+		if (isset($attachment[1]) && is_numeric($attachment[1]) && 0 < $attachment[1]) {
 			$image['width'] = $attachment[1];
 		}
 
-		if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
+		if (isset($attachment[2]) && is_numeric($attachment[2]) && 0 < $attachment[2]) {
 			$image['height'] = $attachment[2];
 		}
 
@@ -438,33 +438,33 @@ 
 	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
 	 *  the {@link Wordlift_Schema_Service} class.
 	 */
-	protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
+	protected function process_type_custom_fields(&$jsonld, $fields, $post, &$references, &$references_infos) {
 
 		// Set a reference to use in closures.
 		$converter = $this;
 
 		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
+		foreach ($fields as $key => $value) {
 
 			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
+			$name = $this->relative_to_context($value['predicate']);
 
 			// Get the value, the property service will get the right extractor
 			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
+			$value = $this->property_getter->get($post->ID, $key, Object_Type_Enum::POST);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				continue;
 			}
 
 			// Map the value to the property name.
 			// If we got an array with just one value, we return that one value.
 			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one(
+			$jsonld[$name] = self::make_one(
 				array_map(
-					function ( $item ) use ( $converter, &$references, &$references_infos ) {
+					function($item) use ($converter, &$references, &$references_infos) {
 
-						if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+						if ($item instanceof Wordlift_Property_Entity_Reference) {
 
 							$url = $item->get_url();
 
@@ -473,12 +473,12 @@ 
 							$references[] = $item->get_id();
 
 							// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-							$references_infos[] = array( 'reference' => $item );
+							$references_infos[] = array('reference' => $item);
 
-							return array( '@id' => $url );
+							return array('@id' => $url);
 						}
 
-						return $converter->relative_to_context( $item );
+						return $converter->relative_to_context($item);
 					},
 					$value
 				)

src/includes/intf-wordlift-post-converter.php

Indentation +14 added lines, -14 removed lines

@@ -19,19 +19,19 @@
  */
 interface Wordlift_Post_Converter {
 
-	/**
-	 * Convert the specified post id.
-	 *
-	 * @param int                 $post_id The post id.
-	 * @param array               $references An array of posts referenced by the specified post.
-	 * @param array               $references_infos
-	 * @param Relations_Interface $relations The relations
-	 *
-	 * @return mixed The conversion result.
-	 * @since 3.42.1 $reference_objects argument added.
-	 * @since 3.16.0 $references argument added.
-	 * @since 3.10.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null );
+    /**
+     * Convert the specified post id.
+     *
+     * @param int                 $post_id The post id.
+     * @param array               $references An array of posts referenced by the specified post.
+     * @param array               $references_infos
+     * @param Relations_Interface $relations The relations
+     *
+     * @return mixed The conversion result.
+     * @since 3.42.1 $reference_objects argument added.
+     * @since 3.16.0 $references argument added.
+     * @since 3.10.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null );
 
 }

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
 	 * @since 3.16.0 $references argument added.
 	 * @since 3.10.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);
 
 }

src/includes/properties/class-wordlift-property-entity-reference.php

Indentation +115 added lines, -115 removed lines

@@ -20,120 +20,120 @@
  */
 class Wordlift_Property_Entity_Reference {
 
-	/**
-	 * The URL associated with this entity reference.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var string $url The URL associated with the entity reference.
-	 */
-	private $url;
-
-	/**
-	 * The entity post id.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var int $id The entity post id.
-	 */
-	private $id;
-
-	private $required;
-
-	/**
-	 * @var int
-	 */
-	private $type;
-
-	/**
-	 * Create a Wordlift_Property_Entity_Reference instance with the provided URL.
-	 *
-	 * @param string $entity_uri The URL.
-	 * @param int    $id The entity post id.
-	 * @param bool   $required Whether this property is always required in SD output, default false.
-	 * @param int    $type Instance of Object_Enum_Type
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_uri, $id, $required = false, $type = Object_Type_Enum::POST ) {
-
-		$this->url      = $entity_uri;
-		$this->id       = $id;
-		$this->required = $required;
-		$this->type     = $type;
-
-	}
-
-	/**
-	 * Return the type of the reference, one of the values in Object_Type_Enum
-	 *
-	 * @return int
-	 * @since 3.38.0
-	 */
-	public function get_type() {
-		return $this->type;
-	}
-
-	/**
-	 * Get the URL associated with this entity reference.
-	 *
-	 * @return string The URL associated with the entity reference.
-	 * @since 3.8.0
-	 */
-	public function get_url() {
-
-		return $this->url;
-	}
-
-	/**
-	 * Get the entity id.
-	 *
-	 * @return int The entity id.
-	 * @since 3.10.0
-	 */
-	public function get_id() {
-
-		return $this->id;
-	}
-
-	/**
-	 * Get the required flag for this {@link Wordlift_Property_Entity_Reference}.
-	 *
-	 * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
-	 * property needs to be output to SD (JSON-LD).
-	 *
-	 * @since 3.27.1
-	 */
-	public function get_required() {
-
-		return $this->required;
-
-	}
-
-	/**
-	 * Set the required flag for this {@link Wordlift_Property_Entity_Reference}.
-	 *
-	 * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
-	 * property needs to be output to SD (JSON-LD).
-	 *
-	 * @param bool $value
-	 *
-	 * @since 3.27.1
-	 */
-	public function set_required( $value ) {
-
-		$this->required = $value;
-
-	}
-
-	public function to_reference() {
-
-		if ( Object_Type_Enum::POST === $this->type ) {
-			return new Post_Reference( $this->id );
-		}
-		if ( Object_Type_Enum::TERM === $this->type ) {
-			return new Term_Reference( $this->id );
-		}
-	}
+    /**
+     * The URL associated with this entity reference.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var string $url The URL associated with the entity reference.
+     */
+    private $url;
+
+    /**
+     * The entity post id.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var int $id The entity post id.
+     */
+    private $id;
+
+    private $required;
+
+    /**
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Create a Wordlift_Property_Entity_Reference instance with the provided URL.
+     *
+     * @param string $entity_uri The URL.
+     * @param int    $id The entity post id.
+     * @param bool   $required Whether this property is always required in SD output, default false.
+     * @param int    $type Instance of Object_Enum_Type
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_uri, $id, $required = false, $type = Object_Type_Enum::POST ) {
+
+        $this->url      = $entity_uri;
+        $this->id       = $id;
+        $this->required = $required;
+        $this->type     = $type;
+
+    }
+
+    /**
+     * Return the type of the reference, one of the values in Object_Type_Enum
+     *
+     * @return int
+     * @since 3.38.0
+     */
+    public function get_type() {
+        return $this->type;
+    }
+
+    /**
+     * Get the URL associated with this entity reference.
+     *
+     * @return string The URL associated with the entity reference.
+     * @since 3.8.0
+     */
+    public function get_url() {
+
+        return $this->url;
+    }
+
+    /**
+     * Get the entity id.
+     *
+     * @return int The entity id.
+     * @since 3.10.0
+     */
+    public function get_id() {
+
+        return $this->id;
+    }
+
+    /**
+     * Get the required flag for this {@link Wordlift_Property_Entity_Reference}.
+     *
+     * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
+     * property needs to be output to SD (JSON-LD).
+     *
+     * @since 3.27.1
+     */
+    public function get_required() {
+
+        return $this->required;
+
+    }
+
+    /**
+     * Set the required flag for this {@link Wordlift_Property_Entity_Reference}.
+     *
+     * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
+     * property needs to be output to SD (JSON-LD).
+     *
+     * @param bool $value
+     *
+     * @since 3.27.1
+     */
+    public function set_required( $value ) {
+
+        $this->required = $value;
+
+    }
+
+    public function to_reference() {
+
+        if ( Object_Type_Enum::POST === $this->type ) {
+            return new Post_Reference( $this->id );
+        }
+        if ( Object_Type_Enum::TERM === $this->type ) {
+            return new Term_Reference( $this->id );
+        }
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_uri, $id, $required = false, $type = Object_Type_Enum::POST ) {
+	public function __construct($entity_uri, $id, $required = false, $type = Object_Type_Enum::POST) {
 
 		$this->url      = $entity_uri;
 		$this->id       = $id;
@@ -120,7 +120,7 @@ 
 	 *
 	 * @since 3.27.1
 	 */
-	public function set_required( $value ) {
+	public function set_required($value) {
 
 		$this->required = $value;
 
@@ -128,11 +128,11 @@ 
 
 	public function to_reference() {
 
-		if ( Object_Type_Enum::POST === $this->type ) {
-			return new Post_Reference( $this->id );
+		if (Object_Type_Enum::POST === $this->type) {
+			return new Post_Reference($this->id);
 		}
-		if ( Object_Type_Enum::TERM === $this->type ) {
-			return new Term_Reference( $this->id );
+		if (Object_Type_Enum::TERM === $this->type) {
+			return new Term_Reference($this->id);
 		}
 	}
 

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-post-to-jsonld-converter.php

Indentation +400 added lines, -400 removed lines

@@ -18,424 +18,424 @@
  */
 class Wordlift_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * @var Wordlift_Post_To_Jsonld_Converter
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * @var false
-	 */
-	private $disable_convert_filters;
-
-	/**
-	 * Wordlift_Post_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.
-	 *
-	 * @since 3.10.0
-	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
-		$this->disable_convert_filters = $disable_convert_filters;
-		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
-
-		self::$instance = $this;
-
-	}
-
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	public function new_instance_with_filters_disabled() {
-		return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
-	}
-
-	/**
-	 * 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 post id.
-	 * @param array<Reference> $references An array of entity references.
-	 * @param array            $references_infos
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.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.
-		$jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
-
-		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
-			$jsonld['@type'] = 'WebPage';
-		}
-
-		// Get the entity name.
-		$jsonld['headline'] = $post->post_title;
-
-		$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 );
-		}
-
-		// Set the published and modified dates.
-		/*
+    /**
+     * @var Wordlift_Post_To_Jsonld_Converter
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * @var false
+     */
+    private $disable_convert_filters;
+
+    /**
+     * Wordlift_Post_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.
+     *
+     * @since 3.10.0
+     */
+    public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
+        parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
+        $this->disable_convert_filters = $disable_convert_filters;
+        // Set a reference to the logger.
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+
+        self::$instance = $this;
+
+    }
+
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    public function new_instance_with_filters_disabled() {
+        return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
+    }
+
+    /**
+     * 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 post id.
+     * @param array<Reference> $references An array of entity references.
+     * @param array            $references_infos
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.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.
+        $jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
+
+        // Set WebPage by default.
+        if ( empty( $jsonld['@type'] ) ) {
+            $jsonld['@type'] = 'WebPage';
+        }
+
+        // Get the entity name.
+        $jsonld['headline'] = $post->post_title;
+
+        $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 );
+        }
+
+        // Set the published and modified dates.
+        /*
 		 * Set the `datePublished` and `dateModified` using the local timezone.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/887
 		 *
 		 * @since 3.20.0
 		 */
-		try {
-			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-		}
-
-		// Get the word count for the post.
-		/*
+        try {
+            $default_timezone = date_default_timezone_get();
+            $timezone         = get_option( 'timezone_string' );
+            if ( ! empty( $timezone ) ) {
+                date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+                $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
+                $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
+                date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+            } else {
+                $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+                $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+            }
+        } catch ( Exception $e ) {
+            $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+            $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+        }
+
+        // Get the word count for the post.
+        /*
 		 * Do not display the `wordCount` on a `WebPage`.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/888
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
-			$jsonld['wordCount'] = $post_adapter->word_count();
-		}
+        if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter        = new Wordlift_Post_Adapter( $post_id );
+            $jsonld['wordCount'] = $post_adapter->word_count();
+        }
 
-		/*
+        /*
 		 * Add keywords, articleSection, commentCount and inLanguage properties to `Article` JSON-LD
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1140
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
-			$keywords        = $post_adapter->keywords();
-			$article_section = $post_adapter->article_section();
-			$comment_count   = $post_adapter->comment_count();
-			$locale          = $post_adapter->locale();
-
-			if ( isset( $keywords ) ) {
-				$jsonld['keywords'] = $keywords;
-			}
-			if ( ! empty( $article_section ) ) {
-				$jsonld['articleSection'] = $article_section;
-			}
-			$jsonld['commentCount'] = $comment_count;
-			$jsonld['inLanguage']   = $locale;
-		}
-
-		// Set the publisher.
-		$this->set_publisher( $jsonld );
-
-		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
-
-		// Return the JSON-LD if filters are disabled by the client.
-		if ( $this->disable_convert_filters ) {
-			return $jsonld;
-		}
-
-		/**
-		 * 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.
-		 * @type Relations $relations A set of `Relation`s.
-		 * }
-		 * @since 3.25.0
-		 * @since 3.43.0 The filter provides a `Relations` instance.
-		 *
-		 * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
-		 *
-		 * @api
-		 */
-		$ret_val = apply_filters(
-			'wl_post_jsonld_array',
-			array(
-				'jsonld'           => $jsonld,
-				'references'       => $references, // This one is only an array of post IDs.
-				'references_infos' => $references_infos,
-				'relations'        => $relations,
-			),
-			$post_id
-		);
-
-		$jsonld     = $ret_val['jsonld'];
-		$references = $ret_val['references'];
-
-		/**
-		 * Call the `wl_post_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.14.0
-		 *
-		 * @api
-		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
-	}
-
-	/**
-	 * Get the author's JSON-LD fragment.
-	 *
-	 * The JSON-LD fragment is generated using the {@link WP_User}'s data or
-	 * the referenced entity if configured for the {@link WP_User}.
-	 *
-	 * @param int   $author_id The author {@link WP_User}'s `id`.
-	 * @param array $references An array of referenced entities.
-	 *
-	 * @return string|array A JSON-LD structure.
-	 * @since 3.14.0
-	 */
-	public function get_author( $author_id, &$references ) {
-
-		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
-
-		// If there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
-
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
-
-			return array(
-				'@type'      => 'Person',
-				'@id'        => $author_uri,
-				'name'       => $author,
-				'givenName'  => $author_first_name,
-				'familyName' => $author_last_name,
-				'url'        => get_author_posts_url( $author_id ),
-			);
-		}
-
-		// Add the author to the references.
-		$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
-		$references[] = $entity_id;
-
-		// Return the JSON-LD for the referenced entity.
-		return array(
-			'@id' => $author_uri,
-		);
-	}
-
-	/**
-	 * Enrich the provided params array with publisher data, if available.
-	 *
-	 * @param array $params The parameters array.
-	 *
-	 * @since 3.10.0
-	 */
-	protected function set_publisher( &$params ) {
-
-		// If the publisher id isn't set don't do anything.
-		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-		if ( null === $publisher_id ) {
-			return;
-		}
-
-		// Get the post instance.
-		$post = get_post( $publisher_id );
-		if ( null === $post ) {
-			// Publisher not found.
-			return;
-		}
-
-		// Get the item id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
-
-		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
-
-		// Get the name.
-		$name = $post->post_title;
-
-		// Set the publisher data.
-		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
-			'@id'   => $id,
-			'name'  => $name,
-		);
-
-		// Add the sameAs values associated with the publisher.
-		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
-			$params['publisher']['sameAs'] = $sameas;
-		}
-
-		// Set the logo, only for http://schema.org/Organization as Person doesn't
-		// support the logo property.
-		//
-		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
-			return;
-		}
-
-		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
-
-		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
-			return;
-		}
-
-		// Copy over some useful properties.
-		//
-		// See https://developers.google.com/search/docs/data-types/articles.
-		$params['publisher']['logo']['@type'] = 'ImageObject';
-		$params['publisher']['logo']['url']   = $publisher_logo['url'];
-
-		// If you specify a "width" or "height" value you should leave out
-		// 'px'. For example: "width":"4608px" should be "width":"4608".
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		$params['publisher']['logo']['width']  = $publisher_logo['width'];
-		$params['publisher']['logo']['height'] = $publisher_logo['height'];
-
-	}
-
-	/**
-	 * Get the publisher logo structure.
-	 *
-	 * The function returns false when the publisher logo cannot be determined, i.e.:
-	 *  - the post has no featured image.
-	 *  - the featured image has no file.
-	 *  - a wp_image_editor instance cannot be instantiated on the original file or on the publisher logo file.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|false Returns an array with the `url`, `width` and `height` for the publisher logo or false in case
-	 *  of errors.
-	 * @since 3.19.2
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
-	 */
-	private function get_publisher_logo( $post_id ) {
-
-		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
-
-		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
-
-			return false;
-		}
-
-		// Get the uploads base URL.
-		$uploads_dir = wp_upload_dir();
-
-		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
-
-		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
-
-			return false;
-		}
-
-		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
-
-		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
-
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
-				return array(
-					'url'    => $attachment_image_src[0],
-					'width'  => $attachment_image_src[1],
-					'height' => $attachment_image_src[2],
-				);
-			}
-
-			// Bail out if we cant fetch wp_get_attachment_image_src
-			return false;
-
-		}
-
-		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
-
-			return false;
-		}
-
-		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
-		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
-
-		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
-		}
-
-		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
-
-			return false;
-		}
-
-		// Get the actual size.
-		$size = $publisher_logo_editor->get_size();
-
-		// Finally return the array with data.
-		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
-			'width'  => $size['width'],
-			'height' => $size['height'],
-		);
-	}
+        if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter    = new Wordlift_Post_Adapter( $post_id );
+            $keywords        = $post_adapter->keywords();
+            $article_section = $post_adapter->article_section();
+            $comment_count   = $post_adapter->comment_count();
+            $locale          = $post_adapter->locale();
+
+            if ( isset( $keywords ) ) {
+                $jsonld['keywords'] = $keywords;
+            }
+            if ( ! empty( $article_section ) ) {
+                $jsonld['articleSection'] = $article_section;
+            }
+            $jsonld['commentCount'] = $comment_count;
+            $jsonld['inLanguage']   = $locale;
+        }
+
+        // Set the publisher.
+        $this->set_publisher( $jsonld );
+
+        // Finally set the author.
+        $jsonld['author'] = $this->get_author( $post->post_author, $references );
+
+        // Return the JSON-LD if filters are disabled by the client.
+        if ( $this->disable_convert_filters ) {
+            return $jsonld;
+        }
+
+        /**
+         * 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.
+         * @type Relations $relations A set of `Relation`s.
+         * }
+         * @since 3.25.0
+         * @since 3.43.0 The filter provides a `Relations` instance.
+         *
+         * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
+         *
+         * @api
+         */
+        $ret_val = apply_filters(
+            'wl_post_jsonld_array',
+            array(
+                'jsonld'           => $jsonld,
+                'references'       => $references, // This one is only an array of post IDs.
+                'references_infos' => $references_infos,
+                'relations'        => $relations,
+            ),
+            $post_id
+        );
+
+        $jsonld     = $ret_val['jsonld'];
+        $references = $ret_val['references'];
+
+        /**
+         * Call the `wl_post_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.14.0
+         *
+         * @api
+         */
+        return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+    }
+
+    /**
+     * Get the author's JSON-LD fragment.
+     *
+     * The JSON-LD fragment is generated using the {@link WP_User}'s data or
+     * the referenced entity if configured for the {@link WP_User}.
+     *
+     * @param int   $author_id The author {@link WP_User}'s `id`.
+     * @param array $references An array of referenced entities.
+     *
+     * @return string|array A JSON-LD structure.
+     * @since 3.14.0
+     */
+    public function get_author( $author_id, &$references ) {
+
+        // Get the entity bound to this user.
+        $entity_id = $this->user_service->get_entity( $author_id );
+
+        // If there's no entity bound return a simple author structure.
+        if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+
+            $author            = get_the_author_meta( 'display_name', $author_id );
+            $author_first_name = get_the_author_meta( 'first_name', $author_id );
+            $author_last_name  = get_the_author_meta( 'last_name', $author_id );
+            $author_uri        = $this->user_service->get_uri( $author_id );
+
+            return array(
+                '@type'      => 'Person',
+                '@id'        => $author_uri,
+                'name'       => $author,
+                'givenName'  => $author_first_name,
+                'familyName' => $author_last_name,
+                'url'        => get_author_posts_url( $author_id ),
+            );
+        }
+
+        // Add the author to the references.
+        $author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+        $references[] = $entity_id;
+
+        // Return the JSON-LD for the referenced entity.
+        return array(
+            '@id' => $author_uri,
+        );
+    }
+
+    /**
+     * Enrich the provided params array with publisher data, if available.
+     *
+     * @param array $params The parameters array.
+     *
+     * @since 3.10.0
+     */
+    protected function set_publisher( &$params ) {
+
+        // If the publisher id isn't set don't do anything.
+        $publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
+        if ( null === $publisher_id ) {
+            return;
+        }
+
+        // Get the post instance.
+        $post = get_post( $publisher_id );
+        if ( null === $post ) {
+            // Publisher not found.
+            return;
+        }
+
+        // Get the item id.
+        $id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
+
+        // Get the type.
+        $type = $this->entity_type_service->get( $publisher_id );
+
+        // Get the name.
+        $name = $post->post_title;
+
+        // Set the publisher data.
+        $params['publisher'] = array(
+            '@type' => $this->relative_to_context( $type['uri'] ),
+            '@id'   => $id,
+            'name'  => $name,
+        );
+
+        // Add the sameAs values associated with the publisher.
+        $storage_factory = Wordlift_Storage_Factory::get_instance();
+        $sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
+        if ( ! empty( $sameas ) ) {
+            $params['publisher']['sameAs'] = $sameas;
+        }
+
+        // Set the logo, only for http://schema.org/Organization as Person doesn't
+        // support the logo property.
+        //
+        // See http://schema.org/logo.
+        if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+            return;
+        }
+
+        // Get the publisher logo.
+        $publisher_logo = $this->get_publisher_logo( $post->ID );
+
+        // Bail out if the publisher logo isn't set.
+        if ( false === $publisher_logo ) {
+            return;
+        }
+
+        // Copy over some useful properties.
+        //
+        // See https://developers.google.com/search/docs/data-types/articles.
+        $params['publisher']['logo']['@type'] = 'ImageObject';
+        $params['publisher']['logo']['url']   = $publisher_logo['url'];
+
+        // If you specify a "width" or "height" value you should leave out
+        // 'px'. For example: "width":"4608px" should be "width":"4608".
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/451.
+        $params['publisher']['logo']['width']  = $publisher_logo['width'];
+        $params['publisher']['logo']['height'] = $publisher_logo['height'];
+
+    }
+
+    /**
+     * Get the publisher logo structure.
+     *
+     * The function returns false when the publisher logo cannot be determined, i.e.:
+     *  - the post has no featured image.
+     *  - the featured image has no file.
+     *  - a wp_image_editor instance cannot be instantiated on the original file or on the publisher logo file.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|false Returns an array with the `url`, `width` and `height` for the publisher logo or false in case
+     *  of errors.
+     * @since 3.19.2
+     * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
+     */
+    private function get_publisher_logo( $post_id ) {
+
+        // Get the featured image for the post.
+        $thumbnail_id = get_post_thumbnail_id( $post_id );
+
+        // Bail out if thumbnail not available.
+        if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
+            $this->log->info( "Featured image not set for post $post_id." );
+
+            return false;
+        }
+
+        // Get the uploads base URL.
+        $uploads_dir = wp_upload_dir();
+
+        // Get the attachment metadata.
+        $metadata = wp_get_attachment_metadata( $thumbnail_id );
+
+        // Bail out if the file isn't set.
+        if ( ! isset( $metadata['file'] ) ) {
+            $this->log->warn( "Featured image file not found for post $post_id." );
+
+            return false;
+        }
+
+        // Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
+        $path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+
+        // Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
+        if ( ! file_exists( $path ) ) {
+            $this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+
+            $attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
+            if ( $attachment_image_src ) {
+                return array(
+                    'url'    => $attachment_image_src[0],
+                    'width'  => $attachment_image_src[1],
+                    'height' => $attachment_image_src[2],
+                );
+            }
+
+            // Bail out if we cant fetch wp_get_attachment_image_src
+            return false;
+
+        }
+
+        // Try to get the image editor and bail out if the editor cannot be instantiated.
+        $original_file_editor = wp_get_image_editor( $path );
+        if ( is_wp_error( $original_file_editor ) ) {
+            $this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+
+            return false;
+        }
+
+        // Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
+        // and we don't actually know the end values.
+        $publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+
+        // If the file doesn't exist yet, create it.
+        if ( ! file_exists( $publisher_logo_path ) ) {
+            $original_file_editor->resize( 600, 60 );
+            $original_file_editor->save( $publisher_logo_path );
+        }
+
+        // Try to get the image editor and bail out if the editor cannot be instantiated.
+        $publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
+        if ( is_wp_error( $publisher_logo_editor ) ) {
+            $this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+
+            return false;
+        }
+
+        // Get the actual size.
+        $size = $publisher_logo_editor->get_size();
+
+        // Finally return the array with data.
+        return array(
+            'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+            'width'  => $size['width'],
+            'height' => $size['height'],
+        );
+    }
 
 }

Spacing +77 added lines, -77 removed lines

@@ -46,11 +46,11 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
+	public function __construct($entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false) {
+		parent::__construct($entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create());
 		$this->disable_convert_filters = $disable_convert_filters;
 		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Post_To_Jsonld_Converter');
 
 		self::$instance = $this;
 
@@ -62,7 +62,7 @@ 
 	}
 
 	public function new_instance_with_filters_disabled() {
-		return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
+		return new static($this->entity_type_service, $this->user_service, $this->attachment_service, true);
 	}
 
 	/**
@@ -76,30 +76,30 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.10.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.
-		$jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
+		$jsonld = parent::convert($post_id, $references, $references_infos, $relations);
 
 		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
+		if (empty($jsonld['@type'])) {
 			$jsonld['@type'] = 'WebPage';
 		}
 
 		// Get the entity name.
 		$jsonld['headline'] = $post->post_title;
 
-		$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);
 		}
 
 		// Set the published and modified dates.
@@ -112,19 +112,19 @@ 
 		 */
 		try {
 			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+			$timezone         = get_option('timezone_string');
+			if ( ! empty($timezone)) {
+				date_default_timezone_set($timezone); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i:sP', false, $post);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i:sP', false, $post);
+				date_default_timezone_set($default_timezone); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
 			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+		} catch (Exception $e) {
+			$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+			$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 		}
 
 		// Get the word count for the post.
@@ -135,8 +135,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter        = new Wordlift_Post_Adapter($post_id);
 			$jsonld['wordCount'] = $post_adapter->word_count();
 		}
 
@@ -147,17 +147,17 @@ 
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter    = new Wordlift_Post_Adapter($post_id);
 			$keywords        = $post_adapter->keywords();
 			$article_section = $post_adapter->article_section();
 			$comment_count   = $post_adapter->comment_count();
 			$locale          = $post_adapter->locale();
 
-			if ( isset( $keywords ) ) {
+			if (isset($keywords)) {
 				$jsonld['keywords'] = $keywords;
 			}
-			if ( ! empty( $article_section ) ) {
+			if ( ! empty($article_section)) {
 				$jsonld['articleSection'] = $article_section;
 			}
 			$jsonld['commentCount'] = $comment_count;
@@ -165,13 +165,13 @@ 
 		}
 
 		// Set the publisher.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
+		$jsonld['author'] = $this->get_author($post->post_author, $references);
 
 		// Return the JSON-LD if filters are disabled by the client.
-		if ( $this->disable_convert_filters ) {
+		if ($this->disable_convert_filters) {
 			return $jsonld;
 		}
 
@@ -216,7 +216,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+		return apply_filters('wl_post_jsonld', $jsonld, $post_id, $references);
 	}
 
 	/**
@@ -231,18 +231,18 @@ 
 	 * @return string|array A JSON-LD structure.
 	 * @since 3.14.0
 	 */
-	public function get_author( $author_id, &$references ) {
+	public function get_author($author_id, &$references) {
 
 		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
+		$entity_id = $this->user_service->get_entity($author_id);
 
 		// If there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+		if (empty($entity_id) || 'publish' !== get_post_status($entity_id)) {
 
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
+			$author            = get_the_author_meta('display_name', $author_id);
+			$author_first_name = get_the_author_meta('first_name', $author_id);
+			$author_last_name  = get_the_author_meta('last_name', $author_id);
+			$author_uri        = $this->user_service->get_uri($author_id);
 
 			return array(
 				'@type'      => 'Person',
@@ -250,12 +250,12 @@ 
 				'name'       => $author,
 				'givenName'  => $author_first_name,
 				'familyName' => $author_last_name,
-				'url'        => get_author_posts_url( $author_id ),
+				'url'        => get_author_posts_url($author_id),
 			);
 		}
 
 		// Add the author to the references.
-		$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+		$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri($entity_id);
 		$references[] = $entity_id;
 
 		// Return the JSON-LD for the referenced entity.
@@ -271,41 +271,41 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	protected function set_publisher( &$params ) {
+	protected function set_publisher(&$params) {
 
 		// If the publisher id isn't set don't do anything.
 		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-		if ( null === $publisher_id ) {
+		if (null === $publisher_id) {
 			return;
 		}
 
 		// Get the post instance.
-		$post = get_post( $publisher_id );
-		if ( null === $post ) {
+		$post = get_post($publisher_id);
+		if (null === $post) {
 			// Publisher not found.
 			return;
 		}
 
 		// Get the item id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
+		$id = Wordlift_Entity_Service::get_instance()->get_uri($publisher_id);
 
 		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
+		$type = $this->entity_type_service->get($publisher_id);
 
 		// Get the name.
 		$name = $post->post_title;
 
 		// Set the publisher data.
 		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
+			'@type' => $this->relative_to_context($type['uri']),
 			'@id'   => $id,
 			'name'  => $name,
 		);
 
 		// Add the sameAs values associated with the publisher.
 		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
+		$sameas          = $storage_factory->post_meta(Wordlift_Schema_Service::FIELD_SAME_AS)->get($publisher_id);
+		if ( ! empty($sameas)) {
 			$params['publisher']['sameAs'] = $sameas;
 		}
 
@@ -313,15 +313,15 @@ 
 		// support the logo property.
 		//
 		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+		if (1 !== preg_match('~Organization$~', $type['uri'])) {
 			return;
 		}
 
 		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
+		$publisher_logo = $this->get_publisher_logo($post->ID);
 
 		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
+		if (false === $publisher_logo) {
 			return;
 		}
 
@@ -355,14 +355,14 @@ 
 	 * @since 3.19.2
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
 	 */
-	private function get_publisher_logo( $post_id ) {
+	private function get_publisher_logo($post_id) {
 
 		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
+		$thumbnail_id = get_post_thumbnail_id($post_id);
 
 		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
+		if (empty($thumbnail_id) || 0 === $thumbnail_id) {
+			$this->log->info("Featured image not set for post $post_id.");
 
 			return false;
 		}
@@ -371,24 +371,24 @@ 
 		$uploads_dir = wp_upload_dir();
 
 		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
+		$metadata = wp_get_attachment_metadata($thumbnail_id);
 
 		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
+		if ( ! isset($metadata['file'])) {
+			$this->log->warn("Featured image file not found for post $post_id.");
 
 			return false;
 		}
 
 		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+		$path = $uploads_dir['basedir'].DIRECTORY_SEPARATOR.$metadata['file'];
 
 		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+		if ( ! file_exists($path)) {
+			$this->log->warn("Featured image file $path doesn't exist for post $post_id.");
 
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
+			$attachment_image_src = wp_get_attachment_image_src($thumbnail_id, '');
+			if ($attachment_image_src) {
 				return array(
 					'url'    => $attachment_image_src[0],
 					'width'  => $attachment_image_src[1],
@@ -402,27 +402,27 @@ 
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+		$original_file_editor = wp_get_image_editor($path);
+		if (is_wp_error($original_file_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $path for post $post_id.");
 
 			return false;
 		}
 
 		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
 		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+		$publisher_logo_path = $original_file_editor->generate_filename('-publisher-logo');
 
 		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
+		if ( ! file_exists($publisher_logo_path)) {
+			$original_file_editor->resize(600, 60);
+			$original_file_editor->save($publisher_logo_path);
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+		$publisher_logo_editor = wp_get_image_editor($publisher_logo_path);
+		if (is_wp_error($publisher_logo_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id.");
 
 			return false;
 		}
@@ -432,7 +432,7 @@ 
 
 		// Finally return the array with data.
 		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+			'url'    => $uploads_dir['baseurl'].substr($publisher_logo_path, strlen($uploads_dir['basedir'])),
 			'width'  => $size['width'],
 			'height' => $size['height'],
 		);

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/class-wordlift-entity-service.php

Indentation +586 added lines, -586 removed lines

@@ -21,507 +21,507 @@ 
  */
 class Wordlift_Entity_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	private $relation_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * The entity post type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const TYPE_NAME = 'entity';
-
-	/**
-	 * The alternative label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
-
-	/**
-	 * The alternative label input template.
-	 *
-	 * @since 3.2.0
-	 */
-	// TODO: this should be moved to a class that deals with HTML code.
-	const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
+    /**
+     * The Log service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Relation_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    private $relation_service;
+
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    /**
+     * The entity post type name.
+     *
+     * @since 3.1.0
+     */
+    const TYPE_NAME = 'entity';
+
+    /**
+     * The alternative label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
+
+    /**
+     * The alternative label input template.
+     *
+     * @since 3.2.0
+     */
+    // TODO: this should be moved to a class that deals with HTML code.
+    const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
                 <label class="screen-reader-text" id="wl-alternative-label-prompt-text" for="wl-alternative-label">Enter alternative label here</label>
                 <input name="wl_alternative_label[]" size="30" value="%s" id="wl-alternative-label" type="text">
                 <button class="button wl-delete-button">%s</button>
                 </div>';
 
-	/**
-	 * Create a Wordlift_Entity_Service instance.
-	 *
-	 * @throws Exception if the `$content_service` is not of the `Content_Service` type.
-	 * @since 3.2.0
-	 */
-	protected function __construct() {
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		$this->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
-		$this->relation_service   = Wordlift_Relation_Service::get_instance();
-
-	}
-
-	/**
-	 * A singleton instance of the Entity service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $instance A singleton instance of the Entity service.
-	 */
-	private static $instance = null;
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @return Wordlift_Entity_Service The singleton instance of the Entity service.
-	 * @since 3.2.0
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Determines whether a post is an entity or not. Entity is in this context
-	 * something which is not an article.
-	 *
-	 * @param int $post_id A post id.
-	 *
-	 * @return bool Return true if the post is an entity otherwise false.
-	 * @since 3.1.0
-	 */
-	public function is_entity( $post_id ) {
-
-		// Improve performance by giving for granted that a product is an entity.
-		if ( 'product' === get_post_type( $post_id ) ) {
-			return true;
-		}
-
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( is_wp_error( $terms ) ) {
-			$this->log->error( "Cannot get the terms for post $post_id: " . $terms->get_error_message() );
-
-			return false;
-		}
-
-		if ( empty( $terms ) ) {
-			return false;
-		}
-
-		/*
+    /**
+     * Create a Wordlift_Entity_Service instance.
+     *
+     * @throws Exception if the `$content_service` is not of the `Content_Service` type.
+     * @since 3.2.0
+     */
+    protected function __construct() {
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        $this->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
+        $this->relation_service   = Wordlift_Relation_Service::get_instance();
+
+    }
+
+    /**
+     * A singleton instance of the Entity service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var Wordlift_Entity_Service $instance A singleton instance of the Entity service.
+     */
+    private static $instance = null;
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @return Wordlift_Entity_Service The singleton instance of the Entity service.
+     * @since 3.2.0
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Determines whether a post is an entity or not. Entity is in this context
+     * something which is not an article.
+     *
+     * @param int $post_id A post id.
+     *
+     * @return bool Return true if the post is an entity otherwise false.
+     * @since 3.1.0
+     */
+    public function is_entity( $post_id ) {
+
+        // Improve performance by giving for granted that a product is an entity.
+        if ( 'product' === get_post_type( $post_id ) ) {
+            return true;
+        }
+
+        $terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( is_wp_error( $terms ) ) {
+            $this->log->error( "Cannot get the terms for post $post_id: " . $terms->get_error_message() );
+
+            return false;
+        }
+
+        if ( empty( $terms ) ) {
+            return false;
+        }
+
+        /*
 		 * We don't consider an `article` to be an entity.
 		 *
 		 * @since 3.20.0 At least one associated mustn't be an `article`.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		foreach ( $terms as $term ) {
-			if ( 1 !== preg_match( '~(^|-)article$~', $term->slug ) ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the proper classification scope for a given entity post
-	 *
-	 * @param integer $post_id An entity post id.
-	 *
-	 * @param string  $default The default classification scope, `what` if not
-	 *                             provided.
-	 *
-	 * @return string Returns a classification scope (e.g. 'what').
-	 * @since 3.5.0
-	 */
-	public function get_classification_scope_for( $post_id, $default = WL_WHAT_RELATION ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return $default;
-		}
-
-		// Retrieve the entity type
-		$entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
-		// Retrieve classification boxes configuration
-		// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_unserialize
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'], true ) ) {
-				return $cb['id'];
-			}
-		}
-
-		return $default;
-	}
-
-	/**
-	 * Check whether a {@link WP_Post} is used.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return bool|null Null if it's not an entity, otherwise true if it's used.
-	 */
-	public function is_used( $post_id ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the post
-		$entity = get_post( $post_id );
-
-		global $wpdb;
-
-		// Perform the query
-		$relation_instances = (int) $wpdb->get_var(
-			$wpdb->prepare(
-				"SELECT COUNT(*) FROM {$wpdb->prefix}wl_relation_instances WHERE  object_id = %d",
-				$entity->ID
-			)
-		);
-		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
-			return true;
-		}
-
-		// Perform the query
-		$meta_instances = (int) $wpdb->get_var(
-			$wpdb->prepare(
-				"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
-				$entity->ID,
-				wl_get_entity_uri( $entity->ID )
-			)
-		);
-
-		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
-			return true;
-		}
-
-		// If we are here, it means the current entity is not used at the moment
-		return false;
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 * @deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
-	 *
-	 * @since      3.16.3 deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
-	 * @since      3.2.0
-	 */
-	public function get_entity_post_by_uri( $uri ) {
-
-		return $this->entity_uri_service->get_entity( $uri );
-	}
-
-	/**
-	 * Fires once a post has been saved. This function uses the $_REQUEST, therefore
-	 * we check that the post we're saving is the current post.
-	 *
-	 * This function is called by a hook, so we're not the ones that need to check the `nonce`.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/363
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int     $post_id Post ID.
-	 * @param WP_Post $post Post object.
-	 */
-	public function save_post( $post_id, $post ) {
-		// Avoid doing anything if post is autosave or a revision.
-		if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
-			return;
-		}
-
-		// We expect a numeric value here.
-		if ( ! isset( $_REQUEST['post_ID'] ) || ! is_numeric( $_REQUEST['post_ID'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return;
-		}
-
-		// Get the numeric post ID from the request.
-		$request_post_id = intval( $_REQUEST['post_ID'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-		// We're setting the alternative label that have been provided via the UI
-		// (in fact we're using $_REQUEST), while save_post may be also called
-		// programmatically by some other function: we need to check therefore if
-		// the $post_id in the save_post call matches the post id set in the request.
-		//
-		// If this is not the current post being saved or if it's not an entity, return.
-		if ( $request_post_id !== $post_id || ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-
-		if ( isset( $_REQUEST['wl_alternative_label'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$data = filter_var_array( $_REQUEST, array( 'wl_alternative_label' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			// Get the alt labels from the request (or empty array).
-			$alt_labels = isset( $data['wl_alternative_label'] ) ? $data['wl_alternative_label'] : array();
-			// This is via classic editor, so set the alternative labels.
-			$this->set_alternative_labels( $post_id, $alt_labels );
-		}
-
-	}
-
-	/**
-	 * Set the alternative labels.
-	 *
-	 * @param int   $post_id The post id.
-	 * @param array $alt_labels An array of labels.
-	 *
-	 * @since 3.2.0
-	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
-
-		// Bail out if post id is not numeric. We add this check as we found a WP install that was sending a WP_Error
-		// instead of post id.
-		if ( ! is_numeric( $post_id ) ) {
-			return;
-		}
-
-		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
-		}
-
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . ' ]' );
-
-		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-
-		// Save only unique synonymns.
-		$alt_labels = array_unique( $alt_labels );
-
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-
-			// Strip html code from synonym.
-			$alt_label = wp_strip_all_tags( $alt_label );
-
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label );
-			}
-		}
-
-	}
-
-	public function append_alternative_labels( $post_id, $labels_to_append ) {
-
-		$merged_labels = $this->get_alternative_labels( $post_id );
-
-		// Append new synonyms to the end.
-		$merged_labels = array_merge( $merged_labels, $labels_to_append );
-
-		$this->set_alternative_labels( $post_id, $merged_labels );
-
-	}
-
-	/**
-	 * Retrieve the alternate labels.
-	 *
-	 * @param int $post_id Post id.
-	 *
-	 * @return mixed An array  of alternative labels.
-	 * @since 3.2.0
-	 */
-	public function get_alternative_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-	}
-
-	/**
-	 * Retrieve the labels for an entity, i.e. the title + the synonyms.
-	 *
-	 * @param int $id The entity {@link WP_Post} id.
-	 * @param int $object_type The object type {@link Object_Type_Enum}
-	 *
-	 * @return array An array with the entity title and labels.
-	 * @since 3.12.0
-	 */
-	public function get_labels( $id, $object_type = Object_Type_Enum::POST ) {
-		if ( Object_Type_Enum::POST === $object_type ) {
-			return array_merge( (array) get_the_title( $id ), $this->get_alternative_labels( $id ) );
-		}
-
-		if ( Object_Type_Enum::TERM === $object_type ) {
-			$term = get_term( $id );
-			if ( ! is_a( $term, 'WP_Term' ) ) {
-				return array();
-			}
-
-			// @@todo add support for terms' synonyms.
-			return (array) $term->name;
-		}
-
-		return array();
-	}
-
-	/**
-	 * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
-	 *
-	 * @param WP_Post $post Post object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function edit_form_before_permalink( $post ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-
-		// If disabled by filter, return.
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__add-synonyms', true ) ) {
-			return;
-		}
-
-		// Print the input template.
-		Wordlift_UI_Service::print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
-
-		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
-
-			echo wp_kses( $this->get_alternative_label_input( $alt_label ), Wordlift_UI_Service::get_template_allowed_html() );
-
-		};
-
-		// Print the button.
-		Wordlift_UI_Service::print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
-
-	}
-
-	public function get_uri( $object_id, $type = Object_Type_Enum::POST ) {
-		$content_service = Wordpress_Content_Service::get_instance();
-		$entity_id       = $content_service->get_entity_id( new Wordpress_Content_Id( $object_id, $type ) );
-		$dataset_uri     = Wordlift_Configuration_Service::get_instance()->get_dataset_uri();
-
-		if ( ! isset( $entity_id ) ||
-			 ( ! empty( $dataset_uri ) && 0 !== strpos( $entity_id, $dataset_uri ) ) ) {
-			$rel_uri = Entity_Uri_Generator::create_uri( $type, $object_id );
-			try {
-				$content_service->set_entity_id( new Wordpress_Content_Id( $object_id, $type ), $rel_uri );
-				$entity_id = $content_service->get_entity_id( new Wordpress_Content_Id( $object_id, $type ) );
-			} catch ( Exception $e ) {
-				return null;
-			}
-		}
-
-		return $entity_id;
-	}
-
-	/**
-	 * Get the alternative label input HTML code.
-	 *
-	 * @param string $value The input value.
-	 *
-	 * @return string The input HTML code.
-	 * @since 3.2.0
-	 */
-	private function get_alternative_label_input( $value = '' ) {
-
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), esc_html__( 'Delete', 'wordlift' ) );
-	}
-
-	/**
-	 * Get the number of entity posts published in this blog.
-	 *
-	 * @return int The number of published entity posts.
-	 * @since 3.6.0
-	 */
-	public function count() {
-		global $wpdb;
-
-		// Try to get the count from the transient.
-		$count = get_transient( '_wl_entity_service__count' );
-		if ( false !== $count ) {
-			return $count;
-		}
-
-		// Query the count.
-		$count = $wpdb->get_var(
-			$wpdb->prepare(
-				'SELECT COUNT( DISTINCT( tr.object_id ) )'
-				. " FROM {$wpdb->term_relationships} tr"
-				. " INNER JOIN {$wpdb->term_taxonomy} tt"
-				. '  ON tt.taxonomy = %s AND tt.term_taxonomy_id = tr.term_taxonomy_id'
-				. " INNER JOIN {$wpdb->terms} t"
-				. '  ON t.term_id = tt.term_id AND t.name != %s',
-				Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'article'
-			)
-		);
-
-		// Store the count in cache.
-		set_transient( '_wl_entity_service__count', $count, 900 );
-
-		return $count;
-	}
-
-	/**
-	 * Add the entity filtering criterias to the arguments for a `get_posts`
-	 * call.
-	 *
-	 * @param array $args The arguments for a `get_posts` call.
-	 *
-	 * @return array The arguments for a `get_posts` call.
-	 * @since 3.15.0
-	 */
-	public static function add_criterias( $args ) {
-
-		// Build an optimal tax-query.
-		$tax_query = array(
-			'relation' => 'AND',
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'operator' => 'EXISTS',
-			),
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'article',
-				'operator' => 'NOT IN',
-			),
-		);
-
-		return $args + array(
-			'post_type' => self::valid_entity_post_types(),
-			/*
+        foreach ( $terms as $term ) {
+            if ( 1 !== preg_match( '~(^|-)article$~', $term->slug ) ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the proper classification scope for a given entity post
+     *
+     * @param integer $post_id An entity post id.
+     *
+     * @param string  $default The default classification scope, `what` if not
+     *                             provided.
+     *
+     * @return string Returns a classification scope (e.g. 'what').
+     * @since 3.5.0
+     */
+    public function get_classification_scope_for( $post_id, $default = WL_WHAT_RELATION ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return $default;
+        }
+
+        // Retrieve the entity type
+        $entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+        $entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+        // Retrieve classification boxes configuration
+        // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_unserialize
+        $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+        foreach ( $classification_boxes as $cb ) {
+            if ( in_array( $entity_type, $cb['registeredTypes'], true ) ) {
+                return $cb['id'];
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Check whether a {@link WP_Post} is used.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return bool|null Null if it's not an entity, otherwise true if it's used.
+     */
+    public function is_used( $post_id ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the post
+        $entity = get_post( $post_id );
+
+        global $wpdb;
+
+        // Perform the query
+        $relation_instances = (int) $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT COUNT(*) FROM {$wpdb->prefix}wl_relation_instances WHERE  object_id = %d",
+                $entity->ID
+            )
+        );
+        // If there is at least one relation instance for the current entity, then it's used
+        if ( 0 < $relation_instances ) {
+            return true;
+        }
+
+        // Perform the query
+        $meta_instances = (int) $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
+                $entity->ID,
+                wl_get_entity_uri( $entity->ID )
+            )
+        );
+
+        // If there is at least one meta that refers the current entity uri, then current entity is used
+        if ( 0 < $meta_instances ) {
+            return true;
+        }
+
+        // If we are here, it means the current entity is not used at the moment
+        return false;
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     * @deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
+     *
+     * @since      3.16.3 deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
+     * @since      3.2.0
+     */
+    public function get_entity_post_by_uri( $uri ) {
+
+        return $this->entity_uri_service->get_entity( $uri );
+    }
+
+    /**
+     * Fires once a post has been saved. This function uses the $_REQUEST, therefore
+     * we check that the post we're saving is the current post.
+     *
+     * This function is called by a hook, so we're not the ones that need to check the `nonce`.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/363
+     *
+     * @since 3.2.0
+     *
+     * @param int     $post_id Post ID.
+     * @param WP_Post $post Post object.
+     */
+    public function save_post( $post_id, $post ) {
+        // Avoid doing anything if post is autosave or a revision.
+        if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
+            return;
+        }
+
+        // We expect a numeric value here.
+        if ( ! isset( $_REQUEST['post_ID'] ) || ! is_numeric( $_REQUEST['post_ID'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return;
+        }
+
+        // Get the numeric post ID from the request.
+        $request_post_id = intval( $_REQUEST['post_ID'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+        // We're setting the alternative label that have been provided via the UI
+        // (in fact we're using $_REQUEST), while save_post may be also called
+        // programmatically by some other function: we need to check therefore if
+        // the $post_id in the save_post call matches the post id set in the request.
+        //
+        // If this is not the current post being saved or if it's not an entity, return.
+        if ( $request_post_id !== $post_id || ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+
+        if ( isset( $_REQUEST['wl_alternative_label'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $data = filter_var_array( $_REQUEST, array( 'wl_alternative_label' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            // Get the alt labels from the request (or empty array).
+            $alt_labels = isset( $data['wl_alternative_label'] ) ? $data['wl_alternative_label'] : array();
+            // This is via classic editor, so set the alternative labels.
+            $this->set_alternative_labels( $post_id, $alt_labels );
+        }
+
+    }
+
+    /**
+     * Set the alternative labels.
+     *
+     * @param int   $post_id The post id.
+     * @param array $alt_labels An array of labels.
+     *
+     * @since 3.2.0
+     */
+    public function set_alternative_labels( $post_id, $alt_labels ) {
+
+        // Bail out if post id is not numeric. We add this check as we found a WP install that was sending a WP_Error
+        // instead of post id.
+        if ( ! is_numeric( $post_id ) ) {
+            return;
+        }
+
+        // Force $alt_labels to be an array
+        if ( ! is_array( $alt_labels ) ) {
+            $alt_labels = array( $alt_labels );
+        }
+
+        $this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . ' ]' );
+
+        // Delete all the existing alternate labels.
+        delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+
+        // Save only unique synonymns.
+        $alt_labels = array_unique( $alt_labels );
+
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+
+            // Strip html code from synonym.
+            $alt_label = wp_strip_all_tags( $alt_label );
+
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label );
+            }
+        }
+
+    }
+
+    public function append_alternative_labels( $post_id, $labels_to_append ) {
+
+        $merged_labels = $this->get_alternative_labels( $post_id );
+
+        // Append new synonyms to the end.
+        $merged_labels = array_merge( $merged_labels, $labels_to_append );
+
+        $this->set_alternative_labels( $post_id, $merged_labels );
+
+    }
+
+    /**
+     * Retrieve the alternate labels.
+     *
+     * @param int $post_id Post id.
+     *
+     * @return mixed An array  of alternative labels.
+     * @since 3.2.0
+     */
+    public function get_alternative_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+    }
+
+    /**
+     * Retrieve the labels for an entity, i.e. the title + the synonyms.
+     *
+     * @param int $id The entity {@link WP_Post} id.
+     * @param int $object_type The object type {@link Object_Type_Enum}
+     *
+     * @return array An array with the entity title and labels.
+     * @since 3.12.0
+     */
+    public function get_labels( $id, $object_type = Object_Type_Enum::POST ) {
+        if ( Object_Type_Enum::POST === $object_type ) {
+            return array_merge( (array) get_the_title( $id ), $this->get_alternative_labels( $id ) );
+        }
+
+        if ( Object_Type_Enum::TERM === $object_type ) {
+            $term = get_term( $id );
+            if ( ! is_a( $term, 'WP_Term' ) ) {
+                return array();
+            }
+
+            // @@todo add support for terms' synonyms.
+            return (array) $term->name;
+        }
+
+        return array();
+    }
+
+    /**
+     * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
+     *
+     * @param WP_Post $post Post object.
+     *
+     * @since 3.2.0
+     */
+    public function edit_form_before_permalink( $post ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+
+        // If disabled by filter, return.
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( ! apply_filters( 'wl_feature__enable__add-synonyms', true ) ) {
+            return;
+        }
+
+        // Print the input template.
+        Wordlift_UI_Service::print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+
+        // Print all the currently set alternative labels.
+        foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+
+            echo wp_kses( $this->get_alternative_label_input( $alt_label ), Wordlift_UI_Service::get_template_allowed_html() );
+
+        };
+
+        // Print the button.
+        Wordlift_UI_Service::print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+
+    }
+
+    public function get_uri( $object_id, $type = Object_Type_Enum::POST ) {
+        $content_service = Wordpress_Content_Service::get_instance();
+        $entity_id       = $content_service->get_entity_id( new Wordpress_Content_Id( $object_id, $type ) );
+        $dataset_uri     = Wordlift_Configuration_Service::get_instance()->get_dataset_uri();
+
+        if ( ! isset( $entity_id ) ||
+             ( ! empty( $dataset_uri ) && 0 !== strpos( $entity_id, $dataset_uri ) ) ) {
+            $rel_uri = Entity_Uri_Generator::create_uri( $type, $object_id );
+            try {
+                $content_service->set_entity_id( new Wordpress_Content_Id( $object_id, $type ), $rel_uri );
+                $entity_id = $content_service->get_entity_id( new Wordpress_Content_Id( $object_id, $type ) );
+            } catch ( Exception $e ) {
+                return null;
+            }
+        }
+
+        return $entity_id;
+    }
+
+    /**
+     * Get the alternative label input HTML code.
+     *
+     * @param string $value The input value.
+     *
+     * @return string The input HTML code.
+     * @since 3.2.0
+     */
+    private function get_alternative_label_input( $value = '' ) {
+
+        return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), esc_html__( 'Delete', 'wordlift' ) );
+    }
+
+    /**
+     * Get the number of entity posts published in this blog.
+     *
+     * @return int The number of published entity posts.
+     * @since 3.6.0
+     */
+    public function count() {
+        global $wpdb;
+
+        // Try to get the count from the transient.
+        $count = get_transient( '_wl_entity_service__count' );
+        if ( false !== $count ) {
+            return $count;
+        }
+
+        // Query the count.
+        $count = $wpdb->get_var(
+            $wpdb->prepare(
+                'SELECT COUNT( DISTINCT( tr.object_id ) )'
+                . " FROM {$wpdb->term_relationships} tr"
+                . " INNER JOIN {$wpdb->term_taxonomy} tt"
+                . '  ON tt.taxonomy = %s AND tt.term_taxonomy_id = tr.term_taxonomy_id'
+                . " INNER JOIN {$wpdb->terms} t"
+                . '  ON t.term_id = tt.term_id AND t.name != %s',
+                Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'article'
+            )
+        );
+
+        // Store the count in cache.
+        set_transient( '_wl_entity_service__count', $count, 900 );
+
+        return $count;
+    }
+
+    /**
+     * Add the entity filtering criterias to the arguments for a `get_posts`
+     * call.
+     *
+     * @param array $args The arguments for a `get_posts` call.
+     *
+     * @return array The arguments for a `get_posts` call.
+     * @since 3.15.0
+     */
+    public static function add_criterias( $args ) {
+
+        // Build an optimal tax-query.
+        $tax_query = array(
+            'relation' => 'AND',
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'operator' => 'EXISTS',
+            ),
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'article',
+                'operator' => 'NOT IN',
+            ),
+        );
+
+        return $args + array(
+            'post_type' => self::valid_entity_post_types(),
+            /*
 			 * Ensure compatibility with Polylang.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/855.
@@ -529,101 +529,101 @@ 
 			 *
 			 * @since 3.19.5
 			 */
-			'lang'      => '',
-			'tax_query' => $tax_query,
-		);
-	}
-
-	/**
-	 * Create a new entity.
-	 *
-	 * @param string $name The entity name.
-	 * @param string $type_uri The entity's type URI.
-	 * @param null   $logo The entity logo id (or NULL if none).
-	 * @param string $status The post status, by default 'publish'.
-	 *
-	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
-	 * @since 3.9.0
-	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
-
-		// Create an entity for the publisher.
-		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		$post_id = @wp_insert_post(
-			array(
-				'post_type'    => self::TYPE_NAME,
-				'post_title'   => $name,
-				'post_status'  => $status,
-				'post_content' => '',
-			)
-		);
-
-		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
-			return $post_id;
-		}
-
-		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
-		}
-
-		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the entities related to the one with the specified id. By default only
-	 * published entities will be returned.
-	 *
-	 * @param int    $id The post id.
-	 * @param string $post_status The target post status (default = publish).
-	 *
-	 * @return array An array of post ids.
-	 * @since 3.10.0
-	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
-
-		return $this->relation_service->get_objects( $id, 'ids', null, $post_status );
-	}
-
-	/**
-	 * Get the list of entities.
-	 *
-	 * @param array $params Custom parameters for WordPress' own {@link get_posts} function.
-	 *
-	 * @return array An array of entity posts.
-	 * @since 3.12.2
-	 */
-	public function get( $params = array() ) {
-
-		// Set the defaults.
-		$defaults = array( 'post_type' => 'entity' );
-
-		// Merge the defaults with the provided parameters.
-		$args = wp_parse_args( $params, $defaults );
-
-		// Call the `get_posts` function.
-		return get_posts( $args );
-	}
-
-	/**
-	 * The list of post type names which 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.
-	 *
-	 * @return array Array containing the names of the valid post types.
-	 * @since 3.15.0
-	 */
-	public static function valid_entity_post_types() {
-
-		// Ignore builtins in the call to avoid getting attachments.
-		$post_types = array( 'post', 'page', self::TYPE_NAME, 'product' );
-
-		return apply_filters( 'wl_valid_entity_post_types', $post_types );
-	}
+            'lang'      => '',
+            'tax_query' => $tax_query,
+        );
+    }
+
+    /**
+     * Create a new entity.
+     *
+     * @param string $name The entity name.
+     * @param string $type_uri The entity's type URI.
+     * @param null   $logo The entity logo id (or NULL if none).
+     * @param string $status The post status, by default 'publish'.
+     *
+     * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
+     * @since 3.9.0
+     */
+    public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+
+        // Create an entity for the publisher.
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+        $post_id = @wp_insert_post(
+            array(
+                'post_type'    => self::TYPE_NAME,
+                'post_title'   => $name,
+                'post_status'  => $status,
+                'post_content' => '',
+            )
+        );
+
+        // Return the error if any.
+        if ( is_wp_error( $post_id ) ) {
+            return $post_id;
+        }
+
+        // Set the entity logo.
+        if ( $logo && is_numeric( $logo ) ) {
+            set_post_thumbnail( $post_id, $logo );
+        }
+
+        // Set the entity type.
+        Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+
+        return $post_id;
+    }
+
+    /**
+     * Get the entities related to the one with the specified id. By default only
+     * published entities will be returned.
+     *
+     * @param int    $id The post id.
+     * @param string $post_status The target post status (default = publish).
+     *
+     * @return array An array of post ids.
+     * @since 3.10.0
+     */
+    public function get_related_entities( $id, $post_status = 'publish' ) {
+
+        return $this->relation_service->get_objects( $id, 'ids', null, $post_status );
+    }
+
+    /**
+     * Get the list of entities.
+     *
+     * @param array $params Custom parameters for WordPress' own {@link get_posts} function.
+     *
+     * @return array An array of entity posts.
+     * @since 3.12.2
+     */
+    public function get( $params = array() ) {
+
+        // Set the defaults.
+        $defaults = array( 'post_type' => 'entity' );
+
+        // Merge the defaults with the provided parameters.
+        $args = wp_parse_args( $params, $defaults );
+
+        // Call the `get_posts` function.
+        return get_posts( $args );
+    }
+
+    /**
+     * The list of post type names which 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.
+     *
+     * @return array Array containing the names of the valid post types.
+     * @since 3.15.0
+     */
+    public static function valid_entity_post_types() {
+
+        // Ignore builtins in the call to avoid getting attachments.
+        $post_types = array( 'post', 'page', self::TYPE_NAME, 'product' );
+
+        return apply_filters( 'wl_valid_entity_post_types', $post_types );
+    }
 
 }

Spacing +91 added lines, -91 removed lines

@@ -81,7 +81,7 @@ 
 	 * @since 3.2.0
 	 */
 	protected function __construct() {
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		$this->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
 		$this->relation_service   = Wordlift_Relation_Service::get_instance();
@@ -105,7 +105,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -121,22 +121,22 @@ 
 	 * @return bool Return true if the post is an entity otherwise false.
 	 * @since 3.1.0
 	 */
-	public function is_entity( $post_id ) {
+	public function is_entity($post_id) {
 
 		// Improve performance by giving for granted that a product is an entity.
-		if ( 'product' === get_post_type( $post_id ) ) {
+		if ('product' === get_post_type($post_id)) {
 			return true;
 		}
 
-		$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);
 
-		if ( is_wp_error( $terms ) ) {
-			$this->log->error( "Cannot get the terms for post $post_id: " . $terms->get_error_message() );
+		if (is_wp_error($terms)) {
+			$this->log->error("Cannot get the terms for post $post_id: ".$terms->get_error_message());
 
 			return false;
 		}
 
-		if ( empty( $terms ) ) {
+		if (empty($terms)) {
 			return false;
 		}
 
@@ -147,8 +147,8 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		foreach ( $terms as $term ) {
-			if ( 1 !== preg_match( '~(^|-)article$~', $term->slug ) ) {
+		foreach ($terms as $term) {
+			if (1 !== preg_match('~(^|-)article$~', $term->slug)) {
 				return true;
 			}
 		}
@@ -167,20 +167,20 @@ 
 	 * @return string Returns a classification scope (e.g. 'what').
 	 * @since 3.5.0
 	 */
-	public function get_classification_scope_for( $post_id, $default = WL_WHAT_RELATION ) {
+	public function get_classification_scope_for($post_id, $default = WL_WHAT_RELATION) {
 
-		if ( false === $this->is_entity( $post_id ) ) {
+		if (false === $this->is_entity($post_id)) {
 			return $default;
 		}
 
 		// Retrieve the entity type
-		$entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+		$entity_type_arr = Wordlift_Entity_Type_Service::get_instance()->get($post_id);
+		$entity_type     = str_replace('wl-', '', $entity_type_arr['css_class']);
 		// Retrieve classification boxes configuration
 		// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_unserialize
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'], true ) ) {
+		$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
+		foreach ($classification_boxes as $cb) {
+			if (in_array($entity_type, $cb['registeredTypes'], true)) {
 				return $cb['id'];
 			}
 		}
@@ -195,13 +195,13 @@ 
 	 *
 	 * @return bool|null Null if it's not an entity, otherwise true if it's used.
 	 */
-	public function is_used( $post_id ) {
+	public function is_used($post_id) {
 
-		if ( false === $this->is_entity( $post_id ) ) {
+		if (false === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the post
-		$entity = get_post( $post_id );
+		$entity = get_post($post_id);
 
 		global $wpdb;
 
@@ -213,7 +213,7 @@ 
 			)
 		);
 		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
+		if (0 < $relation_instances) {
 			return true;
 		}
 
@@ -222,12 +222,12 @@ 
 			$wpdb->prepare(
 				"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
 				$entity->ID,
-				wl_get_entity_uri( $entity->ID )
+				wl_get_entity_uri($entity->ID)
 			)
 		);
 
 		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
+		if (0 < $meta_instances) {
 			return true;
 		}
 
@@ -246,9 +246,9 @@ 
 	 * @since      3.16.3 deprecated in favor of Wordlift_Entity_Uri_Service->get_entity( $uri );
 	 * @since      3.2.0
 	 */
-	public function get_entity_post_by_uri( $uri ) {
+	public function get_entity_post_by_uri($uri) {
 
-		return $this->entity_uri_service->get_entity( $uri );
+		return $this->entity_uri_service->get_entity($uri);
 	}
 
 	/**
@@ -264,19 +264,19 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post Post object.
 	 */
-	public function save_post( $post_id, $post ) {
+	public function save_post($post_id, $post) {
 		// Avoid doing anything if post is autosave or a revision.
-		if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
+		if (wp_is_post_autosave($post) || wp_is_post_revision($post)) {
 			return;
 		}
 
 		// We expect a numeric value here.
-		if ( ! isset( $_REQUEST['post_ID'] ) || ! is_numeric( $_REQUEST['post_ID'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! isset($_REQUEST['post_ID']) || ! is_numeric($_REQUEST['post_ID'])) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return;
 		}
 
 		// Get the numeric post ID from the request.
-		$request_post_id = intval( $_REQUEST['post_ID'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$request_post_id = intval($_REQUEST['post_ID']); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		// We're setting the alternative label that have been provided via the UI
 		// (in fact we're using $_REQUEST), while save_post may be also called
@@ -284,16 +284,16 @@ 
 		// the $post_id in the save_post call matches the post id set in the request.
 		//
 		// If this is not the current post being saved or if it's not an entity, return.
-		if ( $request_post_id !== $post_id || ! $this->is_entity( $post_id ) ) {
+		if ($request_post_id !== $post_id || ! $this->is_entity($post_id)) {
 			return;
 		}
 
-		if ( isset( $_REQUEST['wl_alternative_label'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$data = filter_var_array( $_REQUEST, array( 'wl_alternative_label' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if (isset($_REQUEST['wl_alternative_label'])) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$data = filter_var_array($_REQUEST, array('wl_alternative_label' => array('flags' => FILTER_REQUIRE_ARRAY))); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			// Get the alt labels from the request (or empty array).
-			$alt_labels = isset( $data['wl_alternative_label'] ) ? $data['wl_alternative_label'] : array();
+			$alt_labels = isset($data['wl_alternative_label']) ? $data['wl_alternative_label'] : array();
 			// This is via classic editor, so set the alternative labels.
-			$this->set_alternative_labels( $post_id, $alt_labels );
+			$this->set_alternative_labels($post_id, $alt_labels);
 		}
 
 	}
@@ -306,48 +306,48 @@ 
 	 *
 	 * @since 3.2.0
 	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+	public function set_alternative_labels($post_id, $alt_labels) {
 
 		// Bail out if post id is not numeric. We add this check as we found a WP install that was sending a WP_Error
 		// instead of post id.
-		if ( ! is_numeric( $post_id ) ) {
+		if ( ! is_numeric($post_id)) {
 			return;
 		}
 
 		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
+		if ( ! is_array($alt_labels)) {
+			$alt_labels = array($alt_labels);
 		}
 
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . ' ]' );
+		$this->log->debug("Setting alternative labels [ post id :: $post_id ][ alt labels :: ".implode(',', $alt_labels).' ]');
 
 		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 
 		// Save only unique synonymns.
-		$alt_labels = array_unique( $alt_labels );
+		$alt_labels = array_unique($alt_labels);
 
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
+		foreach ($alt_labels as $alt_label) {
 
 			// Strip html code from synonym.
-			$alt_label = wp_strip_all_tags( $alt_label );
+			$alt_label = wp_strip_all_tags($alt_label);
 
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label );
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY, (string) $alt_label);
 			}
 		}
 
 	}
 
-	public function append_alternative_labels( $post_id, $labels_to_append ) {
+	public function append_alternative_labels($post_id, $labels_to_append) {
 
-		$merged_labels = $this->get_alternative_labels( $post_id );
+		$merged_labels = $this->get_alternative_labels($post_id);
 
 		// Append new synonyms to the end.
-		$merged_labels = array_merge( $merged_labels, $labels_to_append );
+		$merged_labels = array_merge($merged_labels, $labels_to_append);
 
-		$this->set_alternative_labels( $post_id, $merged_labels );
+		$this->set_alternative_labels($post_id, $merged_labels);
 
 	}
 
@@ -359,9 +359,9 @@ 
 	 * @return mixed An array  of alternative labels.
 	 * @since 3.2.0
 	 */
-	public function get_alternative_labels( $post_id ) {
+	public function get_alternative_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 	}
 
 	/**
@@ -373,14 +373,14 @@ 
 	 * @return array An array with the entity title and labels.
 	 * @since 3.12.0
 	 */
-	public function get_labels( $id, $object_type = Object_Type_Enum::POST ) {
-		if ( Object_Type_Enum::POST === $object_type ) {
-			return array_merge( (array) get_the_title( $id ), $this->get_alternative_labels( $id ) );
+	public function get_labels($id, $object_type = Object_Type_Enum::POST) {
+		if (Object_Type_Enum::POST === $object_type) {
+			return array_merge((array) get_the_title($id), $this->get_alternative_labels($id));
 		}
 
-		if ( Object_Type_Enum::TERM === $object_type ) {
-			$term = get_term( $id );
-			if ( ! is_a( $term, 'WP_Term' ) ) {
+		if (Object_Type_Enum::TERM === $object_type) {
+			$term = get_term($id);
+			if ( ! is_a($term, 'WP_Term')) {
 				return array();
 			}
 
@@ -398,46 +398,46 @@ 
 	 *
 	 * @since 3.2.0
 	 */
-	public function edit_form_before_permalink( $post ) {
+	public function edit_form_before_permalink($post) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 
 		// If disabled by filter, return.
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( ! apply_filters( 'wl_feature__enable__add-synonyms', true ) ) {
+		if ( ! apply_filters('wl_feature__enable__add-synonyms', true)) {
 			return;
 		}
 
 		// Print the input template.
-		Wordlift_UI_Service::print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+		Wordlift_UI_Service::print_template('wl-tmpl-alternative-label-input', $this->get_alternative_label_input());
 
 		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternative_labels($post->ID) as $alt_label) {
 
-			echo wp_kses( $this->get_alternative_label_input( $alt_label ), Wordlift_UI_Service::get_template_allowed_html() );
+			echo wp_kses($this->get_alternative_label_input($alt_label), Wordlift_UI_Service::get_template_allowed_html());
 
 		};
 
 		// Print the button.
-		Wordlift_UI_Service::print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+		Wordlift_UI_Service::print_button('wl-add-alternative-labels-button', __('Add more titles', 'wordlift'));
 
 	}
 
-	public function get_uri( $object_id, $type = Object_Type_Enum::POST ) {
+	public function get_uri($object_id, $type = Object_Type_Enum::POST) {
 		$content_service = Wordpress_Content_Service::get_instance();
-		$entity_id       = $content_service->get_entity_id( new Wordpress_Content_Id( $object_id, $type ) );
+		$entity_id       = $content_service->get_entity_id(new Wordpress_Content_Id($object_id, $type));
 		$dataset_uri     = Wordlift_Configuration_Service::get_instance()->get_dataset_uri();
 
-		if ( ! isset( $entity_id ) ||
-			 ( ! empty( $dataset_uri ) && 0 !== strpos( $entity_id, $dataset_uri ) ) ) {
-			$rel_uri = Entity_Uri_Generator::create_uri( $type, $object_id );
+		if ( ! isset($entity_id) ||
+			 ( ! empty($dataset_uri) && 0 !== strpos($entity_id, $dataset_uri))) {
+			$rel_uri = Entity_Uri_Generator::create_uri($type, $object_id);
 			try {
-				$content_service->set_entity_id( new Wordpress_Content_Id( $object_id, $type ), $rel_uri );
-				$entity_id = $content_service->get_entity_id( new Wordpress_Content_Id( $object_id, $type ) );
-			} catch ( Exception $e ) {
+				$content_service->set_entity_id(new Wordpress_Content_Id($object_id, $type), $rel_uri);
+				$entity_id = $content_service->get_entity_id(new Wordpress_Content_Id($object_id, $type));
+			} catch (Exception $e) {
 				return null;
 			}
 		}
@@ -453,9 +453,9 @@ 
 	 * @return string The input HTML code.
 	 * @since 3.2.0
 	 */
-	private function get_alternative_label_input( $value = '' ) {
+	private function get_alternative_label_input($value = '') {
 
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), esc_html__( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), esc_html__('Delete', 'wordlift'));
 	}
 
 	/**
@@ -468,8 +468,8 @@ 
 		global $wpdb;
 
 		// Try to get the count from the transient.
-		$count = get_transient( '_wl_entity_service__count' );
-		if ( false !== $count ) {
+		$count = get_transient('_wl_entity_service__count');
+		if (false !== $count) {
 			return $count;
 		}
 
@@ -488,7 +488,7 @@ 
 		);
 
 		// Store the count in cache.
-		set_transient( '_wl_entity_service__count', $count, 900 );
+		set_transient('_wl_entity_service__count', $count, 900);
 
 		return $count;
 	}
@@ -502,7 +502,7 @@ 
 	 * @return array The arguments for a `get_posts` call.
 	 * @since 3.15.0
 	 */
-	public static function add_criterias( $args ) {
+	public static function add_criterias($args) {
 
 		// Build an optimal tax-query.
 		$tax_query = array(
@@ -545,7 +545,7 @@ 
 	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
 	 * @since 3.9.0
 	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+	public function create($name, $type_uri, $logo = null, $status = 'publish') {
 
 		// Create an entity for the publisher.
 		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
@@ -559,17 +559,17 @@ 
 		);
 
 		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			return $post_id;
 		}
 
 		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
+		if ($logo && is_numeric($logo)) {
+			set_post_thumbnail($post_id, $logo);
 		}
 
 		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+		Wordlift_Entity_Type_Service::get_instance()->set($post_id, $type_uri);
 
 		return $post_id;
 	}
@@ -584,9 +584,9 @@ 
 	 * @return array An array of post ids.
 	 * @since 3.10.0
 	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
+	public function get_related_entities($id, $post_status = 'publish') {
 
-		return $this->relation_service->get_objects( $id, 'ids', null, $post_status );
+		return $this->relation_service->get_objects($id, 'ids', null, $post_status);
 	}
 
 	/**
@@ -597,16 +597,16 @@ 
 	 * @return array An array of entity posts.
 	 * @since 3.12.2
 	 */
-	public function get( $params = array() ) {
+	public function get($params = array()) {
 
 		// Set the defaults.
-		$defaults = array( 'post_type' => 'entity' );
+		$defaults = array('post_type' => 'entity');
 
 		// Merge the defaults with the provided parameters.
-		$args = wp_parse_args( $params, $defaults );
+		$args = wp_parse_args($params, $defaults);
 
 		// Call the `get_posts` function.
-		return get_posts( $args );
+		return get_posts($args);
 	}
 
 	/**
@@ -621,9 +621,9 @@ 
 	public static function valid_entity_post_types() {
 
 		// Ignore builtins in the call to avoid getting attachments.
-		$post_types = array( 'post', 'page', self::TYPE_NAME, 'product' );
+		$post_types = array('post', 'page', self::TYPE_NAME, 'product');
 
-		return apply_filters( 'wl_valid_entity_post_types', $post_types );
+		return apply_filters('wl_valid_entity_post_types', $post_types);
 	}
 
 }