insideout10 / wordlift-plugin

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

Indentation +363 added lines, -363 removed lines

@@ -20,368 +20,368 @@
 
 class Post_Adapter {
 
-	/**
-	 * A {@link Wordlift_Log_Service} logging instance.
-	 *
-	 * @access private
-	 * @var \Wordlift_Log_Service A {@link Wordlift_Log_Service} logging instance.
-	 */
-	private $log;
-
-	public function __construct() {
-
-		// Bail out if block editor's functions aren't available.
-		if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
-			return;
-		}
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'init', array( $this, 'init' ) );
-		add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
-
-	}
-
-	/**
-	 * Initialize by registering our block type `wordlift/classification`, required for {@link parse_blocks) to work
-	 * correctly.
-	 */
-	public function init() {
-
-		register_block_type( 'wordlift/classification', array(
-			'editor_script' => 'wl-block-editor',
-			'attributes'    => array(
-				'entities' => array( 'type' => 'array' ),
-			),
-		) );
-
-	}
-
-	/**
-	 * A sample structure:
-	 *
-	 * {
-	 *   "entities": [
-	 *     {
-	 *       "annotations": {
-	 *         "urn:enhancement-7e8e66fc": {
-	 *           "start": 3480,
-	 *           "end": 3486,
-	 *           "text": "libero"
-	 *         }
-	 *       },
-	 *       "description": "Le libero ou libéro est un poste défensif du volley-ball. Des règles particulières le concernant ont été introduites à la fin des années 1990. De par sa spécificité, le libéro a un statut à part au sein d’une équipe de volley-ball. Pour être identifié, il doit porter un uniforme qui contraste avec ceux des autres membres de son équipe, titulaires ou remplaçants.",
-	 *       "id": "http://fr.dbpedia.org/resource/Libero_(volley-ball)",
-	 *       "label": "Libero (volley-ball)",
-	 *       "mainType": "other",
-	 *       "occurrences": ["urn:enhancement-7e8e66fc"],
-	 *       "sameAs": null,
-	 *       "synonyms": [],
-	 *       "types": ["other"]
-	 *     }
-	 *   ]
-	 * }
-	 *
-	 * @param array $data An array of slashed post data.
-	 * @param array $postarr An array of sanitized, but otherwise unmodified post data.
-	 *
-	 * @return array The data array.
-	 */
-	public function wp_insert_post_data( $data, $postarr ) {
-		$post_status = $data['post_status'];
-		if ( 'auto-draft' === $post_status || 'inherit' === $post_status ) {
-			return $data;
-		}
-
-		$this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
-		                   . var_export( $data, true ) );
-
-
-		try {
-			$entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
-
-			foreach ( $entities as $entity ) {
-
-				$entity_id = array_key_exists( 'id', $entity ) ? $entity['id'] : '';
-
-				if ( ! $this->entity_id_valid( $entity_id ) ) {
-					continue;
-				}
-
-				$entity_uris = $this->get_entity_uris( $entity );
-
-				if ( $this->get_first_matching_entity_by_uri( $entity_uris ) === null &&
-				     Post_Entities_Validator::is_local_entity_uri_exist( Wordlift_Entity_Uri_Service::get_instance(), $entity_uris ) ) {
-					// Skip the entity
-					continue;
-				}
-
-				// If 'entity auto publish' is false, we set the status to `draft` by default.
-				$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
-					? $data['post_status'] : 'draft';
-				$this->create_or_update_entity( $entity, $post_status );
-
-			}
-
-		} catch ( \Exception $e ) {
-			$this->log->error( $e->getMessage() );
-		}
-
-
-		return $data;
-	}
-
-	/**
-	 * Parse the post content to find the `wordlift/classification` block and return the entities' data.
-	 *
-	 * @param string $post_content The post content.
-	 *
-	 * @return array An array of entities' structures.
-	 * @throws \Exception
-	 */
-	private function parse_content( $post_content ) {
-
-		$all_blocks = parse_blocks( $post_content );
-		$this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
-		                   . var_export( $all_blocks, true ) );
-
-		$blocks = array_filter( $all_blocks, function ( $item ) {
-			return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
-		} );
-
-		// Bail out if the blocks' array is empty.
-		if ( empty( $blocks ) ) {
-			return array();
-		}
-
-		$block = current( $blocks );
-		$this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
-		                   . var_export( $block, true ) );
-
-		// Bail out if the entities array is empty.
-		if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
-			return array();
-		}
-
-		return $block['attrs']['entities'];
-	}
-
-	/**
-	 * Collect entity labels from the entity array.
-	 *
-	 * This function expects an array with the following keys:
-	 *
-	 * array(
-	 *   'label'       => ...,
-	 *   'synonyms'    => array( ... ),
-	 *   'annotations' => array(
-	 *     ...id...      => array( text => ... ),
-	 *   ),
-	 *   'occurrences' => array( ... ),
-	 * )
-	 *
-	 * and it is going to output an array with all the labels, keeping the `label` at first position:
-	 *
-	 * array(
-	 *   ...label...,
-	 *   ...synonyms...,
-	 *   ...texts...,
-	 * )
-	 *
-	 * This function is going to collect the label from the `label` property, from the `synonyms` property and from
-	 * `annotations` property. Since the `annotations` property contains all the annotations including those that
-	 * haven't been selected, this function is going to only get the `text` for the annotations property listed in
-	 * `occurrences`.
-	 *
-	 * @param array $entity {
-	 *  The entity data.
-	 *
-	 * @type string $label The entity label.
-	 * @type array $synonyms The entity synonyms.
-	 * @type array $occurrences The selected occurrences.
-	 * @type array $annotations The annotations.
-	 * }
-	 *
-	 * @return array An array of labels.
-	 */
-	public function get_labels( $entity ) {
-
-		$args = wp_parse_args( $entity, array(
-			'label'       => array(),
-			'synonyms'    => array(),
-			'annotations' => array(),
-			'occurrences' => array(),
-		) );
-
-		// We gather all the labels, occurrences texts and synonyms into one array.
-		$initial = array_merge(
-			(array) $args['label'],
-			(array) $args['synonyms']
-		);
-
-		$annotations = $args['annotations'];
-
-		return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
-
-			// Bail out if occurrences->$item->text isn't set or its contents are already
-			// in `$carry`.
-			if ( ! isset( $annotations[ $item ]['text'] )
-			     || in_array( $annotations[ $item ]['text'], $carry ) ) {
-				return $carry;
-			}
-
-			// Push the label.
-			$carry[] = $annotations[ $item ]['text'];
-
-			return $carry;
-		}, $initial );
-	}
-
-	/**
-	 * Create or update the entity.
-	 *
-	 * An entity lookup is performed on the local vocabulary using the `id` and `sameAs` URIs. If an entity is found
-	 * the {@link Entity_Store} update function is called to update the `labels` and the `sameAs` values.
-	 *
-	 * If an entity is not found the {@link Entity_Store} create function is called to create a new entity.
-	 *
-	 * @param array $entity {
-	 * The entity parameters.
-	 *
-	 * @type string The entity item id URI.
-	 * @type string|array The entity sameAs URI(s).
-	 * @type string $description The entity description.
-	 * }
-	 *
-	 * @param       $string $post_status The post status, default 'draft'.
-	 *
-	 * @return int|\WP_Error
-	 * @throws \Exception
-	 */
-	private function create_or_update_entity( $entity, $post_status = 'draft' ) {
-
-		// Get only valid IDs.
-		$uris = $this->get_entity_uris( $entity );
-
-		$post = $this->get_first_matching_entity_by_uri( $uris );
-
-		$this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
-		                   . var_export( $uris, true ) );
-
-		// Get the labels.
-		$labels = $this->get_labels( $entity );
-
-		if ( empty( $post ) ) {
-			$entity_description = array_key_exists( 'description', $entity ) ? $entity['description'] : '';
-			// Create the entity if it doesn't exist.
-			$post_id = Entity_Store::get_instance()->create( array(
-				'labels'      => $labels,
-				'description' => $entity_description,
-				'same_as'     => $uris,
-			), $post_status );
-
-			// Return the WP_Error if we got one.
-			if ( is_wp_error( $post_id ) ) {
-				return $post_id;
-			}
-
-			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			}
-
-			if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
-			}
-		} else {
-			// Update the entity otherwise.
-			$post_id = Entity_Store::get_instance()->update( array(
-				'ID'      => $post->ID,
-				'labels'  => $labels,
-				'same_as' => $uris,
-			) );
-
-			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			}
-
-			// see https://github.com/insideout10/wordlift-plugin/issues/1304
-			// Set the post status, we need to set that in order to support entities
-			// created using rest endpoint on block editor, so that they get published
-			// when the post is published.
-			// Once the entity is published dont update the post status.
-			if ( $post->post_status !== 'publish' ) {
-				wp_update_post( array(
-					'ID'          => $post->ID,
-					'post_status' => $post_status
-				) );
-			}
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the first matching entity for the provided URI array.
-	 *
-	 * Entities IDs and sameAs are searched.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @return \WP_Post|null The entity WP_Post if found or null if not found.
-	 */
-	private function get_first_matching_entity_by_uri( $uris ) {
-
-		foreach ( $uris as $uri ) {
-
-			$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
-
-			if ( ! $content ) {
-				continue;
-			}
-
-			$existing_entity = $content->get_bag();
-
-			if ( is_a( $existing_entity, 'WP_Post' ) ) {
-				return $existing_entity;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param $entity
-	 *
-	 * @return array
-	 */
-	private function filter_valid_entity_ids( $entity ) {
-		$id = $entity['id'];
-
-		return array_filter( (array) $id, function ( $id ) {
-			return preg_match( '|^https?://|', $id );
-		} );
-	}
-
-	/**
-	 * @param array $entity
-	 *
-	 * @return array
-	 */
-	private function get_entity_uris( $entity ) {
-		$ids     = $this->filter_valid_entity_ids( $entity );
-		$same_as = array_key_exists( 'sameAs', $entity ) ? $entity['sameAs'] : array();
-
-		return array_merge(
-			(array) $ids,
-			(array) $same_as
-		);
-	}
-
-	private function entity_id_valid( $entity_id ) {
-		return preg_match( '#^https?://#i', $entity_id ) === 1;
-	}
+    /**
+     * A {@link Wordlift_Log_Service} logging instance.
+     *
+     * @access private
+     * @var \Wordlift_Log_Service A {@link Wordlift_Log_Service} logging instance.
+     */
+    private $log;
+
+    public function __construct() {
+
+        // Bail out if block editor's functions aren't available.
+        if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
+            return;
+        }
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'init', array( $this, 'init' ) );
+        add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
+
+    }
+
+    /**
+     * Initialize by registering our block type `wordlift/classification`, required for {@link parse_blocks) to work
+     * correctly.
+     */
+    public function init() {
+
+        register_block_type( 'wordlift/classification', array(
+            'editor_script' => 'wl-block-editor',
+            'attributes'    => array(
+                'entities' => array( 'type' => 'array' ),
+            ),
+        ) );
+
+    }
+
+    /**
+     * A sample structure:
+     *
+     * {
+     *   "entities": [
+     *     {
+     *       "annotations": {
+     *         "urn:enhancement-7e8e66fc": {
+     *           "start": 3480,
+     *           "end": 3486,
+     *           "text": "libero"
+     *         }
+     *       },
+     *       "description": "Le libero ou libéro est un poste défensif du volley-ball. Des règles particulières le concernant ont été introduites à la fin des années 1990. De par sa spécificité, le libéro a un statut à part au sein d’une équipe de volley-ball. Pour être identifié, il doit porter un uniforme qui contraste avec ceux des autres membres de son équipe, titulaires ou remplaçants.",
+     *       "id": "http://fr.dbpedia.org/resource/Libero_(volley-ball)",
+     *       "label": "Libero (volley-ball)",
+     *       "mainType": "other",
+     *       "occurrences": ["urn:enhancement-7e8e66fc"],
+     *       "sameAs": null,
+     *       "synonyms": [],
+     *       "types": ["other"]
+     *     }
+     *   ]
+     * }
+     *
+     * @param array $data An array of slashed post data.
+     * @param array $postarr An array of sanitized, but otherwise unmodified post data.
+     *
+     * @return array The data array.
+     */
+    public function wp_insert_post_data( $data, $postarr ) {
+        $post_status = $data['post_status'];
+        if ( 'auto-draft' === $post_status || 'inherit' === $post_status ) {
+            return $data;
+        }
+
+        $this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
+                            . var_export( $data, true ) );
+
+
+        try {
+            $entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
+
+            foreach ( $entities as $entity ) {
+
+                $entity_id = array_key_exists( 'id', $entity ) ? $entity['id'] : '';
+
+                if ( ! $this->entity_id_valid( $entity_id ) ) {
+                    continue;
+                }
+
+                $entity_uris = $this->get_entity_uris( $entity );
+
+                if ( $this->get_first_matching_entity_by_uri( $entity_uris ) === null &&
+                     Post_Entities_Validator::is_local_entity_uri_exist( Wordlift_Entity_Uri_Service::get_instance(), $entity_uris ) ) {
+                    // Skip the entity
+                    continue;
+                }
+
+                // If 'entity auto publish' is false, we set the status to `draft` by default.
+                $post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
+                    ? $data['post_status'] : 'draft';
+                $this->create_or_update_entity( $entity, $post_status );
+
+            }
+
+        } catch ( \Exception $e ) {
+            $this->log->error( $e->getMessage() );
+        }
+
+
+        return $data;
+    }
+
+    /**
+     * Parse the post content to find the `wordlift/classification` block and return the entities' data.
+     *
+     * @param string $post_content The post content.
+     *
+     * @return array An array of entities' structures.
+     * @throws \Exception
+     */
+    private function parse_content( $post_content ) {
+
+        $all_blocks = parse_blocks( $post_content );
+        $this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
+                            . var_export( $all_blocks, true ) );
+
+        $blocks = array_filter( $all_blocks, function ( $item ) {
+            return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
+        } );
+
+        // Bail out if the blocks' array is empty.
+        if ( empty( $blocks ) ) {
+            return array();
+        }
+
+        $block = current( $blocks );
+        $this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
+                            . var_export( $block, true ) );
+
+        // Bail out if the entities array is empty.
+        if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
+            return array();
+        }
+
+        return $block['attrs']['entities'];
+    }
+
+    /**
+     * Collect entity labels from the entity array.
+     *
+     * This function expects an array with the following keys:
+     *
+     * array(
+     *   'label'       => ...,
+     *   'synonyms'    => array( ... ),
+     *   'annotations' => array(
+     *     ...id...      => array( text => ... ),
+     *   ),
+     *   'occurrences' => array( ... ),
+     * )
+     *
+     * and it is going to output an array with all the labels, keeping the `label` at first position:
+     *
+     * array(
+     *   ...label...,
+     *   ...synonyms...,
+     *   ...texts...,
+     * )
+     *
+     * This function is going to collect the label from the `label` property, from the `synonyms` property and from
+     * `annotations` property. Since the `annotations` property contains all the annotations including those that
+     * haven't been selected, this function is going to only get the `text` for the annotations property listed in
+     * `occurrences`.
+     *
+     * @param array $entity {
+     *  The entity data.
+     *
+     * @type string $label The entity label.
+     * @type array $synonyms The entity synonyms.
+     * @type array $occurrences The selected occurrences.
+     * @type array $annotations The annotations.
+     * }
+     *
+     * @return array An array of labels.
+     */
+    public function get_labels( $entity ) {
+
+        $args = wp_parse_args( $entity, array(
+            'label'       => array(),
+            'synonyms'    => array(),
+            'annotations' => array(),
+            'occurrences' => array(),
+        ) );
+
+        // We gather all the labels, occurrences texts and synonyms into one array.
+        $initial = array_merge(
+            (array) $args['label'],
+            (array) $args['synonyms']
+        );
+
+        $annotations = $args['annotations'];
+
+        return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
+
+            // Bail out if occurrences->$item->text isn't set or its contents are already
+            // in `$carry`.
+            if ( ! isset( $annotations[ $item ]['text'] )
+                 || in_array( $annotations[ $item ]['text'], $carry ) ) {
+                return $carry;
+            }
+
+            // Push the label.
+            $carry[] = $annotations[ $item ]['text'];
+
+            return $carry;
+        }, $initial );
+    }
+
+    /**
+     * Create or update the entity.
+     *
+     * An entity lookup is performed on the local vocabulary using the `id` and `sameAs` URIs. If an entity is found
+     * the {@link Entity_Store} update function is called to update the `labels` and the `sameAs` values.
+     *
+     * If an entity is not found the {@link Entity_Store} create function is called to create a new entity.
+     *
+     * @param array $entity {
+     * The entity parameters.
+     *
+     * @type string The entity item id URI.
+     * @type string|array The entity sameAs URI(s).
+     * @type string $description The entity description.
+     * }
+     *
+     * @param       $string $post_status The post status, default 'draft'.
+     *
+     * @return int|\WP_Error
+     * @throws \Exception
+     */
+    private function create_or_update_entity( $entity, $post_status = 'draft' ) {
+
+        // Get only valid IDs.
+        $uris = $this->get_entity_uris( $entity );
+
+        $post = $this->get_first_matching_entity_by_uri( $uris );
+
+        $this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
+                            . var_export( $uris, true ) );
+
+        // Get the labels.
+        $labels = $this->get_labels( $entity );
+
+        if ( empty( $post ) ) {
+            $entity_description = array_key_exists( 'description', $entity ) ? $entity['description'] : '';
+            // Create the entity if it doesn't exist.
+            $post_id = Entity_Store::get_instance()->create( array(
+                'labels'      => $labels,
+                'description' => $entity_description,
+                'same_as'     => $uris,
+            ), $post_status );
+
+            // Return the WP_Error if we got one.
+            if ( is_wp_error( $post_id ) ) {
+                return $post_id;
+            }
+
+            // Add the entity type.
+            if ( isset( $entity['mainType'] ) ) {
+                wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            }
+
+            if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
+                add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
+                add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
+            }
+        } else {
+            // Update the entity otherwise.
+            $post_id = Entity_Store::get_instance()->update( array(
+                'ID'      => $post->ID,
+                'labels'  => $labels,
+                'same_as' => $uris,
+            ) );
+
+            // Add the entity type.
+            if ( isset( $entity['mainType'] ) ) {
+                wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            }
+
+            // see https://github.com/insideout10/wordlift-plugin/issues/1304
+            // Set the post status, we need to set that in order to support entities
+            // created using rest endpoint on block editor, so that they get published
+            // when the post is published.
+            // Once the entity is published dont update the post status.
+            if ( $post->post_status !== 'publish' ) {
+                wp_update_post( array(
+                    'ID'          => $post->ID,
+                    'post_status' => $post_status
+                ) );
+            }
+        }
+
+        return $post_id;
+    }
+
+    /**
+     * Get the first matching entity for the provided URI array.
+     *
+     * Entities IDs and sameAs are searched.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @return \WP_Post|null The entity WP_Post if found or null if not found.
+     */
+    private function get_first_matching_entity_by_uri( $uris ) {
+
+        foreach ( $uris as $uri ) {
+
+            $content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
+
+            if ( ! $content ) {
+                continue;
+            }
+
+            $existing_entity = $content->get_bag();
+
+            if ( is_a( $existing_entity, 'WP_Post' ) ) {
+                return $existing_entity;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param $entity
+     *
+     * @return array
+     */
+    private function filter_valid_entity_ids( $entity ) {
+        $id = $entity['id'];
+
+        return array_filter( (array) $id, function ( $id ) {
+            return preg_match( '|^https?://|', $id );
+        } );
+    }
+
+    /**
+     * @param array $entity
+     *
+     * @return array
+     */
+    private function get_entity_uris( $entity ) {
+        $ids     = $this->filter_valid_entity_ids( $entity );
+        $same_as = array_key_exists( 'sameAs', $entity ) ? $entity['sameAs'] : array();
+
+        return array_merge(
+            (array) $ids,
+            (array) $same_as
+        );
+    }
+
+    private function entity_id_valid( $entity_id ) {
+        return preg_match( '#^https?://#i', $entity_id ) === 1;
+    }
 
 }

src/wordlift/entity/class-entity-store.php

Indentation +120 added lines, -120 removed lines

@@ -32,125 +32,125 @@
  */
 class Entity_Store {
 
-	protected function __construct() {
-	}
-
-	private static $instance = null;
-
-	/**
-	 * Get the Entity_Store singleton, lazily initialized.
-	 *
-	 * @return Entity_Store The singleton.
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new Entity_Store();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Create and persist an entity.
-	 *
-	 * @param array $params {
-	 *      The entity parameters.
-	 *
-	 * @type string|array $labels A label, or an array of labels. The first label is set as post title.
-	 * @type string $description The entity description, stored in the post content.
-	 * @type string|array $same_as One or more entity URIs, stored in the sameAs post meta.
-	 * }
-	 *
-	 * @param string $post_status The post status, by default `draft`.
-	 *
-	 * @return int|\WP_Error
-	 * @throws \Exception
-	 */
-	public function create( $params, $post_status = 'draft' ) {
-
-		$args = wp_parse_args( $params, array(
-			'labels'      => array(),
-			'description' => '',
-			'same_as'     => array(),
-		) );
-
-		// Use the first label as `post_title`.
-		$labels = (array) $args['labels'];
-		$label  = array_shift( $labels );
-
-		$post_id = wp_insert_post( array(
-			'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-			'post_status'  => $post_status,
-			'post_title'   => $label,
-			'post_name'    => sanitize_title( $label ),
-			'post_content' => $args['description'],
-		) );
-
-		// Bail out if we've got an error.
-		if ( empty( $post_id ) || is_wp_error( $post_id ) ) {
-			throw new \Exception( "An error occurred while creating an entity." );
-		}
-
-		Wordlift_Entity_Service::get_instance()
-		                       ->set_alternative_labels( $post_id, array_diff( $labels, array( $label ) ) );
-		$this->merge_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
-			(array) Wordpress_Content_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_post( $post_id ) ) );
-
-		return $post_id;
-	}
-
-	/**
-	 * Update an entity.
-	 *
-	 * @param array $params {
-	 *
-	 * @type int $ID The post ID.
-	 * @type string|array One or more labels to add to the synonyms.
-	 * @type string|array One or more URIs to add to the sameAs.
-	 * }
-	 *
-	 * @return int The post id.
-	 */
-	public function update( $params ) {
-
-		$args = wp_parse_args( $params, array(
-			'ID'      => 0,
-			'labels'  => array(),
-			'same_as' => array(),
-		) );
-
-		$post_id = $args['ID'];
-
-		// Save synonyms except title.
-		Wordlift_Entity_Service::get_instance()
-		                       ->append_alternative_labels( $post_id, array_diff( (array) $args['labels'], array( get_the_title( $post_id ) ) ) );
-
-		$this->merge_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
-			(array) Wordpress_Content_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_post( $post_id ) ) );
-
-		return $post_id;
-	}
-
-	/**
-	 * Merge the post meta.
-	 *
-	 * @param int $post_id The post ID.
-	 * @param string $meta_key The post meta key.
-	 * @param string|array $values One or more values to add.
-	 * @param string|array $exclusions An additional list of values to exclude.
-	 */
-	private function merge_post_meta( $post_id, $meta_key, $values, $exclusions = array() ) {
-
-		$existing = array_merge(
-			(array) $exclusions,
-			get_post_meta( $post_id, $meta_key )
-		);
-
-		foreach ( (array) $values as $value ) {
-			if ( ! in_array( $value, $existing ) ) {
-				add_post_meta( $post_id, $meta_key, $value );
-			}
-		}
-	}
+    protected function __construct() {
+    }
+
+    private static $instance = null;
+
+    /**
+     * Get the Entity_Store singleton, lazily initialized.
+     *
+     * @return Entity_Store The singleton.
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new Entity_Store();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Create and persist an entity.
+     *
+     * @param array $params {
+     *      The entity parameters.
+     *
+     * @type string|array $labels A label, or an array of labels. The first label is set as post title.
+     * @type string $description The entity description, stored in the post content.
+     * @type string|array $same_as One or more entity URIs, stored in the sameAs post meta.
+     * }
+     *
+     * @param string $post_status The post status, by default `draft`.
+     *
+     * @return int|\WP_Error
+     * @throws \Exception
+     */
+    public function create( $params, $post_status = 'draft' ) {
+
+        $args = wp_parse_args( $params, array(
+            'labels'      => array(),
+            'description' => '',
+            'same_as'     => array(),
+        ) );
+
+        // Use the first label as `post_title`.
+        $labels = (array) $args['labels'];
+        $label  = array_shift( $labels );
+
+        $post_id = wp_insert_post( array(
+            'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+            'post_status'  => $post_status,
+            'post_title'   => $label,
+            'post_name'    => sanitize_title( $label ),
+            'post_content' => $args['description'],
+        ) );
+
+        // Bail out if we've got an error.
+        if ( empty( $post_id ) || is_wp_error( $post_id ) ) {
+            throw new \Exception( "An error occurred while creating an entity." );
+        }
+
+        Wordlift_Entity_Service::get_instance()
+                                ->set_alternative_labels( $post_id, array_diff( $labels, array( $label ) ) );
+        $this->merge_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
+            (array) Wordpress_Content_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_post( $post_id ) ) );
+
+        return $post_id;
+    }
+
+    /**
+     * Update an entity.
+     *
+     * @param array $params {
+     *
+     * @type int $ID The post ID.
+     * @type string|array One or more labels to add to the synonyms.
+     * @type string|array One or more URIs to add to the sameAs.
+     * }
+     *
+     * @return int The post id.
+     */
+    public function update( $params ) {
+
+        $args = wp_parse_args( $params, array(
+            'ID'      => 0,
+            'labels'  => array(),
+            'same_as' => array(),
+        ) );
+
+        $post_id = $args['ID'];
+
+        // Save synonyms except title.
+        Wordlift_Entity_Service::get_instance()
+                                ->append_alternative_labels( $post_id, array_diff( (array) $args['labels'], array( get_the_title( $post_id ) ) ) );
+
+        $this->merge_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
+            (array) Wordpress_Content_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_post( $post_id ) ) );
+
+        return $post_id;
+    }
+
+    /**
+     * Merge the post meta.
+     *
+     * @param int $post_id The post ID.
+     * @param string $meta_key The post meta key.
+     * @param string|array $values One or more values to add.
+     * @param string|array $exclusions An additional list of values to exclude.
+     */
+    private function merge_post_meta( $post_id, $meta_key, $values, $exclusions = array() ) {
+
+        $existing = array_merge(
+            (array) $exclusions,
+            get_post_meta( $post_id, $meta_key )
+        );
+
+        foreach ( (array) $values as $value ) {
+            if ( ! in_array( $value, $existing ) ) {
+                add_post_meta( $post_id, $meta_key, $value );
+            }
+        }
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -43,7 +43,7 @@ 
 	 * @return Entity_Store The singleton.
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new Entity_Store();
 		}
 
