insideout10 / wordlift-plugin

src/admin/class-wordlift-admin.php

Indentation +309 added lines, -309 removed lines

@@ -22,360 +22,360 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Batch_Operation_Ajax_Adapter $sync_batch_operation_ajax_adapter The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
-	 */
-	private $sync_batch_operation_ajax_adapter;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.19.4
-	 * @access private
-	 * @var Wordlift_Admin $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @param string                          $plugin_name The name of this plugin.
-	 * @param string                          $version The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service        $notice_service The notice service.
-	 * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-
-			// Require the PHP files for the next code fragment.
-			self::require_files();
-
-			// Add Wordlift custom block category.
-			self::add_block_category();
-
-			new Wordlift_Dashboard_Latest_News();
-
-			// Search Rankings.
-			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
-			new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
-
-			/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Batch_Operation_Ajax_Adapter $sync_batch_operation_ajax_adapter The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
+     */
+    private $sync_batch_operation_ajax_adapter;
+
+    /**
+     * The singleton instance.
+     *
+     * @since 3.19.4
+     * @access private
+     * @var Wordlift_Admin $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since  1.0.0
+     *
+     * @param string                          $plugin_name The name of this plugin.
+     * @param string                          $version The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service        $notice_service The notice service.
+     * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+        // Load additional code if we're in the admin UI.
+        if ( is_admin() ) {
+
+            // Require the PHP files for the next code fragment.
+            self::require_files();
+
+            // Add Wordlift custom block category.
+            self::add_block_category();
+
+            new Wordlift_Dashboard_Latest_News();
+
+            // Search Rankings.
+            $search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
+            new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
+
+            /*
 			 * Add support for `All Entity Types`.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
+            if ( WL_ALL_ENTITY_TYPES ) {
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
 
-				// new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
-				/*
+                // new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
+                /*
 				 * The `Mappings` admin page.
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
-				new Wordlift_Admin_Mappings_Page();
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
+                new Wordlift_Admin_Mappings_Page();
 
-				/*
+                /*
 				 * Allow sync'ing the schema.org taxonomy with the schema.org json file.
 				 *
 				 * @since 3.20.0
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
 
-				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
+                $this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
 
-			}
+            }
 
-			/*
+            /*
 			 * Add the {@link Wordlift_Admin_Term_Adapter}.
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
-			new Wordlift_Admin_Term_Adapter();
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
+            new Wordlift_Admin_Term_Adapter();
 
-			/*
+            /*
 			 * The new dashboard.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/879
 			 */
-			new Wordlift_Admin_Dashboard_V2(
-				$search_rankings_service,
-				Wordlift::get_instance()->get_dashboard_service(),
-				Wordlift_Entity_Service::get_instance()
-			);
-			new Wordlift_Admin_Not_Enriched_Filter();
-
-		}
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @return \Wordlift_Admin The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/*
+            new Wordlift_Admin_Dashboard_V2(
+                $search_rankings_service,
+                Wordlift::get_instance()->get_dashboard_service(),
+                Wordlift_Entity_Service::get_instance()
+            );
+            new Wordlift_Admin_Not_Enriched_Filter();
+
+        }
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.19.4
+     *
+     * @return \Wordlift_Admin The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /*
 		 * Do not load our scripts on the Filter Urls plugin admin pages.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/901
 		 * @since 3.20.0
 		 */
-		$screen = get_current_screen();
-		if ( is_a( $screen, 'WP_Screen' ) && 'filter-urls_page_filter_urls_form' === $screen->id ) {
-			return;
-		}
+        $screen = get_current_screen();
+        if ( is_a( $screen, 'WP_Screen' ) && 'filter-urls_page_filter_urls_form' === $screen->id ) {
+            return;
+        }
 
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
 
 
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+        $can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
 
-		/*
+        /*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
 		 * that cannot edit create entities will always see the local entities.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/839
 		 */
-		$autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'                   => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                     => 'entity_by_title',
-			'datasetUri'                 => $this->configuration_service->get_dataset_uri(),
-			'language'                   => $this->configuration_service->get_language_code(),
-			'link_by_default'            => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'        => $can_edit_wordlift_entities ? 'yes' : 'no',
-			'l10n'                       => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-				'Add keywords to track'                                              => __( 'Add Keywords to track', 'wordlift' ),
-			),
-			'wl_autocomplete_nonce'      => wp_create_nonce( 'wordlift_autocomplete' ),
-			'autocomplete_scope'         => $autocomplete_scope,
-			/**
-			 * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
-			 * or change the TinyMCE id.
-			 *
-			 * The editor id is currently referenced by `src/coffee/editpost-widget/app.services.EditorAdapter.coffee`.
-			 *
-			 * @since 3.19.4
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/848
-			 *
-			 * @param string $editor The default editor id, by default `content`.
-			 */
-			'default_editor_id'          => apply_filters( 'wl_default_editor_id', 'content' ),
-			/**
-			 * Add the link to the Search Keywords admin page.
-			 *
-			 * @since 3.20.0
-			 */
-			'search_keywords_admin_page' => admin_url( 'admin.php?page=wl_configuration_admin_menu&tab=search-keywords' ),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
-			$params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
-
-			/*
+        $autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'                   => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                     => 'entity_by_title',
+            'datasetUri'                 => $this->configuration_service->get_dataset_uri(),
+            'language'                   => $this->configuration_service->get_language_code(),
+            'link_by_default'            => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'        => $can_edit_wordlift_entities ? 'yes' : 'no',
+            'l10n'                       => array(
+                'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+                'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
+                'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
+                'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+                'Add keywords to track'                                              => __( 'Add Keywords to track', 'wordlift' ),
+            ),
+            'wl_autocomplete_nonce'      => wp_create_nonce( 'wordlift_autocomplete' ),
+            'autocomplete_scope'         => $autocomplete_scope,
+            /**
+             * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
+             * or change the TinyMCE id.
+             *
+             * The editor id is currently referenced by `src/coffee/editpost-widget/app.services.EditorAdapter.coffee`.
+             *
+             * @since 3.19.4
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/848
+             *
+             * @param string $editor The default editor id, by default `content`.
+             */
+            'default_editor_id'          => apply_filters( 'wl_default_editor_id', 'content' ),
+            /**
+             * Add the link to the Search Keywords admin page.
+             *
+             * @since 3.20.0
+             */
+            'search_keywords_admin_page' => admin_url( 'admin.php?page=wl_configuration_admin_menu&tab=search-keywords' ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
+            $params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
+
+            /*
 			 * Add the `properties` if `WL_ALL_ENTITY_TYPES` is enabled.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
-			}
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
-
-	}
-
-	/**
-	 * Require files needed for the Admin UI.
-	 *
-	 * @since 3.20.0
-	 */
-	private static function require_files() {
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
-
-	}
-
-	/**
-	 * Add Wordlift custom block category.
-	 *
-	 * @since 3.21.0
-	 */
-	private static function add_block_category() {
-		add_filter( 'block_categories', function( $categories, $post ) {
-			return array_merge(
-				$categories,
-				array(
-					array(
-						'slug' => 'wordlift',
-						'title' => 'WordLift Blocks',
-					),
-				)
-			);
-		}, 10, 2 );
-	}
-
-	public static function is_gutenberg() {
-		if ( function_exists( 'is_gutenberg_page' ) &&
-		     is_gutenberg_page()
-		) {
-			// The Gutenberg plugin is on.
-			return true;
-		}
-		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) &&
-		     $current_screen->is_block_editor()
-		) {
-			// Gutenberg page on 5+.
-			return true;
-		}
-
-		return false;
-	}
+            if ( WL_ALL_ENTITY_TYPES ) {
+                $params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
+            }
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
+
+    }
+
+    /**
+     * Require files needed for the Admin UI.
+     *
+     * @since 3.20.0
+     */
+    private static function require_files() {
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
+
+    }
+
+    /**
+     * Add Wordlift custom block category.
+     *
+     * @since 3.21.0
+     */
+    private static function add_block_category() {
+        add_filter( 'block_categories', function( $categories, $post ) {
+            return array_merge(
+                $categories,
+                array(
+                    array(
+                        'slug' => 'wordlift',
+                        'title' => 'WordLift Blocks',
+                    ),
+                )
+            );
+        }, 10, 2 );
+    }
+
+    public static function is_gutenberg() {
+        if ( function_exists( 'is_gutenberg_page' ) &&
+             is_gutenberg_page()
+        ) {
+            // The Gutenberg plugin is on.
+            return true;
+        }
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) &&
+             $current_screen->is_block_editor()
+        ) {
+            // Gutenberg page on 5+.
+            return true;
+        }
+
+        return false;
+    }
 
 }

Spacing +48 added lines, -48 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param \Wordlift_Notice_Service        $notice_service The notice service.
 	 * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -98,18 +98,18 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
