insideout10 / wordlift-plugin

src/wordlift.php

Indentation +142 added lines, -142 removed lines

@@ -33,7 +33,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 define( 'WORDLIFT_VERSION', '3.40.0-dev' );
@@ -47,7 +47,7 @@ 
  * @since 3.33.6
  */
 if ( ! apply_filters( 'wl_is_enabled', true ) ) {
-	return;
+    return;
 }
 
 require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
@@ -76,29 +76,29 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
-
-	$log->info( 'Activating WordLift...' );
-
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
-
-	/**
-	 * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 * @since 3.19.2
-	 */
-	Wordlift_Http_Api::activate();
-
-	// Ensure the post type is registered before flushing the rewrite rules.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-	flush_rewrite_rules();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::activate();
+    $log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+
+    $log->info( 'Activating WordLift...' );
+
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
+
+    /**
+     * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     * @since 3.19.2
+     */
+    Wordlift_Http_Api::activate();
+
+    // Ensure the post type is registered before flushing the rewrite rules.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+    flush_rewrite_rules();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::activate();
 }
 
 /**
@@ -107,21 +107,21 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
-	Wordlift_Http_Api::deactivate();
-	Ttl_Cache_Cleaner::deactivate();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::deactivate();
-	/**
-	 * @since 3.27.8
-	 * Remove notification flag on deactivation.
-	 */
-	Key_Validation_Notice::remove_notification_flag();
-	flush_rewrite_rules();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
+    Wordlift_Http_Api::deactivate();
+    Ttl_Cache_Cleaner::deactivate();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::deactivate();
+    /**
+     * @since 3.27.8
+     * Remove notification flag on deactivation.
+     */
+    Key_Validation_Notice::remove_notification_flag();
+    flush_rewrite_rules();
 
 }
 