@@ -66,35 +66,35 @@ 
 	 * @return int|\WP_Error
 	 * @throws \Exception
 	 */
-	public function create( $params, $post_status = 'draft' ) {
+	public function create($params, $post_status = 'draft') {
 
-		$args = wp_parse_args( $params, array(
+		$args = wp_parse_args($params, array(
 			'labels'      => array(),
 			'description' => '',
 			'same_as'     => array(),
-		) );
+		));
 
 		// Use the first label as `post_title`.
 		$labels = (array) $args['labels'];
-		$label  = array_shift( $labels );
+		$label  = array_shift($labels);
 
-		$post_id = wp_insert_post( array(
+		$post_id = wp_insert_post(array(
 			'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
 			'post_status'  => $post_status,
 			'post_title'   => $label,
-			'post_name'    => sanitize_title( $label ),
+			'post_name'    => sanitize_title($label),
 			'post_content' => $args['description'],
-		) );
+		));
 
 		// Bail out if we've got an error.
-		if ( empty( $post_id ) || is_wp_error( $post_id ) ) {
-			throw new \Exception( "An error occurred while creating an entity." );
+		if (empty($post_id) || is_wp_error($post_id)) {
+			throw new \Exception("An error occurred while creating an entity.");
 		}
 
 		Wordlift_Entity_Service::get_instance()
-		                       ->set_alternative_labels( $post_id, array_diff( $labels, array( $label ) ) );
-		$this->merge_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
-			(array) Wordpress_Content_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_post( $post_id ) ) );
+		                       ->set_alternative_labels($post_id, array_diff($labels, array($label)));
+		$this->merge_post_meta($post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
+			(array) Wordpress_Content_Service::get_instance()->get_entity_id(Wordpress_Content_Id::create_post($post_id)));
 
 		return $post_id;
 	}