+		if (is_admin()) {
 
 			// Require the PHP files for the next code fragment.
 			self::require_files();
@@ -120,8 +120,8 @@ 
 			new Wordlift_Dashboard_Latest_News();
 
 			// Search Rankings.
-			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
-			new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
+			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service(Wordlift_Api_Service::get_instance());
+			new Wordlift_Admin_Search_Rankings_Ajax_Adapter($search_rankings_service);
 
 			/*
 			 * Add support for `All Entity Types`.
@@ -130,15 +130,15 @@ 
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
+			if (WL_ALL_ENTITY_TYPES) {
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-schemaorg-property-metabox.php';
 
 				// new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
 				/*
 				 * The `Mappings` admin page.
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-mappings-page.php';
 				new Wordlift_Admin_Mappings_Page();
 
 				/*
@@ -146,9 +146,9 @@ 
 				 *
 				 * @since 3.20.0
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
 
-				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
+				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter(new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync');
 
 			}
 
@@ -157,7 +157,7 @@ 
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-term-adapter.php';
 			new Wordlift_Admin_Term_Adapter();
 
 			/*
@@ -212,7 +212,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -230,19 +230,19 @@ 
 		 * @since 3.20.0
 		 */
 		$screen = get_current_screen();
-		if ( is_a( $screen, 'WP_Screen' ) && 'filter-urls_page_filter_urls_form' === $screen->id ) {
+		if (is_a($screen, 'WP_Screen') && 'filter-urls_page_filter_urls_form' === $screen->id) {
 			return;
 		}
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+		$can_edit_wordlift_entities = current_user_can('edit_wordlift_entities');
 
 		/*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
@@ -255,7 +255,7 @@ 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'                   => admin_url( 'admin-ajax.php' ),
+			'ajax_url'                   => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                     => 'entity_by_title',
 			'datasetUri'                 => $this->configuration_service->get_dataset_uri(),
@@ -266,15 +266,15 @@ 
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
 			'can_create_entities'        => $can_edit_wordlift_entities ? 'yes' : 'no',
 			'l10n'                       => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-				'Add keywords to track'                                              => __( 'Add Keywords to track', 'wordlift' ),
+				'You already published an entity with the same name'                 => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                                              => array('text' => __('Choose Logo', 'wordlift')),
+				'Type at least 3 characters to search...'                            => _x('Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift'),
+				'No results found for your search.'                                  => _x('No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift'),
+				'Please wait while we look for entities in the linked data cloud...' => _x('Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift'),
+				'Add keywords to track'                                              => __('Add Keywords to track', 'wordlift'),
 			),
-			'wl_autocomplete_nonce'      => wp_create_nonce( 'wordlift_autocomplete' ),
+			'wl_autocomplete_nonce'      => wp_create_nonce('wordlift_autocomplete'),
 			'autocomplete_scope'         => $autocomplete_scope,
 			/**
 			 * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
@@ -288,41 +288,41 @@ 
 			 *
 			 * @param string $editor The default editor id, by default `content`.
 			 */
-			'default_editor_id'          => apply_filters( 'wl_default_editor_id', 'content' ),
+			'default_editor_id'          => apply_filters('wl_default_editor_id', 'content'),
 			/**
 			 * Add the link to the Search Keywords admin page.
 			 *
 			 * @since 3.20.0
 			 */
-			'search_keywords_admin_page' => admin_url( 'admin.php?page=wl_configuration_admin_menu&tab=search-keywords' ),
+			'search_keywords_admin_page' => admin_url('admin.php?page=wl_configuration_admin_menu&tab=search-keywords'),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
-			$params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
+			$params['itemId']                      = $entity_service->get_uri($entity_being_edited->ID);
+			$params['wl_schemaorg_property_nonce'] = wp_create_nonce('wl_schemaorg_property');
 
 			/*
 			 * Add the `properties` if `WL_ALL_ENTITY_TYPES` is enabled.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
+			if (WL_ALL_ENTITY_TYPES) {
+				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all($post->ID);
 			}
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
+		wp_localize_script($this->plugin_name, 'wlSettings', apply_filters('wl_admin_settings', $params));
 
 	}
 
@@ -333,11 +333,11 @@ 
 	 */
 	private static function require_files() {
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-latest-news.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-v2.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-not-enriched-filter.php';
 
 	}
 
@@ -347,7 +347,7 @@ 
 	 * @since 3.21.0
 	 */
 	private static function add_block_category() {
-		add_filter( 'block_categories', function( $categories, $post ) {
+		add_filter('block_categories', function($categories, $post) {
 			return array_merge(
 				$categories,
 				array(
@@ -357,18 +357,18 @@ 
 					),
 				)
 			);
-		}, 10, 2 );
+		}, 10, 2);
 	}
 
 	public static function is_gutenberg() {
-		if ( function_exists( 'is_gutenberg_page' ) &&
+		if (function_exists('is_gutenberg_page') &&
 		     is_gutenberg_page()
 		) {
 			// The Gutenberg plugin is on.
 			return true;
 		}
 		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) &&
+		if (method_exists($current_screen, 'is_block_editor') &&
 		     $current_screen->is_block_editor()
 		) {
 			// Gutenberg page on 5+.

src/includes/class-wordlift.php

Indentation +1663 added lines, -1663 removed lines

@@ -28,1499 +28,1499 @@ 
  */
 class Wordlift {
 
-	//<editor-fold desc="## FIELDS">
-
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The {@link Wordlift_Tinymce_Adapter} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
-	 */
-	protected $tinymce_adapter;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since  3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	protected $schema_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.1.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	protected $entity_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 WordLift Dashboard adapter.
-	 *
-	 * @since  3.4.0
-	 * @access private
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
-	 */
-	private $dashboard_service;
-
-	/**
-	 * 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_Sparql_Service} instance.
-	 *
-	 * @since    3.6.0
-	 * @access   protected
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	protected $sparql_service;
-
-	/**
-	 * A {@link Wordlift_Import_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
-	 */
-	private $import_service;
-
-	/**
-	 * A {@link Wordlift_Rebuild_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
-	 */
-	private $rebuild_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 'WordLift Batch analysis' page.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Batch_Analysis_Page $sbatch_analysis_page The 'WordLift batcch analysis' page.
-	 */
-	protected $batch_analysis_page;
-
-	/**
-	 * The install wizard page.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
-	 */
-	private $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;
-
-	/**
-	 * 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_Configuration_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	protected $configuration_service;
-
-	/**
-	 * 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_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	protected $entity_type_service;
-
-	/**
-	 * A {@link Wordlift_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_Admin_Status_Page} class.
-	 *
-	 * @since  3.9.8
-	 * @access private
-	 * @var \Wordlift_Admin_Status_Page $status_page The {@link Wordlift_Admin_Status_Page} class.
-	 */
-	private $status_page;
-
-	/**
-	 * 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_Batch_Analysis_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Batch_Analysis_Service $batch_analysis_service The {@link Wordlift_Batch_Analysis_Service} instance.
-	 */
-	protected $batch_analysis_service;
-
-	/**
-	 * 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_Batch_Analysis_Adapter} instance.
-	 *
-	 * @since  3.14.2
-	 * @access protected
-	 * @var \Wordlift_Batch_Analysis_Adapter $batch_analysis_adapter The {@link Wordlift_Batch_Analysis_Adapter} instance.
-	 */
-	private $batch_analysis_adapter;
-
-	/**
-	 * The {@link Wordlift_Relation_Rebuild_Service} instance.
-	 *
-	 * @since  3.14.3
-	 * @access private
-	 * @var \Wordlift_Relation_Rebuild_Service $relation_rebuild_service The {@link Wordlift_Relation_Rebuild_Service} instance.
-	 */
-	private $relation_rebuild_service;
-
-	/**
-	 * The {@link Wordlift_Relation_Rebuild_Adapter} instance.
-	 *
-	 * @since  3.14.3
-	 * @access private
-	 * @var \Wordlift_Relation_Rebuild_Adapter $relation_rebuild_adapter The {@link Wordlift_Relation_Rebuild_Adapter} instance.
-	 */
-	private $relation_rebuild_adapter;
-
-	/**
-	 * The {@link Wordlift_Reference_Rebuild_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Reference_Rebuild_Service $reference_rebuild_service The {@link Wordlift_Reference_Rebuild_Service} instance.
-	 */
-	private $reference_rebuild_service;
-
-	/**
-	 * 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_Linked_Data_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Linked_Data_Service $linked_data_service The {@link Wordlift_Linked_Data_Service} instance.
-	 */
-	protected $linked_data_service;
-
-	/**
-	 * 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_Sparql_Tuple_Rendition_Factory} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Sparql_Tuple_Rendition_Factory $rendition_factory The {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
-	 */
-	protected $rendition_factory;
-
-	/**
-	 * The {@link Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
-	 */
-	private $autocomplete_service;
-
-	/**
-	 * 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_Relation_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	protected $relation_service;
-
-	/**
-	 * 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_File_Cache_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var \Wordlift_File_Cache_Service $file_cache_service The {@link Wordlift_File_Cache_Service} instance.
-	 */
-	protected $file_cache_service;
-
-	/**
-	 * 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;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.11.2
-	 * @access private
-	 * @var Wordlift $instance {@link Wordlift}'s singleton instance.
-	 */
-	private static $instance;
-
-	//</editor-fold>
-
-	/**
-	 * 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.24.0';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-		// 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.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		// The class responsible for plugin uninstall.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * WordLift's supported languages.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
-
-		/**
-		 * WordLift's supported countries.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-linked-data-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The SPARQL service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
-
-		/**
-		 * The WordLift import service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
-
-		/**
-		 * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-listable.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-reference-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
-
-		/**
-		 * Load cache-related files.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/*
+    //<editor-fold desc="## FIELDS">
+
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The {@link Wordlift_Tinymce_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
+     */
+    protected $tinymce_adapter;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since  3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    protected $schema_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.1.0
+     * @access protected
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    protected $entity_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 WordLift Dashboard adapter.
+     *
+     * @since  3.4.0
+     * @access private
+     * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
+     */
+    private $dashboard_service;
+
+    /**
+     * 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_Sparql_Service} instance.
+     *
+     * @since    3.6.0
+     * @access   protected
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    protected $sparql_service;
+
+    /**
+     * A {@link Wordlift_Import_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
+     */
+    private $import_service;
+
+    /**
+     * A {@link Wordlift_Rebuild_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
+     */
+    private $rebuild_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 'WordLift Batch analysis' page.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Batch_Analysis_Page $sbatch_analysis_page The 'WordLift batcch analysis' page.
+     */
+    protected $batch_analysis_page;
+
+    /**
+     * The install wizard page.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
+     */
+    private $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;
+
+    /**
+     * 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_Configuration_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    protected $configuration_service;
+
+    /**
+     * 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_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    protected $entity_type_service;
+
+    /**
+     * A {@link Wordlift_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_Admin_Status_Page} class.
+     *
+     * @since  3.9.8
+     * @access private
+     * @var \Wordlift_Admin_Status_Page $status_page The {@link Wordlift_Admin_Status_Page} class.
+     */
+    private $status_page;
+
+    /**
+     * 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_Batch_Analysis_Service} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Batch_Analysis_Service $batch_analysis_service The {@link Wordlift_Batch_Analysis_Service} instance.
+     */
+    protected $batch_analysis_service;
+
+    /**
+     * 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_Batch_Analysis_Adapter} instance.
+     *
+     * @since  3.14.2
+     * @access protected
+     * @var \Wordlift_Batch_Analysis_Adapter $batch_analysis_adapter The {@link Wordlift_Batch_Analysis_Adapter} instance.
+     */
+    private $batch_analysis_adapter;
+
+    /**
+     * The {@link Wordlift_Relation_Rebuild_Service} instance.
+     *
+     * @since  3.14.3
+     * @access private
+     * @var \Wordlift_Relation_Rebuild_Service $relation_rebuild_service The {@link Wordlift_Relation_Rebuild_Service} instance.
+     */
+    private $relation_rebuild_service;
+
+    /**
+     * The {@link Wordlift_Relation_Rebuild_Adapter} instance.
+     *
+     * @since  3.14.3
+     * @access private
+     * @var \Wordlift_Relation_Rebuild_Adapter $relation_rebuild_adapter The {@link Wordlift_Relation_Rebuild_Adapter} instance.
+     */
+    private $relation_rebuild_adapter;
+
+    /**
+     * The {@link Wordlift_Reference_Rebuild_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Reference_Rebuild_Service $reference_rebuild_service The {@link Wordlift_Reference_Rebuild_Service} instance.
+     */
+    private $reference_rebuild_service;
+
+    /**
+     * 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_Linked_Data_Service} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Linked_Data_Service $linked_data_service The {@link Wordlift_Linked_Data_Service} instance.
+     */
+    protected $linked_data_service;
+
+    /**
+     * 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_Sparql_Tuple_Rendition_Factory} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Sparql_Tuple_Rendition_Factory $rendition_factory The {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
+     */
+    protected $rendition_factory;
+
+    /**
+     * The {@link Wordlift_Autocomplete_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
+     */
+    private $autocomplete_service;
+
+    /**
+     * 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_Relation_Service} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    protected $relation_service;
+
+    /**
+     * 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_File_Cache_Service} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var \Wordlift_File_Cache_Service $file_cache_service The {@link Wordlift_File_Cache_Service} instance.
+     */
+    protected $file_cache_service;
+
+    /**
+     * 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;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.11.2
+     * @access private
+     * @var Wordlift $instance {@link Wordlift}'s singleton instance.
+     */
+    private static $instance;
+
+    //</editor-fold>
+
+    /**
+     * 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.24.0';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+        // 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.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        // The class responsible for plugin uninstall.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * WordLift's supported languages.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+
+        /**
+         * WordLift's supported countries.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-linked-data-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        // Add the entity rating service.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The SPARQL service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
+
+        /**
+         * The WordLift import service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
+
+        /**
+         * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-listable.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-rebuild-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-reference-rebuild-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
+
+        /**
+         * Load cache-related files.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
-
-		/**
-		 * Load the JSON-LD service to publish entities using JSON-LD.s
-		 *
-		 * @since 3.8.0
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
-
-		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
-
-		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
-
-		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch-analysis/class-wordlift-batch-analysis-sql-helper.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch-analysis/class-wordlift-batch-analysis-service.php';
-
-		/** Linked Data. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
-
-		/** Linked Data Rendition. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/intf-wordlift-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-default-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-address-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-service.php';
-
-		/** Adapters. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch-analysis/class-wordlift-batch-analysis-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
-
-		/** Async Tasks. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-batch-analysis-request-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-batch-analysis-complete-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-push-references-async-task.php';
-
-		/** Autocomplete. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
-
-		/** Analytics */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/analytics/class-wordlift-analytics-connect.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		global $wp_version;
-		if ( version_compare( $wp_version, '5.3', '<' ) ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-		} else {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
-		}
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The admin 'Install wizard' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
-
-		/**
-		 * The WordLift entity type list admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
-
-		/**
-		 * The WordLift entity type settings admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
-
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
-
-		/**
-		 * The admin 'WordLift Settings' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-batch-analysis-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
-
-		/** Admin Pages */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-status-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
-
-		/**
-		 * The chord shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
-
-		/**
-		 * The geomap shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
-
-		/**
-		 * The entity cloud shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
-
-		/**
-		 * The entity glossary shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
-
-		/**
-		 * Faceted Search shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
-
-		/**
-		 * The SEO service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
-
-		/**
-		 * The AMP service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
-
-		/** Widgets */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.php';
-
-		/*
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
+
+        /**
+         * Load the JSON-LD service to publish entities using JSON-LD.s
+         *
+         * @since 3.8.0
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+
+        // The Publisher Service and the AJAX adapter.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
+
+        /**
+         * Load the WordLift key validation service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+
+        // Load the `Wordlift_Category_Taxonomy_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
+
+        // Load the `Wordlift_Entity_Page_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch-analysis/class-wordlift-batch-analysis-sql-helper.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch-analysis/class-wordlift-batch-analysis-service.php';
+
+        /** Linked Data. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
+
+        /** Linked Data Rendition. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/intf-wordlift-sparql-tuple-rendition.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-default-sparql-tuple-rendition.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-address-sparql-tuple-rendition.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-service.php';
+
+        /** Adapters. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch-analysis/class-wordlift-batch-analysis-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
+
+        /** Async Tasks. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-batch-analysis-request-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-batch-analysis-complete-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-push-references-async-task.php';
+
+        /** Autocomplete. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
+
+        /** Analytics */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/analytics/class-wordlift-analytics-connect.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        global $wp_version;
+        if ( version_compare( $wp_version, '5.3', '<' ) ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+        } else {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
+        }
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The admin 'Install wizard' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+
+        /**
+         * The WordLift entity type list admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+
+        /**
+         * The WordLift entity type settings admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
+
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+
+        /**
+         * The admin 'WordLift Settings' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-batch-analysis-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
+
+        /** Admin Pages */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-status-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+
+        /**
+         * The chord shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+
+        /**
+         * The geomap shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+
+        /**
+         * The entity cloud shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+
+        /**
+         * The entity glossary shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
+
+        /**
+         * Faceted Search shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+
+        /**
+         * The SEO service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
+
+        /**
+         * The AMP service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
+
+        /** Widgets */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.php';
+
+        /*
 		 * Schema.org Services.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
-			new Wordlift_Schemaorg_Sync_Service();
-			$schemaorg_property_service = new Wordlift_Schemaorg_Property_Service();
-			new Wordlift_Schemaorg_Class_Service();
-		} else {
-			$schemaorg_property_service = null;
-		}
+        if ( WL_ALL_ENTITY_TYPES ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
+            new Wordlift_Schemaorg_Sync_Service();
+            $schemaorg_property_service = new Wordlift_Schemaorg_Property_Service();
+            new Wordlift_Schemaorg_Class_Service();
+        } else {
+            $schemaorg_property_service = null;
+        }
 
-		$this->loader = new Wordlift_Loader();
+        $this->loader = new Wordlift_Loader();
 
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+        // 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 `wl-api` end-point.
+        new Wordlift_Http_Api();
 
-		// Load the Install Service.
-		$this->install_service = new Wordlift_Install_Service();
+        // Load the Install Service.
+        $this->install_service = new Wordlift_Install_Service();
 
-		/** Services. */
-		// Create the configuration service.
-		$this->configuration_service = new Wordlift_Configuration_Service();
-		$api_service                 = new Wordlift_Api_Service( $this->configuration_service );
+        /** Services. */
+        // Create the configuration service.
+        $this->configuration_service = new Wordlift_Configuration_Service();
+        $api_service                 = new Wordlift_Api_Service( $this->configuration_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, $this->configuration_service->get_entity_base_path() );
+        // 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, $this->configuration_service->get_entity_base_path() );
 
-		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
+        // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+        $this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
 
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
 
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
-		$this->sparql_service        = new Wordlift_Sparql_Service();
-		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
-		$this->notice_service        = new Wordlift_Notice_Service();
-		$this->relation_service      = new Wordlift_Relation_Service();
+        $this->sparql_service        = new Wordlift_Sparql_Service();
+        $schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
+        $this->notice_service        = new Wordlift_Notice_Service();
+        $this->relation_service      = new Wordlift_Relation_Service();
 
-		$entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
-		$this->file_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'converter/' );
-		$this->entity_uri_service = new Wordlift_Cached_Entity_Uri_Service( $this->configuration_service, $entity_uri_cache_service );
-		$this->entity_service     = new Wordlift_Entity_Service( $this->ui_service, $this->relation_service, $this->entity_uri_service );
-		$this->user_service       = new Wordlift_User_Service( $this->sparql_service, $this->entity_service );
+        $entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
+        $this->file_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'converter/' );
+        $this->entity_uri_service = new Wordlift_Cached_Entity_Uri_Service( $this->configuration_service, $entity_uri_cache_service );
+        $this->entity_service     = new Wordlift_Entity_Service( $this->ui_service, $this->relation_service, $this->entity_uri_service );
+        $this->user_service       = new Wordlift_User_Service( $this->sparql_service, $this->entity_service );
 
-		// Instantiate the JSON-LD service.
-		$property_getter = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+        // Instantiate the JSON-LD service.
+        $property_getter = Wordlift_Property_Getter_Factory::create( $this->entity_service );
 
-		/** Linked Data. */
-		$this->storage_factory   = new Wordlift_Storage_Factory( $this->entity_service, $this->user_service, $property_getter );
-		$this->rendition_factory = new Wordlift_Sparql_Tuple_Rendition_Factory( $this->entity_service );
+        /** Linked Data. */
+        $this->storage_factory   = new Wordlift_Storage_Factory( $this->entity_service, $this->user_service, $property_getter );
+        $this->rendition_factory = new Wordlift_Sparql_Tuple_Rendition_Factory( $this->entity_service );
 
-		$this->schema_service = new Wordlift_Schema_Service( $this->storage_factory, $this->rendition_factory, $this->configuration_service );
+        $this->schema_service = new Wordlift_Schema_Service( $this->storage_factory, $this->rendition_factory, $this->configuration_service );
 
-		// Create a new instance of the Redirect service.
-		$this->redirect_service    = new Wordlift_Redirect_Service( $this->entity_uri_service );
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
-		$this->linked_data_service = new Wordlift_Linked_Data_Service( $this->entity_service, $this->entity_type_service, $this->schema_service, $this->sparql_service );
+        // Create a new instance of the Redirect service.
+        $this->redirect_service    = new Wordlift_Redirect_Service( $this->entity_uri_service );
+        $this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
+        $this->linked_data_service = new Wordlift_Linked_Data_Service( $this->entity_service, $this->entity_type_service, $this->schema_service, $this->sparql_service );
 
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service, $this->entity_type_service );
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service, $this->entity_type_service );
 