@@ -144,84 +144,84 @@ 
  * @since    1.0.0
  */
 function run_wordlift() {
-	/**
-	 * Filter: wl_feature__enable__widgets.
-	 *
-	 * @param bool whether the widgets needed to be registered, defaults to true.
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
-	}
-	add_filter( 'widget_text', 'do_shortcode' );
-
-	/**
-	 * Filter: wl_feature__enable__analysis
-	 *
-	 * @param bool Whether to send api request to analysis or not
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
-	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
-	}
-
-	$plugin = new Wordlift();
-	$plugin->run();
-
-	// Initialize the TTL Cache Cleaner.
-	new Ttl_Cache_Cleaner();
-
-	// Load the new Post Adapter.
-	new Post_Adapter();
-
-	// Load the API Data Hooks.
-	new Api_Data_Hooks();
-
-	add_action(
-		'plugins_loaded',
-		function () {
-			// All features from registry should be initialized here.
-			$features_registry = Features_Registry::get_instance();
-			$features_registry->initialize_all_features();
-		},
-		5
-	);
-
-	add_action(
-		'plugins_loaded',
-		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		function () use ( $plugin ) {
-
-			new Wordlift_Products_Navigator_Shortcode_REST();
-
-			// Register the Dataset module, requires `$api_service`.
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/shipping-data/index.php';
-
-			/*
+    /**
+     * Filter: wl_feature__enable__widgets.
+     *
+     * @param bool whether the widgets needed to be registered, defaults to true.
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
+        add_action( 'widgets_init', 'wl_register_chord_widget' );
+        add_action( 'widgets_init', 'wl_register_geo_widget' );
+        add_action( 'widgets_init', 'wl_register_timeline_widget' );
+    }
+    add_filter( 'widget_text', 'do_shortcode' );
+
+    /**
+     * Filter: wl_feature__enable__analysis
+     *
+     * @param bool Whether to send api request to analysis or not
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+    } else {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+    }
+
+    $plugin = new Wordlift();
+    $plugin->run();
+
+    // Initialize the TTL Cache Cleaner.
+    new Ttl_Cache_Cleaner();
+
+    // Load the new Post Adapter.
+    new Post_Adapter();
+
+    // Load the API Data Hooks.
+    new Api_Data_Hooks();
+
+    add_action(
+        'plugins_loaded',
+        function () {
+            // All features from registry should be initialized here.
+            $features_registry = Features_Registry::get_instance();
+            $features_registry->initialize_all_features();
+        },
+        5
+    );
+
+    add_action(
+        'plugins_loaded',
+        // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+        function () use ( $plugin ) {
+
+            new Wordlift_Products_Navigator_Shortcode_REST();
+
+            // Register the Dataset module, requires `$api_service`.
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/shipping-data/index.php';
+
+            /*
 			* Require the Entity annotation cleanup module.
 			*
 			* @since 3.34.6
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/cleanup/index.php';
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/cleanup/index.php';
 
-			/*
+            /*
 			* Import LOD entities.
 			*
 			* @since 3.35.0
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/lod-import/index.php';
+            require_once plugin_dir_path( __FILE__ ) . 'wordlift/lod-import/index.php';
 
-		}
-	);
+        }
+    );
 
 }
 
@@ -235,45 +235,45 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register(
-		function ( $class_name ) {
+    spl_autoload_register(
+        function ( $class_name ) {
 
-			// Bail out if these are not our classes.
-			if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
-				return false;
-			}
+            // Bail out if these are not our classes.
+            if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+                return false;
+            }
 
-			$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+            $class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
 
-			preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+            preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
 
-			$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-			$file = 'class-' . $matches[2] . '.php';
+            $path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
+            $file = 'class-' . $matches[2] . '.php';
 
-			$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+            $full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
 
-			if ( ! file_exists( $full_path ) ) {
-				return false;
-			}
+            if ( ! file_exists( $full_path ) ) {
+                return false;
+            }
 
-			require_once $full_path;
+            require_once $full_path;
 
-			return true;
-		}
-	);
+            return true;
+        }
+    );
 
 }
 
 function wl_block_categories( $categories ) {
-	return array_merge(
-		$categories,
-		array(
-			array(
-				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
-			),
-		)
-	);
+    return array_merge(
+        $categories,
+        array(
+            array(
+                'slug'  => 'wordlift',
+                'title' => __( 'WordLift', 'wordlift' ),
+            ),
+        )
+    );
 }
 
 /**
@@ -281,19 +281,19 @@ 
  * this has to be removed when removing the legacy fields from the ui.
  */
 function wl_enqueue_leaflet( $in_footer = false ) {
-	// Leaflet.
-	wp_enqueue_style( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.css', array(), '1.6.0' );
-	wp_enqueue_script( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer );
+    // Leaflet.
+    wp_enqueue_style( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.css', array(), '1.6.0' );
+    wp_enqueue_script( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer );
 }
 
 add_filter( 'block_categories', 'wl_block_categories', 10 );
 
 // Temporary fix for a typo in WooCommerce Extension.
 add_filter(
-	'wl_feature__enable__dataset',
-	function ( $value ) {
-		return apply_filters( 'wl_features__enable__dataset', $value );
-	}
+    'wl_feature__enable__dataset',
+    function ( $value ) {
+        return apply_filters( 'wl_features__enable__dataset', $value );
+    }
 );
 
 require_once __DIR__ . '/modules/food-kg/load.php';

Spacing +50 added lines, -50 removed lines

@@ -32,25 +32,25 @@ 
 use Wordlift\Post\Post_Adapter;
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-define( 'WORDLIFT_VERSION', '3.40.0-dev' );
+define('WORDLIFT_VERSION', '3.40.0-dev');
 
-require_once __DIR__ . '/modules/common/load.php';
-require_once __DIR__ . '/modules/include-exclude/load.php';
+require_once __DIR__.'/modules/common/load.php';
+require_once __DIR__.'/modules/include-exclude/load.php';
 
 /**
  * Filter to disable WLP on any request, defaults to true.
  *
  * @since 3.33.6
  */
-if ( ! apply_filters( 'wl_is_enabled', true ) ) {
+if ( ! apply_filters('wl_is_enabled', true)) {
 	return;
 }
 
-require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
+require_once plugin_dir_path(__FILE__).'vendor/autoload.php';
 
 /*
 	 * We introduce the WordLift autoloader, since we start using classes in namespaces, i.e. Wordlift\Http.
@@ -60,15 +60,15 @@ 
 wordlift_plugin_autoload_register();
 
 // Include WordLift constants.
-require_once plugin_dir_path( __FILE__ ) . 'wordlift-constants.php';
+require_once plugin_dir_path(__FILE__).'wordlift-constants.php';
 
 // Load modules.
-require_once plugin_dir_path( __FILE__ ) . 'modules/core/wordlift-core.php';
+require_once plugin_dir_path(__FILE__).'modules/core/wordlift-core.php';
 
-require_once plugin_dir_path( __FILE__ ) . 'deprecations.php';
+require_once plugin_dir_path(__FILE__).'deprecations.php';
 
 // Load early to enable/disable features.
-require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
+require_once plugin_dir_path(__FILE__).'wordlift/features/index.php';
 
 /**
  * The code that runs during plugin activation.
@@ -76,11 +76,11 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+	$log = Wordlift_Log_Service::get_logger('activate_wordlift');
 
-	$log->info( 'Activating WordLift...' );
+	$log->info('Activating WordLift...');
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 
 	/**
@@ -107,7 +107,7 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 	Wordlift_Http_Api::deactivate();
 	Ttl_Cache_Cleaner::deactivate();
@@ -125,14 +125,14 @@ 
 
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.
@@ -152,12 +152,12 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
+	if (apply_filters('wl_feature__enable__widgets', true)) {
+		add_action('widgets_init', 'wl_register_chord_widget');
+		add_action('widgets_init', 'wl_register_geo_widget');
+		add_action('widgets_init', 'wl_register_timeline_widget');
 	}
-	add_filter( 'widget_text', 'do_shortcode' );
+	add_filter('widget_text', 'do_shortcode');
 
 	/**
 	 * Filter: wl_feature__enable__analysis
@@ -167,10 +167,10 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+	if (apply_filters('wl_feature__enable__analysis', true)) {
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action');
 	}
 
 	$plugin = new Wordlift();
@@ -187,7 +187,7 @@ 
 
 	add_action(
 		'plugins_loaded',
-		function () {
+		function() {
 			// All features from registry should be initialized here.
 			$features_registry = Features_Registry::get_instance();
 			$features_registry->initialize_all_features();
@@ -198,27 +198,27 @@ 
 	add_action(
 		'plugins_loaded',
 		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		function () use ( $plugin ) {
+		function() use ($plugin) {
 
 			new Wordlift_Products_Navigator_Shortcode_REST();
 
 			// Register the Dataset module, requires `$api_service`.
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/shipping-data/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/dataset/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/shipping-data/index.php';
 
 			/*
 			* Require the Entity annotation cleanup module.
 			*
 			* @since 3.34.6
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/cleanup/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/cleanup/index.php';
 
 			/*
 			* Import LOD entities.
 			*
 			* @since 3.35.0
 			*/
-			require_once plugin_dir_path( __FILE__ ) . 'wordlift/lod-import/index.php';
+			require_once plugin_dir_path(__FILE__).'wordlift/lod-import/index.php';
 
 		}
 	);
@@ -236,23 +236,23 @@ 
 function wordlift_plugin_autoload_register() {
 
 	spl_autoload_register(
-		function ( $class_name ) {
+		function($class_name) {
 
 			// Bail out if these are not our classes.
-			if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+			if (0 !== strpos($class_name, 'Wordlift\\')) {
 				return false;
 			}
 
-			$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+			$class_name_lc = strtolower(str_replace('_', '-', $class_name));
 
-			preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+			preg_match('|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches);
 
-			$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-			$file = 'class-' . $matches[2] . '.php';
+			$path = str_replace('\\', DIRECTORY_SEPARATOR, $matches[1]);
+			$file = 'class-'.$matches[2].'.php';
 
-			$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+			$full_path = plugin_dir_path(__FILE__).$path.DIRECTORY_SEPARATOR.$file;
 
-			if ( ! file_exists( $full_path ) ) {
+			if ( ! file_exists($full_path)) {
 				return false;
 			}
 
@@ -264,13 +264,13 @@ 
 
 }
 
-function wl_block_categories( $categories ) {
+function wl_block_categories($categories) {
 	return array_merge(
 		$categories,
 		array(
 			array(
 				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
+				'title' => __('WordLift', 'wordlift'),
 			),
 		)
 	);
@@ -280,22 +280,22 @@ 
  * This function is created temporarily to handle the legacy library,
  * this has to be removed when removing the legacy fields from the ui.
  */
-function wl_enqueue_leaflet( $in_footer = false ) {
+function wl_enqueue_leaflet($in_footer = false) {
 	// Leaflet.
-	wp_enqueue_style( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.css', array(), '1.6.0' );
-	wp_enqueue_script( 'wl-leaflet', plugin_dir_url( __FILE__ ) . 'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer );
+	wp_enqueue_style('wl-leaflet', plugin_dir_url(__FILE__).'js/leaflet/leaflet.css', array(), '1.6.0');
+	wp_enqueue_script('wl-leaflet', plugin_dir_url(__FILE__).'js/leaflet/leaflet.js', array(), '1.6.0', $in_footer);
 }
 
-add_filter( 'block_categories', 'wl_block_categories', 10 );
+add_filter('block_categories', 'wl_block_categories', 10);
 
 // Temporary fix for a typo in WooCommerce Extension.
 add_filter(
 	'wl_feature__enable__dataset',
-	function ( $value ) {
-		return apply_filters( 'wl_features__enable__dataset', $value );
+	function($value) {
+		return apply_filters('wl_features__enable__dataset', $value);
 	}
 );
 
-require_once __DIR__ . '/modules/food-kg/load.php';
-require_once __DIR__ . '/modules/acf4so/load.php';
-require_once __DIR__ . '/modules/pods/load.php';
+require_once __DIR__.'/modules/food-kg/load.php';
+require_once __DIR__.'/modules/acf4so/load.php';
+require_once __DIR__.'/modules/pods/load.php';

src/includes/class-wordlift.php

Indentation +1720 added lines, -1720 removed lines

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

Spacing +286 added lines, -286 removed lines

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

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

Indentation +498 added lines, -498 removed lines

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

Spacing +97 added lines, -97 removed lines

@@ -51,12 +51,12 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
+	public function __construct($entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false) {
+		parent::__construct($entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create());
 		$this->disable_convert_filters = $disable_convert_filters;
 		$this->object_relation_service = Object_Relation_Service::get_instance();
 		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Post_To_Jsonld_Converter');
 
 		self::$instance = $this;
 
@@ -68,7 +68,7 @@ 
 	}
 
 	public function new_instance_with_filters_disabled() {
-		return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
+		return new static($this->entity_type_service, $this->user_service, $this->attachment_service, true);
 	}
 
 	/**
@@ -82,30 +82,30 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.10.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array()) {
 
 		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
+		$post = get_post($post_id);
+		if (null === $post) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references, $references_infos );
+		$jsonld = parent::convert($post_id, $references, $references_infos);
 
 		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
+		if (empty($jsonld['@type'])) {
 			$jsonld['@type'] = 'WebPage';
 		}
 
 		// Get the entity name.
 		$jsonld['headline'] = $post->post_title;
 
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_post( $post_id );
+		$custom_fields = $this->entity_type_service->get_custom_fields_for_post($post_id);
 
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
+		if (isset($custom_fields)) {
+			$this->process_type_custom_fields($jsonld, $custom_fields, $post, $references, $references_infos);
 		}
 
 		// Set the published and modified dates.
@@ -118,19 +118,19 @@ 
 		 */
 		try {
 			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+			$timezone         = get_option('timezone_string');
+			if ( ! empty($timezone)) {
+				date_default_timezone_set($timezone); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i:sP', false, $post);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i:sP', false, $post);
+				date_default_timezone_set($default_timezone); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
 			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+		} catch (Exception $e) {
+			$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+			$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 		}
 
 		// Get the word count for the post.
@@ -141,8 +141,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter        = new Wordlift_Post_Adapter($post_id);
 			$jsonld['wordCount'] = $post_adapter->word_count();
 		}
 
@@ -153,37 +153,37 @@ 
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter    = new Wordlift_Post_Adapter($post_id);
 			$keywords        = $post_adapter->keywords();
 			$article_section = $post_adapter->article_section();
 			$comment_count   = $post_adapter->comment_count();
 			$locale          = $post_adapter->locale();
 
-			if ( isset( $keywords ) ) {
+			if (isset($keywords)) {
 				$jsonld['keywords'] = $keywords;
 			}
-			if ( ! empty( $article_section ) ) {
+			if ( ! empty($article_section)) {
 				$jsonld['articleSection'] = $article_section;
 			}
 			$jsonld['commentCount'] = $comment_count;
 			$jsonld['inLanguage']   = $locale;
-			$post_adapter->add_references( $post_id, $references );
+			$post_adapter->add_references($post_id, $references);
 		}
 
 		// Set the publisher.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
-		$references = $this->convert_references( $references );
+		$references = $this->convert_references($references);
 
 		// Process the references if any.
-		$this->set_mentions_and_about( $references, $post, $jsonld );
+		$this->set_mentions_and_about($references, $post, $jsonld);
 
 		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
+		$jsonld['author'] = $this->get_author($post->post_author, $references);
 
 		// Return the JSON-LD if filters are disabled by the client.
-		if ( $this->disable_convert_filters ) {
+		if ($this->disable_convert_filters) {
 			return $jsonld;
 		}
 
@@ -224,7 +224,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+		return apply_filters('wl_post_jsonld', $jsonld, $post_id, $references);
 	}
 
 	/**
@@ -239,18 +239,18 @@ 
 	 * @return string|array A JSON-LD structure.
 	 * @since 3.14.0
 	 */
-	public function get_author( $author_id, &$references ) {
+	public function get_author($author_id, &$references) {
 
 		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
+		$entity_id = $this->user_service->get_entity($author_id);
 
 		// If there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+		if (empty($entity_id) || 'publish' !== get_post_status($entity_id)) {
 
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
+			$author            = get_the_author_meta('display_name', $author_id);
+			$author_first_name = get_the_author_meta('first_name', $author_id);
+			$author_last_name  = get_the_author_meta('last_name', $author_id);
+			$author_uri        = $this->user_service->get_uri($author_id);
 
 			return array(
 				'@type'      => 'Person',
@@ -258,12 +258,12 @@ 
 				'name'       => $author,
 				'givenName'  => $author_first_name,
 				'familyName' => $author_last_name,
-				'url'        => get_author_posts_url( $author_id ),
+				'url'        => get_author_posts_url($author_id),
 			);
 		}
 
 		// Add the author to the references.
-		$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+		$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri($entity_id);
 		$references[] = $entity_id;
 
 		// Return the JSON-LD for the referenced entity.
@@ -279,41 +279,41 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	protected function set_publisher( &$params ) {
+	protected function set_publisher(&$params) {
 
 		// If the publisher id isn't set don't do anything.
 		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-		if ( null === $publisher_id ) {
+		if (null === $publisher_id) {
 			return;
 		}
 
 		// Get the post instance.
-		$post = get_post( $publisher_id );
-		if ( null === $post ) {
+		$post = get_post($publisher_id);
+		if (null === $post) {
 			// Publisher not found.
 			return;
 		}
 
 		// Get the item id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
+		$id = Wordlift_Entity_Service::get_instance()->get_uri($publisher_id);
 
 		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
+		$type = $this->entity_type_service->get($publisher_id);
 
 		// Get the name.
 		$name = $post->post_title;
 
 		// Set the publisher data.
 		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
+			'@type' => $this->relative_to_context($type['uri']),
 			'@id'   => $id,
 			'name'  => $name,
 		);
 
 		// Add the sameAs values associated with the publisher.
 		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
+		$sameas          = $storage_factory->post_meta(Wordlift_Schema_Service::FIELD_SAME_AS)->get($publisher_id);
+		if ( ! empty($sameas)) {
 			$params['publisher']['sameAs'] = $sameas;
 		}
 
@@ -321,15 +321,15 @@ 
 		// support the logo property.
 		//
 		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+		if (1 !== preg_match('~Organization$~', $type['uri'])) {
 			return;
 		}
 
 		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
+		$publisher_logo = $this->get_publisher_logo($post->ID);
 
 		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
+		if (false === $publisher_logo) {
 			return;
 		}
 
@@ -363,14 +363,14 @@ 
 	 * @since 3.19.2
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
 	 */
-	private function get_publisher_logo( $post_id ) {
+	private function get_publisher_logo($post_id) {
 
 		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
+		$thumbnail_id = get_post_thumbnail_id($post_id);
 
 		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
+		if (empty($thumbnail_id) || 0 === $thumbnail_id) {
+			$this->log->info("Featured image not set for post $post_id.");
 
 			return false;
 		}
@@ -379,24 +379,24 @@ 
 		$uploads_dir = wp_upload_dir();
 
 		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
+		$metadata = wp_get_attachment_metadata($thumbnail_id);
 
 		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
+		if ( ! isset($metadata['file'])) {
+			$this->log->warn("Featured image file not found for post $post_id.");
 
 			return false;
 		}
 
 		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+		$path = $uploads_dir['basedir'].DIRECTORY_SEPARATOR.$metadata['file'];
 
 		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+		if ( ! file_exists($path)) {
+			$this->log->warn("Featured image file $path doesn't exist for post $post_id.");
 
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
+			$attachment_image_src = wp_get_attachment_image_src($thumbnail_id, '');
+			if ($attachment_image_src) {
 				return array(
 					'url'    => $attachment_image_src[0],
 					'width'  => $attachment_image_src[1],
@@ -410,27 +410,27 @@ 
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+		$original_file_editor = wp_get_image_editor($path);
+		if (is_wp_error($original_file_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $path for post $post_id.");
 
 			return false;
 		}
 
 		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
 		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+		$publisher_logo_path = $original_file_editor->generate_filename('-publisher-logo');
 
 		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
+		if ( ! file_exists($publisher_logo_path)) {
+			$original_file_editor->resize(600, 60);
+			$original_file_editor->save($publisher_logo_path);
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+		$publisher_logo_editor = wp_get_image_editor($publisher_logo_path);
+		if (is_wp_error($publisher_logo_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id.");
 
 			return false;
 		}
@@ -440,7 +440,7 @@ 
 
 		// Finally return the array with data.
 		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+			'url'    => $uploads_dir['baseurl'].substr($publisher_logo_path, strlen($uploads_dir['basedir'])),
 			'width'  => $size['width'],
 			'height' => $size['height'],
 		);
@@ -453,9 +453,9 @@ 
 	 *
 	 * @return void
 	 */
-	private function set_mentions_and_about( $references, $post, &$jsonld ) {
+	private function set_mentions_and_about($references, $post, &$jsonld) {
 
-		if ( count( $references ) === 0 ) {
+		if (count($references) === 0) {
 			return;
 		}
 
@@ -464,23 +464,23 @@ 
 		$about    = array();
 
 		// If the entity is in the title, then it should be an `about`.
-		foreach ( $references as $reference ) {
+		foreach ($references as $reference) {
 
-			if ( ! $reference instanceof Reference ) {
+			if ( ! $reference instanceof Reference) {
 				// This condition should never be reached.
 				continue;
 			}
 
 			// Get the entity labels.
-			$labels = Wordlift_Entity_Service::get_instance()->get_labels( $reference->get_id(), $reference->get_type() );
+			$labels = Wordlift_Entity_Service::get_instance()->get_labels($reference->get_id(), $reference->get_type());
 			// Get the entity URI.
 			$item = array(
-				'@id' => Wordlift_Entity_Service::get_instance()->get_uri( $reference->get_id(), $reference->get_type() ),
+				'@id' => Wordlift_Entity_Service::get_instance()->get_uri($reference->get_id(), $reference->get_type()),
 			);
 
 			$escaped_labels = array_map(
-				function ( $value ) {
-					return preg_quote( $value, '/' );
+				function($value) {
+					return preg_quote($value, '/');
 				},
 				$labels
 			);
@@ -488,13 +488,13 @@ 
 			$matches = false;
 
 			// When the title is empty, then we shouldn't yield a match to about section.
-			if ( array_filter( $escaped_labels ) ) {
+			if (array_filter($escaped_labels)) {
 				// Check if the labels match any part of the title.
-				$matches = 1 === preg_match( '/\b(' . implode( '|', $escaped_labels ) . ')\b/iu', $post->post_title );
+				$matches = 1 === preg_match('/\b('.implode('|', $escaped_labels).')\b/iu', $post->post_title);
 			}
 
 			// If the title matches, assign the entity to the about, otherwise to the mentions.
-			if ( $matches ) {
+			if ($matches) {
 				$about[] = $item;
 			} else {
 				$mentions[] = $item;
@@ -502,12 +502,12 @@ 
 		}
 
 		// If we have abouts, assign them to the JSON-LD.
-		if ( 0 < count( $about ) ) {
+		if (0 < count($about)) {
 			$jsonld['about'] = $about;
 		}
 
 		// If we have mentions, assign them to the JSON-LD.
-		if ( 0 < count( $mentions ) ) {
+		if (0 < count($mentions)) {
 			$jsonld['mentions'] = $mentions;
 		}
 
@@ -521,13 +521,13 @@ 
 	 *
 	 * @return Reference[]
 	 */
-	private function convert_references( $references ) {
+	private function convert_references($references) {
 		return array_map(
-			function ( $reference ) {
+			function($reference) {
 				// Legacy code may still push numerical references to this
 				// $references variable, so convert it to post references.
-				if ( is_numeric( $reference ) ) {
-					  return new Post_Reference( $reference );
+				if (is_numeric($reference)) {
+					  return new Post_Reference($reference);
 				}
 
 				return $reference;