@@ -111,22 +111,22 @@ 
 	 *
 	 * @return int The post id.
 	 */
-	public function update( $params ) {
+	public function update($params) {
 
-		$args = wp_parse_args( $params, array(
+		$args = wp_parse_args($params, array(
 			'ID'      => 0,
 			'labels'  => array(),
 			'same_as' => array(),
-		) );
+		));
 
 		$post_id = $args['ID'];
 
 		// Save synonyms except title.
 		Wordlift_Entity_Service::get_instance()
-		                       ->append_alternative_labels( $post_id, array_diff( (array) $args['labels'], array( get_the_title( $post_id ) ) ) );
+		                       ->append_alternative_labels($post_id, array_diff((array) $args['labels'], array(get_the_title($post_id))));
 
-		$this->merge_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
-			(array) Wordpress_Content_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_post( $post_id ) ) );
+		$this->merge_post_meta($post_id, \Wordlift_Schema_Service::FIELD_SAME_AS, (array) $args['same_as'],
+			(array) Wordpress_Content_Service::get_instance()->get_entity_id(Wordpress_Content_Id::create_post($post_id)));
 
 		return $post_id;
 	}
@@ -139,16 +139,16 @@ 
 	 * @param string|array $values One or more values to add.
 	 * @param string|array $exclusions An additional list of values to exclude.
 	 */