-		$this->batch_analysis_service = new Wordlift_Batch_Analysis_Service( $this, $this->configuration_service, $this->file_cache_service );
+        $this->batch_analysis_service = new Wordlift_Batch_Analysis_Service( $this, $this->configuration_service, $this->file_cache_service );
 
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
-		$this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
-		$this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
+        $this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
+        $this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
 
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
 
-		// Create an instance of the PrimaShop adapter.
-		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+        // Create an instance of the PrimaShop adapter.
+        $this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
-		// Create an import service instance to hook later to WP's import function.
-		$this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
+        // Create an import service instance to hook later to WP's import function.
+        $this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
 
-		$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+        $uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
 
-		// Create the entity rating service.
-		$this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
+        // Create the entity rating service.
+        $this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
 
-		// Create entity list customization (wp-admin/edit.php).
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
+        // Create entity list customization (wp-admin/edit.php).
+        $this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
 
-		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service, $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service, $this->entity_service );
 
-		// Create an instance of the Publisher Service and the AJAX Adapter.
-		$this->publisher_service = new Wordlift_Publisher_Service( $this->configuration_service );
-		$this->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
-		$this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+        // Create an instance of the Publisher Service and the AJAX Adapter.
+        $this->publisher_service = new Wordlift_Publisher_Service( $this->configuration_service );
+        $this->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
+        $this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
 
-		$attachment_service = new Wordlift_Attachment_Service();
+        $attachment_service = new Wordlift_Attachment_Service();
 
-		// Instantiate the JSON-LD service.
-		$property_getter                         = Wordlift_Property_Getter_Factory::create( $this->entity_service );
-		$this->entity_post_to_jsonld_converter   = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter, $schemaorg_property_service );
-		$this->post_to_jsonld_converter          = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
-		$this->postid_to_jsonld_converter        = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
-		$this->jsonld_website_converter          = new Wordlift_Website_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
-		$this->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $this->postid_to_jsonld_converter, $this->file_cache_service, $this->configuration_service );
-		$this->jsonld_service                    = new Wordlift_Jsonld_Service( $this->entity_service, $this->cached_postid_to_jsonld_converter, $this->jsonld_website_converter );
-		new Wordlift\Jsonld\Jsonld_Endpoint( $this->jsonld_service );
+        // Instantiate the JSON-LD service.
+        $property_getter                         = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+        $this->entity_post_to_jsonld_converter   = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter, $schemaorg_property_service );
+        $this->post_to_jsonld_converter          = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
+        $this->postid_to_jsonld_converter        = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
+        $this->jsonld_website_converter          = new Wordlift_Website_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
+        $this->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $this->postid_to_jsonld_converter, $this->file_cache_service, $this->configuration_service );
+        $this->jsonld_service                    = new Wordlift_Jsonld_Service( $this->entity_service, $this->cached_postid_to_jsonld_converter, $this->jsonld_website_converter );
+        new Wordlift\Jsonld\Jsonld_Endpoint( $this->jsonld_service );
 
-		$this->key_validation_service    = new Wordlift_Key_Validation_Service( $this->configuration_service );
-		$this->content_filter_service    = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service, $this->entity_uri_service );
-		$this->relation_rebuild_service  = new Wordlift_Relation_Rebuild_Service( $this->content_filter_service, $this->entity_service );
-		$this->sample_data_service       = new Wordlift_Sample_Data_Service( $this->entity_type_service, $this->configuration_service, $this->user_service );
-		$this->sample_data_ajax_adapter  = new Wordlift_Sample_Data_Ajax_Adapter( $this->sample_data_service );
-		$this->reference_rebuild_service = new Wordlift_Reference_Rebuild_Service( $this->linked_data_service, $this->entity_service, $this->relation_service );
+        $this->key_validation_service    = new Wordlift_Key_Validation_Service( $this->configuration_service );
+        $this->content_filter_service    = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service, $this->entity_uri_service );
+        $this->relation_rebuild_service  = new Wordlift_Relation_Rebuild_Service( $this->content_filter_service, $this->entity_service );
+        $this->sample_data_service       = new Wordlift_Sample_Data_Service( $this->entity_type_service, $this->configuration_service, $this->user_service );
+        $this->sample_data_ajax_adapter  = new Wordlift_Sample_Data_Ajax_Adapter( $this->sample_data_service );
+        $this->reference_rebuild_service = new Wordlift_Reference_Rebuild_Service( $this->linked_data_service, $this->entity_service, $this->relation_service );
 
-		// Initialize the shortcodes.
-		new Wordlift_Navigator_Shortcode();
-		new Wordlift_Chord_Shortcode();
-		new Wordlift_Geomap_Shortcode();
-		new Wordlift_Timeline_Shortcode();
-		new Wordlift_Related_Entities_Cloud_Shortcode( $this->relation_service );
-		new Wordlift_Vocabulary_Shortcode( $this->configuration_service );
-		new Wordlift_Faceted_Search_Shortcode();
+        // Initialize the shortcodes.
+        new Wordlift_Navigator_Shortcode();
+        new Wordlift_Chord_Shortcode();
+        new Wordlift_Geomap_Shortcode();
+        new Wordlift_Timeline_Shortcode();
+        new Wordlift_Related_Entities_Cloud_Shortcode( $this->relation_service );
+        new Wordlift_Vocabulary_Shortcode( $this->configuration_service );
+        new Wordlift_Faceted_Search_Shortcode();
 