-	private function merge_post_meta( $post_id, $meta_key, $values, $exclusions = array() ) {
+	private function merge_post_meta($post_id, $meta_key, $values, $exclusions = array()) {
 
 		$existing = array_merge(
 			(array) $exclusions,
-			get_post_meta( $post_id, $meta_key )
+			get_post_meta($post_id, $meta_key)
 		);
 
-		foreach ( (array) $values as $value ) {
-			if ( ! in_array( $value, $existing ) ) {
-				add_post_meta( $post_id, $meta_key, $value );
+		foreach ((array) $values as $value) {
+			if ( ! in_array($value, $existing)) {
+				add_post_meta($post_id, $meta_key, $value);
 			}
 		}
 	}

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

Indentation +578 added lines, -578 removed lines

@@ -21,499 +21,499 @@ 
  */
 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
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
-				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;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		// Check is it's referenced / related to another post / entity
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
-			$entity->ID
-		);
-
-		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
-		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
-			return true;
-		}
-
-		// Check if the entity uri is used as meta_value
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
-			$entity->ID,
-			wl_get_entity_uri( $entity->ID )
-		);
-		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
-
-		// 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.
-	 *
-	 * @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.
-	 * @param bool $update Whether this is an existing post being updated or not.
-	 */
-	public function save_post( $post_id, $post, $update ) {
-
-		// Avoid doing anything if post is autosave or a revision.
-		if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
-			return;
-		}
-
-		// 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 ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-
-		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? (array) $_REQUEST['wl_alternative_label'] : array();
-
-		if ( ( ! empty( $_POST['content'] ) && ! empty( $_POST['post_content'] ) ) || isset( $_REQUEST['wl_alternative_label'] ) ) {
-			// 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 );
+        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
+        $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+        foreach ( $classification_boxes as $cb ) {
+            if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+                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;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Check is it's referenced / related to another post / entity
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
+            $entity->ID
+        );
+
+        // Perform the query
+        $relation_instances = (int) $wpdb->get_var( $stmt );
+        // If there is at least one relation instance for the current entity, then it's used
+        if ( 0 < $relation_instances ) {
+            return true;
+        }
+
+        // Check if the entity uri is used as meta_value
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
+            $entity->ID,
+            wl_get_entity_uri( $entity->ID )
+        );
+        // Perform the query
+        $meta_instances = (int) $wpdb->get_var( $stmt );
+
+        // 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.
+     *
+     * @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.
+     * @param bool $update Whether this is an existing post being updated or not.
+     */
+    public function save_post( $post_id, $post, $update ) {
+
+        // Avoid doing anything if post is autosave or a revision.
+        if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
+            return;
+        }
+
+        // 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 ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+
+        // Get the alt labels from the request (or empty array).
+        $alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? (array) $_REQUEST['wl_alternative_label'] : array();
+
+        if ( ( ! empty( $_POST['content'] ) && ! empty( $_POST['post_content'] ) ) || isset( $_REQUEST['wl_alternative_label'] ) ) {
+            // 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 $post_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( $post_id, $object_type = Object_Type_Enum::POST ) {
-		if ( $object_type === Object_Type_Enum::POST ) {
-			return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
-		}
-
-		// Term Reference dont have synonyms yet.
-		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.
-		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 $this->get_alternative_label_input( $alt_label );
-
-		};
-
-		// 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 ) || ( $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 ), __( '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' => Wordlift_Entity_Service::valid_entity_post_types(),
-				/*
+        // 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 $post_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( $post_id, $object_type = Object_Type_Enum::POST ) {
+        if ( $object_type === Object_Type_Enum::POST ) {
+            return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
+        }
+
+        // Term Reference dont have synonyms yet.
+        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.
+        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 $this->get_alternative_label_input( $alt_label );
+
+        };
+
+        // 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 ) || ( $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 ), __( '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' => Wordlift_Entity_Service::valid_entity_post_types(),
+                /*
 				 * Ensure compatibility with Polylang.
 				 *
 				 * @see https://github.com/insideout10/wordlift-plugin/issues/855.
@@ -521,102 +521,102 @@ 
 				 *
 				 * @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.
-		$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
-	 *
-	 */
-	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.
+        $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
+     *
+     */
+    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 +90 added lines, -90 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();
 		}
 