-		// Initialize the SEO service.
-		new Wordlift_Seo_Service();
+        // Initialize the SEO service.
+        new Wordlift_Seo_Service();
 
-		// Initialize the AMP service.
-		new Wordlift_AMP_Service( $this->jsonld_service );
+        // Initialize the AMP service.
+        new Wordlift_AMP_Service( $this->jsonld_service );
 
-		/** Services. */
-		$this->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
-		new Wordlift_Image_Service();
+        /** Services. */
+        $this->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
+        new Wordlift_Image_Service();
 
-		/** Adapters. */
-		$this->entity_type_adapter      = new Wordlift_Entity_Type_Adapter( $this->entity_type_service );
-		$this->publisher_ajax_adapter   = new Wordlift_Publisher_Ajax_Adapter( $this->publisher_service );
-		$this->tinymce_adapter          = new Wordlift_Tinymce_Adapter( $this );
-		$this->batch_analysis_adapter   = new Wordlift_Batch_Analysis_Adapter( $this->batch_analysis_service );
-		$this->relation_rebuild_adapter = new Wordlift_Relation_Rebuild_Adapter( $this->relation_rebuild_service );
+        /** Adapters. */
+        $this->entity_type_adapter      = new Wordlift_Entity_Type_Adapter( $this->entity_type_service );
+        $this->publisher_ajax_adapter   = new Wordlift_Publisher_Ajax_Adapter( $this->publisher_service );
+        $this->tinymce_adapter          = new Wordlift_Tinymce_Adapter( $this );
+        $this->batch_analysis_adapter   = new Wordlift_Batch_Analysis_Adapter( $this->batch_analysis_service );
+        $this->relation_rebuild_adapter = new Wordlift_Relation_Rebuild_Adapter( $this->relation_rebuild_service );
 
-		/*
+        /*
 		 * Exclude our public js from WP-Rocket.
 		 *
 		 * @since 3.19.4
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
 		 */
-		new Wordlift_WpRocket_Adapter();
-
-		// Create a Rebuild Service instance, which we'll later bound to an ajax call.
-		$this->rebuild_service = new Wordlift_Rebuild_Service(
-			$this->sparql_service,
-			$uri_service
-		);
-
-		/** Async Tasks. */
-		new Wordlift_Sparql_Query_Async_Task();
-		new Wordlift_Batch_Analysis_Request_Async_Task();
-		new Wordlift_Batch_Analysis_Complete_Async_Task();
-		new Wordlift_Push_References_Async_Task();
-
-		/** WL Autocomplete. */
-		$this->autocomplete_service = new Wordlift_Autocomplete_Service( $this->configuration_service );
-		$this->autocomplete_adapter = new Wordlift_Autocomplete_Adapter( $this->autocomplete_service );
-
-		/** WordPress Admin UI. */
-
-		// UI elements.
-		$this->input_element           = new Wordlift_Admin_Input_Element();
-		$this->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
-		$this->select2_element         = new Wordlift_Admin_Select2_Element();
-		$this->language_select_element = new Wordlift_Admin_Language_Select_Element();
-		$this->country_select_element  = new Wordlift_Admin_Country_Select_Element();
-		$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-		$this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $this->publisher_service, $tabs_element, $this->select2_element );
-		$this->author_element          = new Wordlift_Admin_Author_Element( $this->publisher_service, $this->select2_element );
-
-		$this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->country_select_element, $this->publisher_element, $this->radio_input_element );
-		$this->batch_analysis_page       = new Wordlift_Batch_Analysis_Page( $this->batch_analysis_service );
-		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
-
-		$this->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $this->configuration_service, $this->input_element, $this->radio_input_element );
-		$this->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $this->analytics_settings_page );
-		$this->analytics_connect                   = new Wordlift_Analytics_Connect();
-
-		// Pages.
-		/*
+        new Wordlift_WpRocket_Adapter();
+
+        // Create a Rebuild Service instance, which we'll later bound to an ajax call.
+        $this->rebuild_service = new Wordlift_Rebuild_Service(
+            $this->sparql_service,
+            $uri_service
+        );
+
+        /** Async Tasks. */
+        new Wordlift_Sparql_Query_Async_Task();
+        new Wordlift_Batch_Analysis_Request_Async_Task();
+        new Wordlift_Batch_Analysis_Complete_Async_Task();
+        new Wordlift_Push_References_Async_Task();
+
+        /** WL Autocomplete. */
+        $this->autocomplete_service = new Wordlift_Autocomplete_Service( $this->configuration_service );
+        $this->autocomplete_adapter = new Wordlift_Autocomplete_Adapter( $this->autocomplete_service );
+
+        /** WordPress Admin UI. */
+
+        // UI elements.
+        $this->input_element           = new Wordlift_Admin_Input_Element();
+        $this->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
+        $this->select2_element         = new Wordlift_Admin_Select2_Element();
+        $this->language_select_element = new Wordlift_Admin_Language_Select_Element();
+        $this->country_select_element  = new Wordlift_Admin_Country_Select_Element();
+        $tabs_element                  = new Wordlift_Admin_Tabs_Element();
+        $this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $this->publisher_service, $tabs_element, $this->select2_element );
+        $this->author_element          = new Wordlift_Admin_Author_Element( $this->publisher_service, $this->select2_element );
+
+        $this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->country_select_element, $this->publisher_element, $this->radio_input_element );
+        $this->batch_analysis_page       = new Wordlift_Batch_Analysis_Page( $this->batch_analysis_service );
+        $this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
+
+        $this->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $this->configuration_service, $this->input_element, $this->radio_input_element );
+        $this->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $this->analytics_settings_page );
+        $this->analytics_connect                   = new Wordlift_Analytics_Connect();
+
+        // Pages.
+        /*
 		 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 		 *
 		 * @since 3.20.3
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 		 */
-		if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
-			new Wordlift_Admin_Post_Edit_Page( $this );
-		}
-		new Wordlift_Entity_Type_Admin_Service();
+        if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
+            new Wordlift_Admin_Post_Edit_Page( $this );
+        }
+        new Wordlift_Entity_Type_Admin_Service();
 
-		// create an instance of the entity type list admin page controller.
-		$this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
+        // create an instance of the entity type list admin page controller.
+        $this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
 
-		// create an instance of the entity type setting admin page controller.
-		$this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
+        // create an instance of the entity type setting admin page controller.
+        $this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
 
-		/** Widgets */
-		$this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
+        /** Widgets */
+        $this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
-		/* WordPress Admin. */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
+        /* WordPress Admin. */
+        $this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
+        $this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
 
-		// Create an instance of the install wizard.
-		$this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service, $this->language_select_element, $this->country_select_element );
+        // Create an instance of the install wizard.
+        $this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service, $this->language_select_element, $this->country_select_element );
 
-		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
+        $this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
 
-		// User Profile.
-		new Wordlift_Admin_User_Profile_Page( $this->author_element, $this->user_service );
+        // User Profile.
+        new Wordlift_Admin_User_Profile_Page( $this->author_element, $this->user_service );
 
-		$this->entity_page_service = new Wordlift_Entity_Page_Service();
+        $this->entity_page_service = new Wordlift_Entity_Page_Service();
 
-		// Load the debug service if WP is in debug mode.
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
-			new Wordlift_Debug_Service( $this->entity_service, $uri_service );
-		}
+        // Load the debug service if WP is in debug mode.
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
+            new Wordlift_Debug_Service( $this->entity_service, $uri_service );
+        }
 
-		// Remote Image Service.
-		new Wordlift_Remote_Image_Service();
+        // Remote Image Service.
+        new Wordlift_Remote_Image_Service();
 
-		/*
+        /*
 		 * Provides mappings between post types and entity types.
 		 *
 		 * @since 3.20.0
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/852.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
 
-		// Create an instance of the Mapping Service and assign it to the Ajax Adapter.
-		new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
+        // Create an instance of the Mapping Service and assign it to the Ajax Adapter.
+        new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
 
-		/*
+        /*
 		 * Batch Operations. They're similar to Batch Actions but do not require working on post types.
 		 *
 		 * Eventually Batch Actions will become Batch Operations.
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
-		/*
+        /*
 		 * Add the Search Keywords taxonomy to manage the Search Keywords on WLS.
 		 *
 		 * @link https://github.com/insideout10/wordlift-plugin/issues/761
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/search-keywords/class-wordlift-search-keyword-taxonomy.php';
-		new Wordlift_Search_Keyword_Taxonomy( $api_service );
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/search-keywords/class-wordlift-search-keyword-taxonomy.php';
+        new Wordlift_Search_Keyword_Taxonomy( $api_service );
 
-		/*
+        /*
 		 * Load dependencies for the front-end.
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! is_admin() ) {
-			/*
+        if ( ! is_admin() ) {
+            /*
 			 * Load the `Wordlift_Term_JsonLd_Adapter`.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/892
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-term-jsonld-adapter.php';
-			new Wordlift_Term_JsonLd_Adapter( $this->entity_uri_service, $this->jsonld_service );
-		}
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-term-jsonld-adapter.php';
+            new Wordlift_Term_JsonLd_Adapter( $this->entity_uri_service, $this->jsonld_service );
+        }
 
-		/*
+        /*
 		 * Initialize the Context Cards Service
 		 *
 		 * @link https://github.com/insideout10/wordlift-plugin/issues/934
 		 *
 		 * @since 3.22.0
 		 */