@@ -122,22 +122,22 @@ 
 	 * @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;
 		}
 
@@ -148,8 +148,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;
 			}
 		}
@@ -169,19 +169,19 @@ 
 	 * @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
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+		$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
+		foreach ($classification_boxes as $cb) {
+			if (in_array($entity_type, $cb['registeredTypes'])) {
 				return $cb['id'];
 			}
 		}
@@ -196,13 +196,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;
 		// Retrieve Wordlift relation instances table name
@@ -215,9 +215,9 @@ 
 		);
 
 		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
+		$relation_instances = (int) $wpdb->get_var($stmt);
 		// 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;
 		}
 
@@ -225,13 +225,13 @@ 
 		$stmt = $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)
 		);
 		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
+		$meta_instances = (int) $wpdb->get_var($stmt);
 
 		// 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;
 		}
 
@@ -251,9 +251,9 @@ 
 	 * @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);
 	}
 
 	/**
@@ -268,10 +268,10 @@ 
 	 * @param WP_Post $post Post object.
 	 * @param bool $update Whether this is an existing post being updated or not.
 	 */
-	public function save_post( $post_id, $post, $update ) {
+	public function save_post($post_id, $post, $update) {
 
 		// 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;
 		}
 
@@ -281,16 +281,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 ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+		if ( ! isset($_REQUEST['post_ID']) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity($post_id)) {
 			return;
 		}
 
 		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? (array) $_REQUEST['wl_alternative_label'] : array();
+		$alt_labels = isset($_REQUEST['wl_alternative_label']) ? (array) $_REQUEST['wl_alternative_label'] : array();
 
-		if ( ( ! empty( $_POST['content'] ) && ! empty( $_POST['post_content'] ) ) || isset( $_REQUEST['wl_alternative_label'] ) ) {
+		if (( ! empty($_POST['content']) && ! empty($_POST['post_content'])) || isset($_REQUEST['wl_alternative_label'])) {
 			// 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);
 		}
 
 
@@ -305,49 +305,49 @@ 
 	 * @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);
 
 	}
 