-		$this->context_cards_service = new Wordlift_Context_Cards_Service();
-
-	}
-
-	/**
-	 * 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() {
-
-		$plugin_admin = new Wordlift_Admin(
-			$this->get_plugin_name(),
-			$this->get_version(),
-			$this->configuration_service,
-			$this->notice_service,
-			$this->user_service
-		);
-
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
-
-		// Hook the init action to taxonomy services.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
-		$this->loader->add_action( 'init', $this->entity_types_taxonomy_service, 'init', 0 );
-
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
-
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
-
-		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
-
-		/*
+        $this->context_cards_service = new Wordlift_Context_Cards_Service();
+
+    }
+
+    /**
+     * 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() {
+
+        $plugin_admin = new Wordlift_Admin(
+            $this->get_plugin_name(),
+            $this->get_version(),
+            $this->configuration_service,
+            $this->notice_service,
+            $this->user_service
+        );
+
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
+
+        // Hook the init action to taxonomy services.
+        $this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+        $this->loader->add_action( 'init', $this->entity_types_taxonomy_service, 'init', 0 );
+
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+
+        // Hook the updated_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Register custom allowed redirect hosts.
+        $this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+
+        /*
 		 * The old dashboard is replaced with dashboard v2.
 		 *
 		 * The old dashboard service is still loaded because its functions are used.
@@ -1529,315 +1529,315 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		// $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		// $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
-
-		// 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.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post', $this->rating_service, 'set_rating_for', 20, 1 );
-
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
-
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns.
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		// no explicit entity as it prevents handling of other post types.
-		$this->loader->add_filter( 'manage_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection.
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_list_service, 'pre_get_posts' );
-		$this->loader->add_action( 'load-edit.php', $this->entity_list_service, 'load_edit' );
-
-		/*
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        // $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        // $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+
+        // 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.
+        $this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_action( 'save_post', $this->rating_service, 'set_rating_for', 20, 1 );
+
+        $this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+        $this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
+
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns.
+        $this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+        // no explicit entity as it prevents handling of other post types.
+        $this->loader->add_filter( 'manage_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection.
+        $this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_list_service, 'pre_get_posts' );
+        $this->loader->add_action( 'load-edit.php', $this->entity_list_service, 'load_edit' );
+
+        /*
 		 * If `All Entity Types` is disable, use the radio button Walker.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( ! WL_ALL_ENTITY_TYPES ) {
-			$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-		}
+        if ( ! WL_ALL_ENTITY_TYPES ) {
+            $this->loader->add_filter( 'wp_terms_checklist_args', $this->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.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
 
-		// Filter imported post meta.
-		$this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
+        // Filter imported post meta.
+        $this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
 
-		// Notify the import service when an import starts and ends.
-		$this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
-		$this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
+        // Notify the import service when an import starts and ends.
+        $this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
+        $this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
 
-		// Hook the AJAX wl_rebuild action to the Rebuild Service.
-		$this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
-		$this->loader->add_action( 'wp_ajax_wl_rebuild_references', $this->reference_rebuild_service, 'rebuild' );
+        // Hook the AJAX wl_rebuild action to the Rebuild Service.
+        $this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
+        $this->loader->add_action( 'wp_ajax_wl_rebuild_references', $this->reference_rebuild_service, 'rebuild' );
 
-		// Hook the menu to the Download Your Data page.
-		$this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
+        // Hook the menu to the Download Your Data page.
+        $this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
+        $this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
+        $this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
 
-		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
+        // Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
+        $this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
 
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
-		$this->loader->add_action( 'admin_post_wl_jsonld', $this->jsonld_service, 'get' );
-		$this->loader->add_action( 'admin_post_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
+        $this->loader->add_action( 'admin_post_wl_jsonld', $this->jsonld_service, 'get' );
+        $this->loader->add_action( 'admin_post_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
 
-		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
+        // Hook the AJAX wl_validate_key action to the Key Validation service.
+        $this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
 
-		// Hook the AJAX wl_update_country_options action to the countries.
-		$this->loader->add_action( 'wp_ajax_wl_update_country_options', $this->country_select_element, 'get_options_html' );
+        // Hook the AJAX wl_update_country_options action to the countries.
+        $this->loader->add_action( 'wp_ajax_wl_update_country_options', $this->country_select_element, 'get_options_html' );
 
-		// Hook the `admin_init` function to the Admin Setup.
-		$this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
+        // Hook the `admin_init` function to the Admin Setup.
+        $this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
 
-		// Hook the admin_init to the settings page.
-		$this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
-		$this->loader->add_action( 'admin_init', $this->analytics_settings_page, 'admin_init' );
+        // Hook the admin_init to the settings page.
+        $this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
+        $this->loader->add_action( 'admin_init', $this->analytics_settings_page, 'admin_init' );
 
-		$this->loader->add_filter( 'admin_post_thumbnail_html', $this->publisher_service, 'add_featured_image_instruction' );
+        $this->loader->add_filter( 'admin_post_thumbnail_html', $this->publisher_service, 'add_featured_image_instruction' );
 
-		// Hook the menu creation on the general wordlift menu creation.
-		$this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
-		if ( defined( 'WORDLIFT_BATCH' ) && WORDLIFT_BATCH ) {
-			// Add the functionality only if a flag is set in wp-config.php .
-			$this->loader->add_action( 'wl_admin_menu', $this->batch_analysis_page, 'admin_menu', 10, 2 );
-		}
+        // Hook the menu creation on the general wordlift menu creation.
+        $this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
+        if ( defined( 'WORDLIFT_BATCH' ) && WORDLIFT_BATCH ) {
+            // Add the functionality only if a flag is set in wp-config.php .
+            $this->loader->add_action( 'wl_admin_menu', $this->batch_analysis_page, 'admin_menu', 10, 2 );
+        }
 
-		/*
+        /*
 		 * Display the `Wordlift_Admin_Search_Rankings_Page` page.
 		 *
 		 * @link https://github.com/insideout10/wordlift-plugin/issues/761
 		 *
 		 * @since 3.20.0
 		 */
-		if ( in_array( $this->configuration_service->get_package_type(), array( 'editorial', 'business' ) ) ) {
-			$admin_search_rankings_page = new Wordlift_Admin_Search_Rankings_Page();
-			$this->loader->add_action( 'wl_admin_menu', $admin_search_rankings_page, 'admin_menu' );
-		}
+        if ( in_array( $this->configuration_service->get_package_type(), array( 'editorial', 'business' ) ) ) {
+            $admin_search_rankings_page = new Wordlift_Admin_Search_Rankings_Page();
+            $this->loader->add_action( 'wl_admin_menu', $admin_search_rankings_page, 'admin_menu' );
+        }
 
-		// Hook key update.
-		$this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
-		$this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
+        // Hook key update.
+        $this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
+        $this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
 
-		// Add additional action links to the WordLift plugin in the plugins page.
-		$this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
+        // Add additional action links to the WordLift plugin in the plugins page.
+        $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->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
 		 */
-		// $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->analytics_settings_page_action_link, 'action_links', 10, 1 );
-
-		// Hook the AJAX `wl_publisher` action name.
-		$this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
-
-		// Hook row actions for the entity type list admin.
-		$this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
-
-		/** Ajax actions. */
-		$this->loader->add_action( 'wp_ajax_wl_google_analytics_export', $this->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', '<' ) ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
-		}
-
-		$this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
-
-		/** Adapters. */
-		$this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
-		$this->loader->add_action( 'wp_ajax_wl_batch_analysis_submit', $this->batch_analysis_adapter, 'submit' );
-		$this->loader->add_action( 'wp_ajax_wl_batch_analysis_submit_posts', $this->batch_analysis_adapter, 'submit_posts' );
-		$this->loader->add_action( 'wp_ajax_wl_batch_analysis_cancel', $this->batch_analysis_adapter, 'cancel' );
-		$this->loader->add_action( 'wp_ajax_wl_batch_analysis_clear_warning', $this->batch_analysis_adapter, 'clear_warning' );
-		$this->loader->add_action( 'wp_ajax_wl_relation_rebuild_process_all', $this->relation_rebuild_adapter, 'process_all' );
-
-		$this->loader->add_action( 'wp_ajax_wl_sample_data_create', $this->sample_data_ajax_adapter, 'create' );
-		$this->loader->add_action( 'wp_ajax_wl_sample_data_delete', $this->sample_data_ajax_adapter, 'delete' );
-
-
-		$this->loader->add_action( 'update_user_metadata', $this->user_service, 'update_user_metadata', 10, 5 );
-		$this->loader->add_action( 'delete_user_metadata', $this->user_service, 'delete_user_metadata', 10, 5 );
-
-		// Handle the autocomplete request.
-		add_action( 'wp_ajax_wl_autocomplete', array(
-			$this->autocomplete_adapter,
-			'wl_autocomplete',
-		) );
-		add_action( 'wp_ajax_nopriv_wl_autocomplete', array(
-			$this->autocomplete_adapter,
-			'wl_autocomplete',
-		) );
-
-		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
-		}
-
-		$deactivator_feedback = new Wordlift_Deactivator_Feedback( $this->configuration_service );
-
-		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 );
-
-	}
-
-	/**
-	 * 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() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
-		$this->loader->add_action( 'init', $this->install_service, 'install' );
-
-		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $this->context_cards_service, 'enqueue_scripts' );
-
-		// Hook the content filter service to add entity links.
-		if ( ! defined( 'WL_DISABLE_CONTENT_FILTER' ) || ! WL_DISABLE_CONTENT_FILTER ) {
-			$this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
-		}
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->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.
-		$this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
-
-		/*
+        // $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->analytics_settings_page_action_link, 'action_links', 10, 1 );
+
+        // Hook the AJAX `wl_publisher` action name.
+        $this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
+
+        // Hook row actions for the entity type list admin.
+        $this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+
+        /** Ajax actions. */
+        $this->loader->add_action( 'wp_ajax_wl_google_analytics_export', $this->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', '<' ) ) {
+            $this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
+        }
+
+        $this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+
+        /** Adapters. */
+        $this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+        $this->loader->add_action( 'wp_ajax_wl_batch_analysis_submit', $this->batch_analysis_adapter, 'submit' );
+        $this->loader->add_action( 'wp_ajax_wl_batch_analysis_submit_posts', $this->batch_analysis_adapter, 'submit_posts' );
+        $this->loader->add_action( 'wp_ajax_wl_batch_analysis_cancel', $this->batch_analysis_adapter, 'cancel' );
+        $this->loader->add_action( 'wp_ajax_wl_batch_analysis_clear_warning', $this->batch_analysis_adapter, 'clear_warning' );
+        $this->loader->add_action( 'wp_ajax_wl_relation_rebuild_process_all', $this->relation_rebuild_adapter, 'process_all' );
+
+        $this->loader->add_action( 'wp_ajax_wl_sample_data_create', $this->sample_data_ajax_adapter, 'create' );
+        $this->loader->add_action( 'wp_ajax_wl_sample_data_delete', $this->sample_data_ajax_adapter, 'delete' );
+
+
+        $this->loader->add_action( 'update_user_metadata', $this->user_service, 'update_user_metadata', 10, 5 );
+        $this->loader->add_action( 'delete_user_metadata', $this->user_service, 'delete_user_metadata', 10, 5 );
+
+        // Handle the autocomplete request.
+        add_action( 'wp_ajax_wl_autocomplete', array(
+            $this->autocomplete_adapter,
+            'wl_autocomplete',
+        ) );
+        add_action( 'wp_ajax_nopriv_wl_autocomplete', array(
+            $this->autocomplete_adapter,
+            'wl_autocomplete',
+        ) );
+
+        // Hooks to restrict multisite super admin from manipulating entity types.
+        if ( is_multisite() ) {
+            $this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
+        }
+
+        $deactivator_feedback = new Wordlift_Deactivator_Feedback( $this->configuration_service );
+
+        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 );
+
+    }
+
+    /**
+     * 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() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        // Register the entity post type.
+        $this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
+        $this->loader->add_action( 'init', $this->install_service, 'install' );
+
+        // Bind the link generation and handling hooks to the entity link service.
+        $this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $this->context_cards_service, 'enqueue_scripts' );
+
+        // Hook the content filter service to add entity links.
+        if ( ! defined( 'WL_DISABLE_CONTENT_FILTER' ) || ! WL_DISABLE_CONTENT_FILTER ) {
+            $this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
+        }
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->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.
+        $this->loader->add_action( 'pre_get_posts', $this->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.
 		 */
-		$this->loader->add_action( 'pre_get_posts', $this->entity_page_service, 'pre_get_posts', 10, 1 );
-
-		$this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 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.
-		$this->loader->add_action( 'save_post', $this->entity_type_adapter, 'save_post', 9, 3 );
-
-		// Analytics Script Frontend.
-		if ( $this->configuration_service->is_analytics_enable() ) {
-			$this->loader->add_action( 'wp_enqueue_scripts', $this->analytics_connect, 'enqueue_scripts', 10 );
-		}
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @return    string    The name of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @return    string    The version number of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_version() {
-		return $this->version;
-	}
-
-	/**
-	 * Load dependencies for WP-CLI.
-	 *
-	 * @throws Exception
-	 * @since 3.18.0
-	 */
-	private function load_cli_dependencies() {
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'cli/class-wordlift-push-reference-data-command.php';
-
-		$push_reference_data_command = new Wordlift_Push_Reference_Data_Command( $this->relation_service, $this->entity_service, $this->sparql_service, $this->configuration_service, $this->entity_type_service );
-
-		WP_CLI::add_command( 'wl references push', $push_reference_data_command );
-
-	}
-
-	/**
-	 * Get the {@link \Wordlift_Dashboard_Service} to allow others to use its functions.
-	 *
-	 * @return \Wordlift_Dashboard_Service The {@link \Wordlift_Dashboard_Service} instance.
-	 * @since 3.20.0
-	 */
-	public function get_dashboard_service() {
-
-		return $this->dashboard_service;
-	}
+        $this->loader->add_action( 'pre_get_posts', $this->entity_page_service, 'pre_get_posts', 10, 1 );
+
+        $this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 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.
+        $this->loader->add_action( 'save_post', $this->entity_type_adapter, 'save_post', 9, 3 );
+
+        // Analytics Script Frontend.
+        if ( $this->configuration_service->is_analytics_enable() ) {
+            $this->loader->add_action( 'wp_enqueue_scripts', $this->analytics_connect, 'enqueue_scripts', 10 );
+        }
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @return    string    The name of the plugin.
+     * @since     1.0.0
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     * @since     1.0.0
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @return    string    The version number of the plugin.
+     * @since     1.0.0
+     */
+    public function get_version() {
+        return $this->version;
+    }
+
+    /**
+     * Load dependencies for WP-CLI.
+     *
+     * @throws Exception
+     * @since 3.18.0
+     */
+    private function load_cli_dependencies() {
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'cli/class-wordlift-push-reference-data-command.php';
+
+        $push_reference_data_command = new Wordlift_Push_Reference_Data_Command( $this->relation_service, $this->entity_service, $this->sparql_service, $this->configuration_service, $this->entity_type_service );
+
+        WP_CLI::add_command( 'wl references push', $push_reference_data_command );
+
+    }
+
+    /**
+     * Get the {@link \Wordlift_Dashboard_Service} to allow others to use its functions.
+     *
+     * @return \Wordlift_Dashboard_Service The {@link \Wordlift_Dashboard_Service} instance.
+     * @since 3.20.0
+     */
+    public function get_dashboard_service() {
+
+        return $this->dashboard_service;
+    }
 
 }