@@ -360,9 +360,9 @@ 
 	 * @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);
 	}
 
 	/**
@@ -374,9 +374,9 @@ 
 	 * @return array An array with the entity title and labels.
 	 * @since 3.12.0
 	 */
-	public function get_labels( $post_id, $object_type = Object_Type_Enum::POST ) {
-		if ( $object_type === Object_Type_Enum::POST ) {
-			return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
+	public function get_labels($post_id, $object_type = Object_Type_Enum::POST) {
+		if ($object_type === Object_Type_Enum::POST) {
+			return array_merge((array) get_the_title($post_id), $this->get_alternative_labels($post_id));
 		}
 
 		// Term Reference dont have synonyms yet.
@@ -391,44 +391,44 @@ 
 	 * @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.
-		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 $this->get_alternative_label_input( $alt_label );
+			echo $this->get_alternative_label_input($alt_label);
 
 		};
 
 		// 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 ) || ( $dataset_uri && 0 !== strpos( $entity_id, $dataset_uri ) ) ) {
-			$rel_uri = Entity_Uri_Generator::create_uri( $type, $object_id );
+		if ( ! isset($entity_id) || ($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;
 			}
 		}
@@ -445,9 +445,9 @@ 
 	 * @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 ), __( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), __('Delete', 'wordlift'));
 	}
 
 	/**
@@ -461,13 +461,13 @@ 
 		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;
 		}
 
 		// Query the count.
-		$count = $wpdb->get_var( $wpdb->prepare(
+		$count = $wpdb->get_var($wpdb->prepare(
 			"SELECT COUNT( DISTINCT( tr.object_id ) )"
 			. " FROM {$wpdb->term_relationships} tr"
 			. " INNER JOIN {$wpdb->term_taxonomy} tt"
@@ -476,10 +476,10 @@ 
 			. "  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 );
+		set_transient('_wl_entity_service__count', $count, 900);
 
 		return $count;
 	}
@@ -494,7 +494,7 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public static function add_criterias( $args ) {
+	public static function add_criterias($args) {
 
 		// Build an optimal tax-query.
 		$tax_query = array(
@@ -538,28 +538,28 @@ 
 	 * @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.
-		$post_id = @wp_insert_post( array(
+		$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 ) ) {
+		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;
 	}
@@ -575,9 +575,9 @@ 
 	 * @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);
 	}
 
 	/**
@@ -589,16 +589,16 @@ 
 	 * @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);
 	}
 
 	/**
@@ -614,9 +614,9 @@ 
 	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);
 	}
 
 }

src/includes/class-wordlift.php

Indentation +1674 added lines, -1674 removed lines

@@ -82,1755 +82,1755 @@
  */
 class Wordlift {
 
-	//<editor-fold desc="## FIELDS">
-
-	/**
-	 * 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;
-	//</editor-fold>
-
-	// Experimental code added by Nishit for feature request 1496
-	private $webhook_loader;
-	// Experimental code ents here
-
-	/**
-	 * 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     = '3.35.0';
-		$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
-	 * @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( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		// The class responsible for plugin uninstall.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * WordLift's supported languages.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
-
-		/**
-		 * WordLift's supported countries.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
-
-		/**
-		 * Load cache-related files.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/*
+    //<editor-fold desc="## FIELDS">
+
+    /**
+     * 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;
+    //</editor-fold>
+
+    // Experimental code added by Nishit for feature request 1496
+    private $webhook_loader;
+    // Experimental code ents here
+
+    /**
+     * 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     = '3.35.0';
+        $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
+     * @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( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        // The class responsible for plugin uninstall.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * WordLift's supported languages.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+
+        /**
+         * WordLift's supported countries.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        // Add the entity rating service.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
+
+        /**
+         * Load cache-related files.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
-
-		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
-
-		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
-
-		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
-
-		/** Linked Data. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
-
-		/** Adapters. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
-
-		/** Autocomplete. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
-
-		/** Analytics */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.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( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-		} else {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
-		}
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The admin 'Install wizard' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
-
-		/**
-		 * The WordLift entity type list admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
-
-		/**
-		 * The WordLift entity type settings admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
-
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
-
-		/**
-		 * The admin 'WordLift Settings' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
-
-		/** Admin Pages */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
-
-		/**
-		 * The Products Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-products-navigator-shortcode.php';
-
-		/**
-		 * The chord shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
-
-		/**
-		 * The geomap shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
-
-		/**
-		 * The entity cloud shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
-
-		/**
-		 * The entity glossary shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
-
-		/**
-		 * Faceted Search shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
-
-		/**
-		 * The SEO service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
-
-		/**
-		 * The AMP service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
-
-		/** Widgets */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.php';
-
-		/*
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+
+        // The Publisher Service and the AJAX adapter.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
+
+        /**
+         * Load the WordLift key validation service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+
+        // Load the `Wordlift_Category_Taxonomy_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
+
+        // Load the `Wordlift_Entity_Page_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
+
+        /** Linked Data. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
+
+        /** Adapters. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
+
+        /** Autocomplete. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
+
+        /** Analytics */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.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( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+        } else {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
+        }
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The admin 'Install wizard' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+
+        /**
+         * The WordLift entity type list admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+
+        /**
+         * The WordLift entity type settings admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
+
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+
+        /**
+         * The admin 'WordLift Settings' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
+
+        /** Admin Pages */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+
+        /**
+         * The Products Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-products-navigator-shortcode.php';
+
+        /**
+         * The chord shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+
+        /**
+         * The geomap shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+
+        /**
+         * The entity cloud shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+
+        /**
+         * The entity glossary shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
+
+        /**
+         * Faceted Search shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+
+        /**
+         * The SEO service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
+
+        /**
+         * The AMP service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
+
+        /** Widgets */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.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( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
-		/*
+        /*
 		 * Schema.org Services.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . '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', function () use ( &$that, $schemaorg_property_service ) {
-
-			/** Services. */
-			// Create the configuration service.
-			$api_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 );
-			/*
+        if ( WL_ALL_ENTITY_TYPES ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . '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', function () use ( &$that, $schemaorg_property_service ) {
+
+            /** Services. */
+            // Create the configuration service.
+            $api_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( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . '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();
 
-			/** 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( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . '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( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . '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_Warning( $recipe_maker_validation_service );
-			new Yoast_Jsonld( $recipe_maker_validation_service );
-
-			/**
-			 * @since 3.27.4
-			 * Add the faq duplicate markup hook.
-			 */
-			new Faq_Duplicate_Markup_Remover();
-			/**
-			 * @since 3.33.1
-			 * Remove the duplicate HowTo Markup.
-			 */
-			new How_To_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
-			 */
-
-
-			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__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.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 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, 3 );
-		$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_Warning( $recipe_maker_validation_service );
+            new Yoast_Jsonld( $recipe_maker_validation_service );
+
+            /**
+             * @since 3.27.4
+             * Add the faq duplicate markup hook.
+             */
+            new Faq_Duplicate_Markup_Remover();
+            /**
+             * @since 3.33.1
+             * Remove the duplicate HowTo Markup.
+             */
+            new How_To_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
+             */
+
+
+            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__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.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 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, 3 );
+        $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
 		 */