src/includes/class-wordlift-post-excerpt-helper.php

Indentation +39 added lines, -39 removed lines

@@ -23,55 +23,55 @@
  */
 class Wordlift_Post_Excerpt_Helper {
 
-	/**
-	 * Get the text excerpt for the provided {@link WP_Post}.
-	 *
-	 * Since anyone can hook on the excerpt generation filters, and
-	 * amend it with non textual content, we play it self and generate
-	 * the excerpt ourselves, mimicking the way wordpress core does it.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param WP_Post $post The {@link WP_Post}.
-	 * @param int     $length The desired excerpt length.
-	 * @param string  $more The desired more string.
-	 *
-	 * @return string The excerpt.
-	 */
-	public static function get_text_excerpt( $post, $length = 55, $more = '...' ) {
+    /**
+     * Get the text excerpt for the provided {@link WP_Post}.
+     *
+     * Since anyone can hook on the excerpt generation filters, and
+     * amend it with non textual content, we play it self and generate
+     * the excerpt ourselves, mimicking the way wordpress core does it.
+     *
+     * @since 3.10.0
+     *
+     * @param WP_Post $post The {@link WP_Post}.
+     * @param int     $length The desired excerpt length.
+     * @param string  $more The desired more string.
+     *
+     * @return string The excerpt.
+     */
+    public static function get_text_excerpt( $post, $length = 55, $more = '...' ) {
 
-		/*
+        /*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
 		 * because the content is written elsewhere.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
 
-		// Filter shortcode content in post_content, before using it for trimming
-		$post_content = do_shortcode( $post_content );
+        // Filter shortcode content in post_content, before using it for trimming
+        $post_content = do_shortcode( $post_content );
 
-		// Get the excerpt and trim it. Use the `post_excerpt` if available.
-		$excerpt = wp_trim_words( ! empty( $post->post_excerpt ) ? $post->post_excerpt : $post_content, $length, $more );
+        // Get the excerpt and trim it. Use the `post_excerpt` if available.
+        $excerpt = wp_trim_words( ! empty( $post->post_excerpt ) ? $post->post_excerpt : $post_content, $length, $more );
 
-		// Remove shortcodes and decode html entities.
-		return html_entity_decode( self::strip_all_shortcodes( $excerpt ) );
-	}
+        // Remove shortcodes and decode html entities.
+        return html_entity_decode( self::strip_all_shortcodes( $excerpt ) );
+    }
 
-	/**
-	 * Remove all the shortcodes from the content. We're using our own function
-	 * because WordPress' own `strip_shortcodes` only takes into consideration
-	 * shortcodes for installed plugins/themes.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param string $content The content with shortcodes.
-	 *
-	 * @return string The content without shortcodes.
-	 */
-	private static function strip_all_shortcodes( $content ) {
+    /**
+     * Remove all the shortcodes from the content. We're using our own function
+     * because WordPress' own `strip_shortcodes` only takes into consideration
+     * shortcodes for installed plugins/themes.
+     *
+     * @since 3.12.0
+     *
+     * @param string $content The content with shortcodes.
+     *
+     * @return string The content without shortcodes.
+     */
+    private static function strip_all_shortcodes( $content ) {
 
-		return preg_replace( '/\[[^]]+\]/', '', $content );
-	}
+        return preg_replace( '/\[[^]]+\]/', '', $content );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @return string The excerpt.
 	 */
-	public static function get_text_excerpt( $post, $length = 55, $more = '...' ) {
+	public static function get_text_excerpt($post, $length = 55, $more = '...') {
 
 		/*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
@@ -46,16 +46,16 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
 
 		// Filter shortcode content in post_content, before using it for trimming
-		$post_content = do_shortcode( $post_content );
+		$post_content = do_shortcode($post_content);
 
 		// Get the excerpt and trim it. Use the `post_excerpt` if available.
-		$excerpt = wp_trim_words( ! empty( $post->post_excerpt ) ? $post->post_excerpt : $post_content, $length, $more );
+		$excerpt = wp_trim_words( ! empty($post->post_excerpt) ? $post->post_excerpt : $post_content, $length, $more);
 
 		// Remove shortcodes and decode html entities.
-		return html_entity_decode( self::strip_all_shortcodes( $excerpt ) );
+		return html_entity_decode(self::strip_all_shortcodes($excerpt));
 	}
 
 	/**
@@ -69,9 +69,9 @@ 
 	 *
 	 * @return string The content without shortcodes.
 	 */
-	private static function strip_all_shortcodes( $content ) {
+	private static function strip_all_shortcodes($content) {
 
-		return preg_replace( '/\[[^]]+\]/', '', $content );
+		return preg_replace('/\[[^]]+\]/', '', $content);
 	}
 
 }

src/public/class-wordlift-navigator-shortcode.php

Indentation +143 added lines, -143 removed lines

@@ -17,144 +17,144 @@ 
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
-
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 * @since      3.20.0
-	 *
-	 */
-	private function make_shortcode_atts( $atts ) {
-
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'       => __( 'Related articles', 'wordlift' ),
-			'limit'       => 4,
-			'offset'      => 0,
-			'template_id' => '',
-			'post_id'     => '',
-			'uniqid'      => uniqid( 'wl-navigator-widget-' ),
-			'order_by'    => 'ID DESC'
-		), $atts );
-
-		return $shortcode_atts;
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-navigator] in web mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 * @since 3.20.0
-	 *
-	 */
-	private function web_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
-
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$navigator_id = $shortcode_atts['uniqid'];
-		$rest_url     = $post ? admin_url( sprintf( 'admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'] ) ) : false;
-
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
-
-		wp_enqueue_script( 'wordlift-cloud' );
-		$json_navigator_id = wp_json_encode( $navigator_id );
-		echo "<script type='application/javascript'>window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );</script>";
-
-		return sprintf(
-			'<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
-			$navigator_id,
-			'wl-navigator',
-			$rest_url,
-			$shortcode_atts['title'],
-			$shortcode_atts['template_id'],
-			$shortcode_atts['limit']
-		);
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in amp mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 * @since 3.20.0
-	 *
-	 */
-	private function amp_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// avoid building the widget when there is a list of posts.
-		if ( ! is_singular() ) {
-			return '';
-		}
-
-		$current_post = get_post();
-
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$navigator_id = $shortcode_atts['uniqid'];
-
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
-
-		$navigator_query = array(
-			'uniqid'   => $navigator_id,
-			'post_id'  => $post->ID,
-			'limit'    => $shortcode_atts['limit'],
-			'offset'   => $shortcode_atts['offset'],
-			'order_by' => $shortcode_atts['order_by']
-		);
-
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
-			$delimiter = '?';
-		} else {
-			$delimiter = '&';
-		}
-
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$wp_json_url_posts = str_replace( array(
-				'http:',
-				'https:',
-			), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
-
-		if ( ! empty( $shortcode_atts['template_id'] ) ) {
-			$template_id = $shortcode_atts['template_id'];
-		} else {
-			$template_id = "template-" . $navigator_id;
-			add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css' ) );
-		}
-
-		return <<<HTML
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
+
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     * @since      3.20.0
+     *
+     */
+    private function make_shortcode_atts( $atts ) {
+
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'       => __( 'Related articles', 'wordlift' ),
+            'limit'       => 4,
+            'offset'      => 0,
+            'template_id' => '',
+            'post_id'     => '',
+            'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+            'order_by'    => 'ID DESC'
+        ), $atts );
+
+        return $shortcode_atts;
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-navigator] in web mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     * @since 3.20.0
+     *
+     */
+    private function web_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
+
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $navigator_id = $shortcode_atts['uniqid'];
+        $rest_url     = $post ? admin_url( sprintf( 'admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'] ) ) : false;
+
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
+
+        wp_enqueue_script( 'wordlift-cloud' );
+        $json_navigator_id = wp_json_encode( $navigator_id );
+        echo "<script type='application/javascript'>window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );</script>";
+
+        return sprintf(
+            '<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
+            $navigator_id,
+            'wl-navigator',
+            $rest_url,
+            $shortcode_atts['title'],
+            $shortcode_atts['template_id'],
+            $shortcode_atts['limit']
+        );
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in amp mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     * @since 3.20.0
+     *
+     */
+    private function amp_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // avoid building the widget when there is a list of posts.
+        if ( ! is_singular() ) {
+            return '';
+        }
+
+        $current_post = get_post();
+
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $navigator_id = $shortcode_atts['uniqid'];
+
+        $wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+
+        $navigator_query = array(
+            'uniqid'   => $navigator_id,
+            'post_id'  => $post->ID,
+            'limit'    => $shortcode_atts['limit'],
+            'offset'   => $shortcode_atts['offset'],
+            'order_by' => $shortcode_atts['order_by']
+        );
+
+        if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+            $delimiter = '?';
+        } else {
+            $delimiter = '&';
+        }
+
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $wp_json_url_posts = str_replace( array(
+                'http:',
+                'https:',
+            ), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
+
+        if ( ! empty( $shortcode_atts['template_id'] ) ) {
+            $template_id = $shortcode_atts['template_id'];
+        } else {
+            $template_id = "template-" . $navigator_id;
+            add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css' ) );
+        }
+
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-amp-navigator" style="width: 100%">
 			<h3 class="wl-headline">{$shortcode_atts['title']}</h3>
 			<amp-list 
@@ -184,11 +184,11 @@ 
 			</div>
 		</template>
 HTML;
-	}
+    }
 