-		if ( ! WL_ALL_ENTITY_TYPES ) {
-			$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, 2 );
-
-		/**
-		 * 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.
-		 */
-		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 );
-
-		/*
+        if ( ! WL_ALL_ENTITY_TYPES ) {
+            $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, 2 );
+
+        /**
+         * 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.
+         */
+        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, 4 );
-		}
-
-		/** 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, 4 );
-		}
-
-		$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();
-
-	}
-
-	/**
-	 * 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, 4 );
-		$that->loader->add_action( 'pre_get_posts', $that->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-		// $that->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $that->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		// $that->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $that->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
-
-		$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 ) {
-			$that->loader->add_filter( 'the_content', $that->content_filter_service, 'the_content' );
-		}
-
-		// 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, 4 );
+        }
+
+        /** 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, 4 );
+        }
+
+        $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();
+
+    }
+
+    /**
+     * 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, 4 );
+        $that->loader->add_action( 'pre_get_posts', $that->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
+        // $that->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $that->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        // $that->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $that->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+
+        $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 ) {
+            $that->loader->add_filter( 'the_content', $that->content_filter_service, 'the_content' );
+        }
+
+        // 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, 3 );
-
-		// 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
-	 * @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
-		 */
-
-		wp_register_script( 'wl_enabled_blocks', false );
-
-		$enabled_blocks = array();
-
-		/**
-		 * Filter name: wl_feature__enable__product-navigator
-		 * @since 3.32.3
-		 */
-		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.
-		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, 3 );
+
+        // 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
+     * @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
+         */
+
+        wp_register_script( 'wl_enabled_blocks', false );
+
+        $enabled_blocks = array();
+
+        /**
+         * Filter name: wl_feature__enable__product-navigator
+         * @since 3.32.3
+         */
+        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.
+        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 );
+
+    }
 
 }