-	public function amp_post_template_css() {
-		// Default CSS for default template
-		echo <<<CSS
+    public function amp_post_template_css() {
+        // Default CSS for default template
+        echo <<<CSS
 	        .wordlift-navigator .title{font-size:16px;margin:0.5rem 0}
 	        .wordlift-navigator .cards{display:flex;flex-wrap:wrap}
 	        .wordlift-navigator .cards .card{background:white;flex:1 0 300px;box-sizing:border-box;margin:1rem .25em}
@@ -204,6 +204,6 @@ 
 	        .wordlift-navigator .cards .card .thumbnail img{display:block;border:0;width:100%;height:auto}
 	        .wordlift-navigator .cards .card .card-content .title{font-size:14px;margin:0.3rem 0}
 CSS;
-	}
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -25,10 +25,10 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	/**
@@ -41,18 +41,18 @@ 
 	 * @since      3.20.0
 	 *
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'       => __( 'Related articles', 'wordlift' ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'       => __('Related articles', 'wordlift'),
 			'limit'       => 4,
 			'offset'      => 0,
 			'template_id' => '',
 			'post_id'     => '',
-			'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+			'uniqid'      => uniqid('wl-navigator-widget-'),
 			'order_by'    => 'ID DESC'
-		), $atts );
+		), $atts);
 
 		return $shortcode_atts;
 	}
@@ -66,27 +66,27 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
 		$navigator_id = $shortcode_atts['uniqid'];
-		$rest_url     = $post ? admin_url( sprintf( 'admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'] ) ) : false;
+		$rest_url     = $post ? admin_url(sprintf('admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s&order_by=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'], $shortcode_atts['order_by'])) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$json_navigator_id = wp_json_encode( $navigator_id );
+		wp_enqueue_script('wordlift-cloud');
+		$json_navigator_id = wp_json_encode($navigator_id);
 		echo "<script type='application/javascript'>window.wlNavigators = window.wlNavigators || []; wlNavigators.push( $json_navigator_id );</script>";
 
 		return sprintf(
@@ -109,22 +109,22 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when there is a list of posts.
-		if ( ! is_singular() ) {
+		if ( ! is_singular()) {
 			return '';
 		}
 
 		$current_post = get_post();
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
 		$navigator_id = $shortcode_atts['uniqid'];
 
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+		$wp_json_base = get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE;
 
 		$navigator_query = array(
 			'uniqid'   => $navigator_id,
@@ -134,7 +134,7 @@ 
 			'order_by' => $shortcode_atts['order_by']
 		);
 
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+		if (strpos($wp_json_base, 'wp-json/'.WL_REST_ROUTE_DEFAULT_NAMESPACE)) {
 			$delimiter = '?';
 		} else {
 			$delimiter = '&';
@@ -142,16 +142,16 @@ 
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$wp_json_url_posts = str_replace( array(
+		$wp_json_url_posts = str_replace(array(
 				'http:',
 				'https:',
-			), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
+			), '', $wp_json_base).'/navigator'.$delimiter.http_build_query($navigator_query);
 
-		if ( ! empty( $shortcode_atts['template_id'] ) ) {
+		if ( ! empty($shortcode_atts['template_id'])) {
 			$template_id = $shortcode_atts['template_id'];
 		} else {
-			$template_id = "template-" . $navigator_id;
-			add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css' ) );
+			$template_id = "template-".$navigator_id;
+			add_action('amp_post_template_css', array($this, 'amp_post_template_css'));
 		}
 
 		return <<<HTML

src/public/class-wordlift-context-cards.php

Indentation +106 added lines, -106 removed lines

@@ -9,111 +9,111 @@
 
 class Wordlift_Context_Cards_Service {
 
-	/**
-	 * @var string
-	 */
-	private $endpoint;
-
-	function __construct() {
-
-		$this->endpoint = '/context-card';
-
-		// PHP 5.3 compatibility as `$this` cannot be used in closures.
-		$that = $this;
-
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
-				'methods'  => 'GET',
-				'callback' => array( $that, 'context_data' ),
-			) );
-		} );
-
-	}
-
-	function format_response( $jsonld, $publisher = true ) {
-
-		$response = array();
-
-		if(!isset($jsonld) || empty($jsonld) || empty($jsonld[0])){
-			return null;
-		}
-
-		if( isset($jsonld[0]['description']) && !empty($jsonld[0]['description']) ){
-			if( isset($jsonld[0]['name']) && !empty($jsonld[0]['name']) ) {
-				$title = $jsonld[0]['name'];
-				$pos = strpos($jsonld[0]['description'], $title);
-				$response['description'] = $jsonld[0]['description'];
-				if ($pos !== false) {
-					$response['description'] = substr_replace($response['description'], "<strong>$title</strong>", $pos, strlen($title));
-				}
-			} else {
-				$response['description'] = $jsonld[0]['description'];
-			}
-		}
-
-		if( isset($jsonld[0]['name']) && !empty($jsonld[0]['name']) ){
-			$response['title'] = $jsonld[0]['name'];
-		}
-
-		if( isset($jsonld[0]['url']) && !empty($jsonld[0]['url']) ){
-			$response['url'] = $jsonld[0]['url'];
-		}
-
-		if( isset($jsonld[0]['image']) &&
-		    isset($jsonld[0]['image'][0]['url']) &&
-		    isset($jsonld[0]['image'][0]['width']) &&
-		    isset($jsonld[0]['image'][0]['height'])
-		){
-			$response['image'] = array(
-				'url' => $jsonld[0]['image'][0]['url'],
-				'width' => $jsonld[0]['image'][0]['width'],
-				'height' => $jsonld[0]['image'][0]['height'],
-			);
-		}
-
-		if($publisher){
-			$publisher_id       = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-			$publisher_jsonld   = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $publisher_id );
-			$response['publisher'] = $this->format_response( $publisher_jsonld, false );
-		}
-
-		return $response;
-	}
-
-	public function context_data( $request ) {
-
-		$entity_uri = urldecode( $request->get_param( 'entity_url' ) );
-		$entity_id  = $this->url_to_postid( $entity_uri );
-		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
-
-		return $this->format_response( $jsonld );
-
-	}
-
-	public function enqueue_scripts() {
-		$show_context_cards = true;
-		$show_context_cards = apply_filters( 'wl_show_context_cards', $show_context_cards );
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_localize_script( 'wordlift-cloud', 'wlCloudContextCards', array(
-				'selector'  => 'a.wl-entity-page-link',
-					'baseUrl'   => get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint
-			) );
-		}
-	}
-
-	private function url_to_postid( $url ) {
-		// Try with url_to_postid
-		$post_id = url_to_postid( $url );
-		if ( $post_id == 0 ) {
-			// Try with get_page_by_path
-			$post = get_page_by_path( basename( untrailingslashit( $url ) ), OBJECT, 'entity' );
-			if ( $post ) {
-				$post_id = $post->ID;
-			}
-		}
-
-		return $post_id;
-	}
+    /**
+     * @var string
+     */
+    private $endpoint;
+
+    function __construct() {
+
+        $this->endpoint = '/context-card';
+
+        // PHP 5.3 compatibility as `$this` cannot be used in closures.
+        $that = $this;
+
+        add_action( 'rest_api_init', function () use ( $that ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
+                'methods'  => 'GET',
+                'callback' => array( $that, 'context_data' ),
+            ) );
+        } );
+
+    }
+
+    function format_response( $jsonld, $publisher = true ) {
+
+        $response = array();
+
+        if(!isset($jsonld) || empty($jsonld) || empty($jsonld[0])){
+            return null;
+        }
+
+        if( isset($jsonld[0]['description']) && !empty($jsonld[0]['description']) ){
+            if( isset($jsonld[0]['name']) && !empty($jsonld[0]['name']) ) {
+                $title = $jsonld[0]['name'];
+                $pos = strpos($jsonld[0]['description'], $title);
+                $response['description'] = $jsonld[0]['description'];
+                if ($pos !== false) {
+                    $response['description'] = substr_replace($response['description'], "<strong>$title</strong>", $pos, strlen($title));
+                }
+            } else {
+                $response['description'] = $jsonld[0]['description'];
+            }
+        }
+
+        if( isset($jsonld[0]['name']) && !empty($jsonld[0]['name']) ){
+            $response['title'] = $jsonld[0]['name'];
+        }
+
+        if( isset($jsonld[0]['url']) && !empty($jsonld[0]['url']) ){
+            $response['url'] = $jsonld[0]['url'];
+        }
+
+        if( isset($jsonld[0]['image']) &&
+            isset($jsonld[0]['image'][0]['url']) &&
+            isset($jsonld[0]['image'][0]['width']) &&
+            isset($jsonld[0]['image'][0]['height'])
+        ){
+            $response['image'] = array(
+                'url' => $jsonld[0]['image'][0]['url'],
+                'width' => $jsonld[0]['image'][0]['width'],
+                'height' => $jsonld[0]['image'][0]['height'],
+            );
+        }
+
+        if($publisher){
+            $publisher_id       = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
+            $publisher_jsonld   = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $publisher_id );
+            $response['publisher'] = $this->format_response( $publisher_jsonld, false );
+        }
+
+        return $response;
+    }
+
+    public function context_data( $request ) {
+
+        $entity_uri = urldecode( $request->get_param( 'entity_url' ) );
+        $entity_id  = $this->url_to_postid( $entity_uri );
+        $jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
+
+        return $this->format_response( $jsonld );
+
+    }
+
+    public function enqueue_scripts() {
+        $show_context_cards = true;
+        $show_context_cards = apply_filters( 'wl_show_context_cards', $show_context_cards );
+        if ( $show_context_cards ) {
+            wp_enqueue_script( 'wordlift-cloud' );
+            wp_localize_script( 'wordlift-cloud', 'wlCloudContextCards', array(
+                'selector'  => 'a.wl-entity-page-link',
+                    'baseUrl'   => get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint
+            ) );
+        }
+    }
+
+    private function url_to_postid( $url ) {
+        // Try with url_to_postid
+        $post_id = url_to_postid( $url );
+        if ( $post_id == 0 ) {
+            // Try with get_page_by_path
+            $post = get_page_by_path( basename( untrailingslashit( $url ) ), OBJECT, 'entity' );
+            if ( $post ) {
+                $post_id = $post->ID;
+            }
+        }
+
+        return $post_id;
+    }
 
 }

Spacing +31 added lines, -31 removed lines

@@ -21,25 +21,25 @@ 
 		// PHP 5.3 compatibility as `$this` cannot be used in closures.
 		$that = $this;
 
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
+		add_action('rest_api_init', function() use ($that) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
 				'methods'  => 'GET',
-				'callback' => array( $that, 'context_data' ),
-			) );
+				'callback' => array($that, 'context_data'),
+			));
 		} );
 
 	}
 
-	function format_response( $jsonld, $publisher = true ) {
+	function format_response($jsonld, $publisher = true) {
 
 		$response = array();
 
-		if(!isset($jsonld) || empty($jsonld) || empty($jsonld[0])){
+		if ( ! isset($jsonld) || empty($jsonld) || empty($jsonld[0])) {
 			return null;
 		}
 
-		if( isset($jsonld[0]['description']) && !empty($jsonld[0]['description']) ){
-			if( isset($jsonld[0]['name']) && !empty($jsonld[0]['name']) ) {
+		if (isset($jsonld[0]['description']) && ! empty($jsonld[0]['description'])) {
+			if (isset($jsonld[0]['name']) && ! empty($jsonld[0]['name'])) {
 				$title = $jsonld[0]['name'];
 				$pos = strpos($jsonld[0]['description'], $title);
 				$response['description'] = $jsonld[0]['description'];
@@ -51,19 +51,19 @@ 
 			}
 		}
 
-		if( isset($jsonld[0]['name']) && !empty($jsonld[0]['name']) ){
+		if (isset($jsonld[0]['name']) && ! empty($jsonld[0]['name'])) {
 			$response['title'] = $jsonld[0]['name'];
 		}
 
-		if( isset($jsonld[0]['url']) && !empty($jsonld[0]['url']) ){
+		if (isset($jsonld[0]['url']) && ! empty($jsonld[0]['url'])) {
 			$response['url'] = $jsonld[0]['url'];
 		}
 
-		if( isset($jsonld[0]['image']) &&
+		if (isset($jsonld[0]['image']) &&
 		    isset($jsonld[0]['image'][0]['url']) &&
 		    isset($jsonld[0]['image'][0]['width']) &&
 		    isset($jsonld[0]['image'][0]['height'])
-		){
+		) {
 			$response['image'] = array(
 				'url' => $jsonld[0]['image'][0]['url'],
 				'width' => $jsonld[0]['image'][0]['width'],
@@ -71,44 +71,44 @@ 
 			);
 		}
 
-		if($publisher){
+		if ($publisher) {
 			$publisher_id       = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-			$publisher_jsonld   = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $publisher_id );
-			$response['publisher'] = $this->format_response( $publisher_jsonld, false );
+			$publisher_jsonld   = Wordlift_Jsonld_Service::get_instance()->get_jsonld(false, $publisher_id);
+			$response['publisher'] = $this->format_response($publisher_jsonld, false);
 		}
 
 		return $response;
 	}
 
-	public function context_data( $request ) {
+	public function context_data($request) {
 
-		$entity_uri = urldecode( $request->get_param( 'entity_url' ) );
-		$entity_id  = $this->url_to_postid( $entity_uri );
-		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
+		$entity_uri = urldecode($request->get_param('entity_url'));
+		$entity_id  = $this->url_to_postid($entity_uri);
+		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld(false, $entity_id);
 
-		return $this->format_response( $jsonld );
+		return $this->format_response($jsonld);
 
 	}
 
 	public function enqueue_scripts() {
 		$show_context_cards = true;
-		$show_context_cards = apply_filters( 'wl_show_context_cards', $show_context_cards );
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_localize_script( 'wordlift-cloud', 'wlCloudContextCards', array(
+		$show_context_cards = apply_filters('wl_show_context_cards', $show_context_cards);
+		if ($show_context_cards) {
+			wp_enqueue_script('wordlift-cloud');
+			wp_localize_script('wordlift-cloud', 'wlCloudContextCards', array(
 				'selector'  => 'a.wl-entity-page-link',
-					'baseUrl'   => get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint
-			) );
+					'baseUrl'   => get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE.$this->endpoint
+			));
 		}
 	}
 
-	private function url_to_postid( $url ) {
+	private function url_to_postid($url) {
 		// Try with url_to_postid
-		$post_id = url_to_postid( $url );
-		if ( $post_id == 0 ) {
+		$post_id = url_to_postid($url);
+		if ($post_id == 0) {
 			// Try with get_page_by_path
-			$post = get_page_by_path( basename( untrailingslashit( $url ) ), OBJECT, 'entity' );
-			if ( $post ) {
+			$post = get_page_by_path(basename(untrailingslashit($url)), OBJECT, 'entity');
+			if ($post) {
 				$post_id = $post->ID;
 			}
 		}

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +286 added lines, -286 removed lines

@@ -16,29 +16,29 @@ 
  */
 function wl_shortcode_navigator_data() {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_navigator_get_data();
+    $results = _wl_navigator_get_data();
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 }
 
 /**
@@ -53,195 +53,195 @@ 
  */
 function wl_network_navigator_wp_json($request) {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_network_navigator_get_data($request);
+    $results = _wl_network_navigator_get_data($request);
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 
 }
 
 function _wl_navigator_get_data() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
-
-		return array();
-	}
-
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
-
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
-
-	$navigator_id = $_GET['uniqid'];
-
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
-
-		return array();
-	}
-
-	// Determine navigator type and call respective _get_results
-	if(get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME){
-		$referencing_posts = _wl_entity_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset );
-	} else {
-		$referencing_posts = _wl_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset );
-	}
-
-	// loop over them and take the first one which is not already in the $related_posts
-	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'entity' => array(
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$result['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	return $results;
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_send_json_error( 'No post_id given' );
+
+        return array();
+    }
+
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
+    $navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
+    $order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
+
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
+
+    $navigator_id = $_GET['uniqid'];
+
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_send_json_error( 'No valid post_id given' );
+
+        return array();
+    }
+
+    // Determine navigator type and call respective _get_results
+    if(get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME){
+        $referencing_posts = _wl_entity_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset );
+    } else {
+        $referencing_posts = _wl_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset );
+    }
+
+    // loop over them and take the first one which is not already in the $related_posts
+    $results = array();
+    foreach ( $referencing_posts as $referencing_post ) {
+        $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            'entity' => array(
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $result['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    return $results;
 }
 
 function _wl_network_navigator_get_data($request) {
 
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
-	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
-
-	$entities = $request['entities'];
-
-	// Post ID has to match an existing item
-	if ( !isset($entities) || empty($entities) ) {
-		wp_send_json_error( 'No valid entities provided' );
-	}
-
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
-		'ID',
-		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
-
-	// loop over them and take the first one which is not already in the $related_posts
-	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'entity' => array(
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	return $results;
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
+    $navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+    $navigator_id     = $request['uniqid'];
+    $order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
+
+    $entities = $request['entities'];
+
+    // Post ID has to match an existing item
+    if ( !isset($entities) || empty($entities) ) {
+        wp_send_json_error( 'No valid entities provided' );
+    }
+
+    $referencing_posts = _wl_network_navigator_get_results( $entities, array(
+        'ID',
+        'post_title',
+    ), $order_by, $navigator_length, $navigator_offset );
+
+    // loop over them and take the first one which is not already in the $related_posts
+    $results = array();
+    foreach ( $referencing_posts as $referencing_post ) {
+        $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            'entity' => array(
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    return $results;
 
 }
 
 
 function _wl_navigator_get_results(
-	$post_id, $fields = array(
-	'ID',
-	'post_title',
+    $post_id, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -273,29 +273,29 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
-	);
+            , $post_id, $limit, $offset, $select, $order_by )
+    );
 
 }
 
 function _wl_entity_navigator_get_results(
-	$post_id, $fields = array(
-	'ID',
-	'post_title',
+    $post_id, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0){
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -324,34 +324,34 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
-	);
+            , $post_id, $limit, $offset, $select, $order_by )
+    );
 }
 
 function _wl_network_navigator_get_results(
-	$entities, $fields = array(
-	'ID',
-	'post_title',
+    $entities, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
+    global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
-		if(isset($entity)) return $entity->ID;
-	}, $entities ) );
+    $entities_in = implode( ',', array_map( function ( $item ) {
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
+        if(isset($entity)) return $entity->ID;
+    }, $entities ) );
 
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -377,8 +377,8 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -389,9 +389,9 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	// Temporary blocking the Navigator.
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+    // Temporary blocking the Navigator.
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json( $results );
 
 }
 
@@ -403,16 +403,16 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	return array(
-		'items' => array(
-			array( 'values' => $results ),
-		),
-	);
+    return array(
+        'items' => array(
+            array( 'values' => $results ),
+        ),
+    );
 
 }
 
@@ -420,66 +420,66 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-		'methods'  => 'GET',
-		'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods'  => 'GET',
+        'callback' => 'wl_shortcode_navigator_wp_json',
+    ) );
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
-		'methods'  => 'GET',
-		'callback' => 'wl_network_navigator_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+        'methods'  => 'GET',
+        'callback' => 'wl_network_navigator_wp_json',
+    ) );
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function () {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type( 'wordlift/navigator', array(
-		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_navigator ' . $attr_code . ']';
-		},
-		'attributes'      => array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => 4,
-			),
-			'template_id' => array(
-				'type' => 'string',
-			),
-			'post_id'     => array(
-				'type' => 'number',
-			),
-			'offset'      => array(
-				'type'    => 'number',
-				'default' => 0,
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => uniqid( 'wl-navigator-widget-' ),
-			),
-		),
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/navigator', array(
+        'editor_script'   => 'wl-block-editor',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_navigator ' . $attr_code . ']';
+        },
+        'attributes'      => array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => 4,
+            ),
+            'template_id' => array(
+                'type' => 'string',
+            ),
+            'post_id'     => array(
+                'type' => 'number',
+            ),
+            'offset'      => array(
+                'type'    => 'number',
+                'default' => 0,
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => uniqid( 'wl-navigator-widget-' ),
+            ),
+        ),
+    ) );
 } );
 
 /**
@@ -489,22 +489,22 @@ 
  */
 add_action( 'plugins_loaded', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    remove_action( 'plugins_loaded', 'rocket_init' );
+    remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+    remove_action( 'plugins_loaded', 'wpseo_init', 14 );
 }, 0 );
 
 add_action( 'init', function () {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
-		return;
-	}
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+        return;
+    }
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
+    remove_action( 'init', 'wp_widgets_init', 1 );
+    remove_action( 'init', 'gglcptch_init' );
 }, 0 );
 

Spacing +108 added lines, -108 removed lines

@@ -18,25 +18,25 @@ 
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("navigator", 24 * 60 * 60); // 24 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
 	$results = _wl_navigator_get_data();
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 }
@@ -55,25 +55,25 @@ 
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 24 * 60 * 60 ); // 24 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("network-navigator", 24 * 60 * 60); // 24 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
 	$results = _wl_network_navigator_get_data($request);
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 
@@ -82,46 +82,46 @@ 
 function _wl_navigator_get_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_send_json_error('No post_id given');
 
 		return array();
 	}
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
+	$navigator_length = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
+	$navigator_offset = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
+	$order_by         = isset($_GET['order_by']) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	$navigator_id = $_GET['uniqid'];
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_send_json_error('No valid post_id given');
 
 		return array();
 	}
 
 	// Determine navigator type and call respective _get_results
-	if(get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME){
-		$referencing_posts = _wl_entity_navigator_get_results( $current_post_id, array(
+	if (get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME) {
+		$referencing_posts = _wl_entity_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset );
+		), $order_by, $navigator_length, $navigator_offset);
 	} else {
-		$referencing_posts = _wl_navigator_get_results( $current_post_id, array(
+		$referencing_posts = _wl_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset );
+		), $order_by, $navigator_length, $navigator_offset);
 	}
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -131,29 +131,29 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
 			'entity' => array(
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
-		$result['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 	}
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
 	return $results;
@@ -162,27 +162,27 @@ 
 function _wl_network_navigator_get_data($request) {
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+	$navigator_length = isset($request['limit']) ? intval($request['limit']) : 4;
+	$navigator_offset = isset($request['offset']) ? intval($request['offset']) : 0;
 	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['order_by'] ) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
+	$order_by         = isset($_GET['order_by']) ? sanitize_sql_orderby($_GET['order_by']) : 'ID DESC';
 
 	$entities = $request['entities'];
 
 	// Post ID has to match an existing item
-	if ( !isset($entities) || empty($entities) ) {
-		wp_send_json_error( 'No valid entities provided' );
+	if ( ! isset($entities) || empty($entities)) {
+		wp_send_json_error('No valid entities provided');
 	}
 
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
+	$referencing_posts = _wl_network_navigator_get_results($entities, array(
 		'ID',
 		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
+	), $order_by, $navigator_length, $navigator_offset);
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -192,30 +192,30 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
 			'entity' => array(
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_network_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_network_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 
 	}
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
 	return $results;
@@ -231,17 +231,17 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -273,7 +273,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
+			, $post_id, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -282,20 +282,20 @@ 
 	$post_id, $fields = array(
 	'ID',
 	'post_title',
-), $order_by = 'ID DESC', $limit = 10, $offset = 0){
+), $order_by = 'ID DESC', $limit = 10, $offset = 0) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -324,7 +324,7 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 EOF
-			, $post_id, $limit, $offset, $select, $order_by )
+			, $post_id, $limit, $offset, $select, $order_by)
 	);
 }
 
@@ -336,22 +336,22 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
+	$entities_in = implode(',', array_map(function($item) {
 		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
-		if(isset($entity)) return $entity->ID;
-	}, $entities ) );
+		if (isset($entity)) return $entity->ID;
+	}, $entities));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -377,7 +377,7 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -391,12 +391,12 @@ 
 
 	// Temporary blocking the Navigator.
 	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -404,13 +404,13 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
 	return array(
 		'items' => array(
-			array( 'values' => $results ),
+			array('values' => $results),
 		),
 	);
 
@@ -419,46 +419,46 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 		'methods'  => 'GET',
 		'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+	));
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
 		'methods'  => 'GET',
 		'callback' => 'wl_network_navigator_wp_json',
-	) );
+	));
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function () {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
-	register_block_type( 'wordlift/navigator', array(
+	register_block_type('wordlift/navigator', array(
 		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_navigator ' . $attr_code . ']';
+			return '[wl_navigator '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'limit'       => array(
 				'type'    => 'number',
@@ -476,10 +476,10 @@ 
 			),
 			'uniqid'      => array(
 				'type'    => 'string',
-				'default' => uniqid( 'wl-navigator-widget-' ),
+				'default' => uniqid('wl-navigator-widget-'),
 			),
 		),
-	) );
+	));
 } );
 
 /**
@@ -487,24 +487,24 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
+add_action('plugins_loaded', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action']) {
 		return;
 	}
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-}, 0 );
+	remove_action('plugins_loaded', 'rocket_init');
+	remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+	remove_action('plugins_loaded', 'wpseo_init', 14);
+}, 0);
 
-add_action( 'init', function () {
+add_action('init', function() {
 
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action'] ) {
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $_REQUEST['action']) {
 		return;
 	}
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
-}, 0 );
+	remove_action('init', 'wp_widgets_init', 1);
+	remove_action('init', 'gglcptch_init');
+}, 0);