insideout10 / wordlift-plugin

src/wordlift/shipping-data/class-shipping-method.php

Indentation +57 added lines, -57 removed lines

@@ -8,81 +8,81 @@
 
 class Shipping_Method {
 
-	/**
-	 * @var WC_Shipping_Method $wc_shipping_method
-	 */
-	protected $wc_shipping_method;
+    /**
+     * @var WC_Shipping_Method $wc_shipping_method
+     */
+    protected $wc_shipping_method;
 
-	/**
-	 * Shipping_Method constructor.
-	 *
-	 * @param WC_Shipping_Method $wc_shipping_method
-	 */
-	public function __construct( $wc_shipping_method ) {
-		$this->wc_shipping_method = $wc_shipping_method;
-	}
+    /**
+     * Shipping_Method constructor.
+     *
+     * @param WC_Shipping_Method $wc_shipping_method
+     */
+    public function __construct( $wc_shipping_method ) {
+        $this->wc_shipping_method = $wc_shipping_method;
+    }
 
-	/**
-	 * @param WC_Shipping_Method $wc_shipping_method
-	 *
-	 * @return Shipping_Method
-	 */
-	public static function from_wc_shipping_method( $wc_shipping_method ) {
+    /**
+     * @param WC_Shipping_Method $wc_shipping_method
+     *
+     * @return Shipping_Method
+     */
+    public static function from_wc_shipping_method( $wc_shipping_method ) {
 
-		switch ( get_class( $wc_shipping_method ) ) {
-			case 'WC_Shipping_Local_Pickup':
-				return new Local_Pickup_Shipping_Method( $wc_shipping_method );
+        switch ( get_class( $wc_shipping_method ) ) {
+            case 'WC_Shipping_Local_Pickup':
+                return new Local_Pickup_Shipping_Method( $wc_shipping_method );
 
-			case 'WC_Shipping_Flat_Rate':
-				return new Flat_Rate_Shipping_Method( $wc_shipping_method );
+            case 'WC_Shipping_Flat_Rate':
+                return new Flat_Rate_Shipping_Method( $wc_shipping_method );
 
-			case 'WC_Shipping_Free_Shipping':
-				return new Free_Shipping_Shipping_Method( $wc_shipping_method );
+            case 'WC_Shipping_Free_Shipping':
+                return new Free_Shipping_Shipping_Method( $wc_shipping_method );
 
-			default:
-				return new self( $wc_shipping_method );
-		}
+            default:
+                return new self( $wc_shipping_method );
+        }
 
-	}
+    }
 
-	public function add_available_delivery_method( &$jsonld ) {
+    public function add_available_delivery_method( &$jsonld ) {
 
-	}
+    }
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+    public function add_shipping_rate( &$offer_shipping_details ) {
 
-	}
+    }
 
-	public function add_transit_time( &$shipping_delivery_time ) {
+    public function add_transit_time( &$shipping_delivery_time ) {
 
-		$prefix   = "wcsdt_transit_m{$this->wc_shipping_method->get_instance_id()}";
-		$property = 'transitTime';
+        $prefix   = "wcsdt_transit_m{$this->wc_shipping_method->get_instance_id()}";
+        $property = 'transitTime';
 
-		$option = get_option( 'wpsso_options' );
+        $option = get_option( 'wpsso_options' );
 
-		if ( empty( $option["{$prefix}_unit_code"] )
-		     || ! isset( $option["{$prefix}_minimum"] )
-		     || ! isset( $option["{$prefix}_maximum"] )
-		     || ! is_numeric( $option["{$prefix}_minimum"] )
-		     || ! is_numeric( $option["{$prefix}_maximum"] ) ) {
-			return;
-		}
+        if ( empty( $option["{$prefix}_unit_code"] )
+             || ! isset( $option["{$prefix}_minimum"] )
+             || ! isset( $option["{$prefix}_maximum"] )
+             || ! is_numeric( $option["{$prefix}_minimum"] )
+             || ! is_numeric( $option["{$prefix}_maximum"] ) ) {
+            return;
+        }
 
-		$unit_code = $option["{$prefix}_unit_code"];
-		$minimum   = $option["{$prefix}_minimum"];
-		$maximum   = $option["{$prefix}_maximum"];
+        $unit_code = $option["{$prefix}_unit_code"];
+        $minimum   = $option["{$prefix}_minimum"];
+        $maximum   = $option["{$prefix}_maximum"];
 
-		if ( 'HUR' === $unit_code ) {
-			$minimum = floor( $minimum / 24.0 );
-			$maximum = ceil( $maximum / 24.0 );
-		}
+        if ( 'HUR' === $unit_code ) {
+            $minimum = floor( $minimum / 24.0 );
+            $maximum = ceil( $maximum / 24.0 );
+        }
 
-		$shipping_delivery_time[ $property ] = array(
-			'@type'    => 'QuantitativeValue',
-			'minValue' => intval( $minimum ),
-			'maxValue' => intval( $maximum ),
-		);
+        $shipping_delivery_time[ $property ] = array(
+            '@type'    => 'QuantitativeValue',
+            'minValue' => intval( $minimum ),
+            'maxValue' => intval( $maximum ),
+        );
 
-	}
+    }
 
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -18,7 +18,7 @@ 
 	 *
 	 * @param WC_Shipping_Method $wc_shipping_method
 	 */
-	public function __construct( $wc_shipping_method ) {
+	public function __construct($wc_shipping_method) {
 		$this->wc_shipping_method = $wc_shipping_method;
 	}
 
@@ -27,44 +27,44 @@ 
 	 *
 	 * @return Shipping_Method
 	 */
-	public static function from_wc_shipping_method( $wc_shipping_method ) {
+	public static function from_wc_shipping_method($wc_shipping_method) {
 
-		switch ( get_class( $wc_shipping_method ) ) {
+		switch (get_class($wc_shipping_method)) {
 			case 'WC_Shipping_Local_Pickup':
-				return new Local_Pickup_Shipping_Method( $wc_shipping_method );
+				return new Local_Pickup_Shipping_Method($wc_shipping_method);
 
 			case 'WC_Shipping_Flat_Rate':
-				return new Flat_Rate_Shipping_Method( $wc_shipping_method );
+				return new Flat_Rate_Shipping_Method($wc_shipping_method);
 
 			case 'WC_Shipping_Free_Shipping':
-				return new Free_Shipping_Shipping_Method( $wc_shipping_method );
+				return new Free_Shipping_Shipping_Method($wc_shipping_method);
 
 			default:
-				return new self( $wc_shipping_method );
+				return new self($wc_shipping_method);
 		}
 
 	}
 
-	public function add_available_delivery_method( &$jsonld ) {
+	public function add_available_delivery_method(&$jsonld) {
 
 	}
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+	public function add_shipping_rate(&$offer_shipping_details) {
 
 	}
 
-	public function add_transit_time( &$shipping_delivery_time ) {
+	public function add_transit_time(&$shipping_delivery_time) {
 
 		$prefix   = "wcsdt_transit_m{$this->wc_shipping_method->get_instance_id()}";
 		$property = 'transitTime';
 
-		$option = get_option( 'wpsso_options' );
+		$option = get_option('wpsso_options');
 
-		if ( empty( $option["{$prefix}_unit_code"] )
-		     || ! isset( $option["{$prefix}_minimum"] )
-		     || ! isset( $option["{$prefix}_maximum"] )
-		     || ! is_numeric( $option["{$prefix}_minimum"] )
-		     || ! is_numeric( $option["{$prefix}_maximum"] ) ) {
+		if (empty($option["{$prefix}_unit_code"])
+		     || ! isset($option["{$prefix}_minimum"])
+		     || ! isset($option["{$prefix}_maximum"])
+		     || ! is_numeric($option["{$prefix}_minimum"])
+		     || ! is_numeric($option["{$prefix}_maximum"])) {
 			return;
 		}
 
@@ -72,15 +72,15 @@ 
 		$minimum   = $option["{$prefix}_minimum"];
 		$maximum   = $option["{$prefix}_maximum"];
 
-		if ( 'HUR' === $unit_code ) {
-			$minimum = floor( $minimum / 24.0 );
-			$maximum = ceil( $maximum / 24.0 );
+		if ('HUR' === $unit_code) {
+			$minimum = floor($minimum / 24.0);
+			$maximum = ceil($maximum / 24.0);
 		}
 
-		$shipping_delivery_time[ $property ] = array(
+		$shipping_delivery_time[$property] = array(
 			'@type'    => 'QuantitativeValue',
-			'minValue' => intval( $minimum ),
-			'maxValue' => intval( $maximum ),
+			'minValue' => intval($minimum),
+			'maxValue' => intval($maximum),
 		);
 
 	}

src/includes/class-wordlift.php

Spacing +295 added lines, -295 removed lines

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

Indentation +1674 added lines, -1674 removed lines

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

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

Indentation +370 added lines, -370 removed lines

@@ -14,375 +14,375 @@
  */
 class Wordlift_Rating_Service {
 
-	/**
-	 * Entity rating max.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_MAX = 7;
-
-	/**
-	 * Entity rating score meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
-
-	/**
-	 * Entity rating warnings meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
-
-	/**
-	 * Entity warning has related post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
-
-	/**
-	 * Entity warning has content post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
-
-	/**
-	 * Entity warning has related entities identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
-
-	/**
-	 * Entity warning is published identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
-
-	/**
-	 * Entity warning has thumbnail identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
-
-	/**
-	 * Entity warning has same as identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
-
-	/**
-	 * Entity warning has completed metadata identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
-
-	/**
-	 *  A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since 3.10.0
-	 *
-	 */
-	protected function __construct() {
-
-		$this->entity_type_service = Wordlift_Entity_Type_Service::get_instance();
-		$this->notice_service      = Wordlift_Notice_Service::get_instance();
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rating_Service' );
-
-	}
-
-	private static $instance;
-
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Set rating for a given entity.
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return array An array representing the rating obj.
-	 * @since 3.3.0
-	 *
-	 */
-	public function set_rating_for( $post_id ) {
-
-		if ( ! apply_filters( 'wl_feature__enable__entity-rating', true ) ) {
-			return;
-		}
-
-		if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			return;
-		}
-
-		// Calculate rating for the given post.
-		$rating = $this->calculate_rating_for( $post_id );
-
-		// Store the rating on db as post meta. Please notice that RATING_RAW_SCORE_META_KEY
-		// is saved on a different meta to allow score sorting. Both meta are managed as unique.
-		//
-		// See https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score'] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings'] );
-
-		$this->log->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score'] ) );
-
-		// Finally returns the rating
-		return $rating;
-	}
-
-
-	/**
-	 * Get or calculate rating for a given entity
-	 *
-	 * @param int $post_id The entity post id.
-	 * @param     $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
-	 *
-	 * @return array An array representing the rating obj.
-	 * @since 3.3.0
-	 *
-	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
-
-		// If forced reload is required or rating is missing.
-		if ( $force_reload ) {
-			$this->log->trace( "Force rating reload [ post_id :: $post_id ]" );
-
-			return $this->set_rating_for( $post_id );
-		}
-
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );
-
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-
-			return $this->set_rating_for( $post_id );
-		}
-
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );
-
-		// Finally return score and warnings
-		return array(
-			'raw_score'           => $current_raw_score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $current_raw_score ),
-			'warnings'            => $current_warnings,
-		);
-
-	}
-
-	/**
-	 * Calculate rating for a given entity.
-	 *
-	 * Rating depends from following criteria:
-	 *
-	 * 1. Is the current entity related to at least 1 post?
-	 * 2. Is the current entity content post not empty?
-	 * 3. Is the current entity related to at least 1 entity?
-	 * 4. Is the entity published?
-	 * 5. There is a a thumbnail associated to the entity?
-	 * 6. Has the entity a sameas defined?
-	 * 7. Are all schema.org required metadata compiled?
-	 *
-	 * Each positive check means +1 in terms of rating score.
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return array An array representing the rating obj.
-	 * @since 3.3.0
-	 *
-	 */
-	private function calculate_rating_for( $post_id ) {
-
-		// If it's not an entity, return.
-		if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			return array();
-		}
-		// Retrieve the post object.
-		$post = get_post( $post_id );
-
-		// Rating value.
-		$score = 0;
-
-		// Store warning messages.
-		$warnings = array();
-
-		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'There are no related posts for the current entity.', 'wordlift' ) );
-
-		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'This entity has not description.', 'wordlift' ) );
-
-		// Is the current entity related to at least 1 entity?
-		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'There are no related entities for the current entity.', 'wordlift' ) );
-
-		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'This entity is not published. It will not appear within analysis results.', 'wordlift' ) );
-
-		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'This entity has no featured image yet.', 'wordlift' ) );
-
-		// Get all post meta keys for the current post
-		global $wpdb;
-
-		$query = $wpdb->prepare(
-			"SELECT DISTINCT (meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID
-		);
-
-		// Check intersection between available meta keys and expected ones
-		// arrays to detect missing values.
-		$available_meta_keys = $wpdb->get_col( $query );
-
-		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'There are no sameAs configured for this entity.', 'wordlift' ) );
-
-		$schema = $this->entity_type_service->get( $post_id );
-
-		$expected_meta_keys = ( null === $schema['custom_fields'] ) ?
-			array() :
-			array_keys( $schema['custom_fields'] );
-
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
-		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'Schema.org metadata for this entity are not completed.', 'wordlift' ) );
-
-		// Finally return score and warnings
-		return array(
-			'raw_score'           => $score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $score ),
-			'warnings'            => $warnings,
-		);
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 * @since 3.3.0
-	 *
-	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
-		// RATING_MAX : $score = 3 : x
-		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
-
-		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating;
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 * @since 3.3.0
-	 *
-	 */
-	public function convert_raw_score_to_percentage( $score ) {
-
-		// RATING_MAX : $score = 100 : x
-		return round( ( $score * 100 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
-	}
-
-
-	/**
-	 * Add admin notices for the current entity depending on the current rating.
-	 *
-	 * @since 3.3.0
-	 */
-	public function in_admin_header() {
-
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( false === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
-
-		$screen = get_current_screen();
-		// If there is any valid screen nothing to do
-		if ( null === $screen ) {
-			return;
-		}
-
-		// If you're not in the entity post edit page, return.
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->id ) {
-			return;
-		}
-		// Retrieve the current global post
-		global $post;
-		// If it's not an entity, return.
-		if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post->ID ) ) {
-			return;
-		}
-		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
-
-		// If there is at least 1 warning
-		if ( isset( $rating['warnings'] ) && 0 < count( $rating['warnings'] ) ) {
-			// TODO - Pass Wordlift_Notice_Service trough the service constructor
-			$this->notice_service->add_suggestion( $rating['warnings'] );
-		}
-
-	}
+    /**
+     * Entity rating max.
+     *
+     * @since 3.3.0
+     */
+    const RATING_MAX = 7;
+
+    /**
+     * Entity rating score meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
+
+    /**
+     * Entity rating warnings meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
+
+    /**
+     * Entity warning has related post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
+
+    /**
+     * Entity warning has content post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
+
+    /**
+     * Entity warning has related entities identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
+
+    /**
+     * Entity warning is published identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
+
+    /**
+     * Entity warning has thumbnail identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
+
+    /**
+     * Entity warning has same as identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
+
+    /**
+     * Entity warning has completed metadata identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
+
+    /**
+     *  A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_Rating_Service} instance.
+     *
+     * @since 3.10.0
+     *
+     */
+    protected function __construct() {
+
+        $this->entity_type_service = Wordlift_Entity_Type_Service::get_instance();
+        $this->notice_service      = Wordlift_Notice_Service::get_instance();
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rating_Service' );
+
+    }
+
+    private static $instance;
+
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Set rating for a given entity.
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return array An array representing the rating obj.
+     * @since 3.3.0
+     *
+     */
+    public function set_rating_for( $post_id ) {
+
+        if ( ! apply_filters( 'wl_feature__enable__entity-rating', true ) ) {
+            return;
+        }
+
+        if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            return;
+        }
+
+        // Calculate rating for the given post.
+        $rating = $this->calculate_rating_for( $post_id );
+
+        // Store the rating on db as post meta. Please notice that RATING_RAW_SCORE_META_KEY
+        // is saved on a different meta to allow score sorting. Both meta are managed as unique.
+        //
+        // See https://codex.wordpress.org/Function_Reference/update_post_meta
+        update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score'] );
+        update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings'] );
+
+        $this->log->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score'] ) );
+
+        // Finally returns the rating
+        return $rating;
+    }
+
+
+    /**
+     * Get or calculate rating for a given entity
+     *
+     * @param int $post_id The entity post id.
+     * @param     $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
+     *
+     * @return array An array representing the rating obj.
+     * @since 3.3.0
+     *
+     */
+    public function get_rating_for( $post_id, $force_reload = false ) {
+
+        // If forced reload is required or rating is missing.
+        if ( $force_reload ) {
+            $this->log->trace( "Force rating reload [ post_id :: $post_id ]" );
+
+            return $this->set_rating_for( $post_id );
+        }
+
+        $current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );
+
+        if ( ! is_numeric( $current_raw_score ) ) {
+            $this->log->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
+
+            return $this->set_rating_for( $post_id );
+        }
+
+        $current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );
+
+        // Finally return score and warnings
+        return array(
+            'raw_score'           => $current_raw_score,
+            'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $current_raw_score ),
+            'percentage_score'    => $this->convert_raw_score_to_percentage( $current_raw_score ),
+            'warnings'            => $current_warnings,
+        );
+
+    }
+
+    /**
+     * Calculate rating for a given entity.
+     *
+     * Rating depends from following criteria:
+     *
+     * 1. Is the current entity related to at least 1 post?
+     * 2. Is the current entity content post not empty?
+     * 3. Is the current entity related to at least 1 entity?
+     * 4. Is the entity published?
+     * 5. There is a a thumbnail associated to the entity?
+     * 6. Has the entity a sameas defined?
+     * 7. Are all schema.org required metadata compiled?
+     *
+     * Each positive check means +1 in terms of rating score.
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return array An array representing the rating obj.
+     * @since 3.3.0
+     *
+     */
+    private function calculate_rating_for( $post_id ) {
+
+        // If it's not an entity, return.
+        if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            return array();
+        }
+        // Retrieve the post object.
+        $post = get_post( $post_id );
+
+        // Rating value.
+        $score = 0;
+
+        // Store warning messages.
+        $warnings = array();
+
+        // Is the current entity related to at least 1 post?
+        ( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'There are no related posts for the current entity.', 'wordlift' ) );
+
+        // Is the post content not empty?
+        ( ! empty( $post->post_content ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'This entity has not description.', 'wordlift' ) );
+
+        // Is the current entity related to at least 1 entity?
+        // Was the current entity already disambiguated?
+        ( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'There are no related entities for the current entity.', 'wordlift' ) );
+
+        // Is the entity published?
+        ( 'publish' === get_post_status( $post->ID ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'This entity is not published. It will not appear within analysis results.', 'wordlift' ) );
+
+        // Has a thumbnail?
+        ( has_post_thumbnail( $post->ID ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'This entity has no featured image yet.', 'wordlift' ) );
+
+        // Get all post meta keys for the current post
+        global $wpdb;
+
+        $query = $wpdb->prepare(
+            "SELECT DISTINCT (meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID
+        );
+
+        // Check intersection between available meta keys and expected ones
+        // arrays to detect missing values.
+        $available_meta_keys = $wpdb->get_col( $query );
+
+        // If each expected key is contained in available keys array ...
+        ( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'There are no sameAs configured for this entity.', 'wordlift' ) );
+
+        $schema = $this->entity_type_service->get( $post_id );
+
+        $expected_meta_keys = ( null === $schema['custom_fields'] ) ?
+            array() :
+            array_keys( $schema['custom_fields'] );
+
+        $intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+        // If each expected key is contained in available keys array ...
+        ( count( $intersection ) === count( $expected_meta_keys ) ) ?
+            $score ++ :
+            array_push( $warnings, __( 'Schema.org metadata for this entity are not completed.', 'wordlift' ) );
+
+        // Finally return score and warnings
+        return array(
+            'raw_score'           => $score,
+            'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $score ),
+            'percentage_score'    => $this->convert_raw_score_to_percentage( $score ),
+            'warnings'            => $warnings,
+        );
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     * @since 3.3.0
+     *
+     */
+    private function convert_raw_score_to_traffic_light( $score ) {
+        // RATING_MAX : $score = 3 : x
+        // See http://php.net/manual/en/function.round.php
+        $rating = round( ( $score * 3 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+
+        // If rating is 0, return 1, otherwise return rating
+        return ( 0 == $rating ) ? 1 : $rating;
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     * @since 3.3.0
+     *
+     */
+    public function convert_raw_score_to_percentage( $score ) {
+
+        // RATING_MAX : $score = 100 : x
+        return round( ( $score * 100 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+    }
+
+
+    /**
+     * Add admin notices for the current entity depending on the current rating.
+     *
+     * @since 3.3.0
+     */
+    public function in_admin_header() {
+
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( false === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
+
+        $screen = get_current_screen();
+        // If there is any valid screen nothing to do
+        if ( null === $screen ) {
+            return;
+        }
+
+        // If you're not in the entity post edit page, return.
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->id ) {
+            return;
+        }
+        // Retrieve the current global post
+        global $post;
+        // If it's not an entity, return.
+        if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post->ID ) ) {
+            return;
+        }
+        // Retrieve an updated rating for the current entity
+        $rating = $this->get_rating_for( $post->ID, true );
+
+        // If there is at least 1 warning
+        if ( isset( $rating['warnings'] ) && 0 < count( $rating['warnings'] ) ) {
+            // TODO - Pass Wordlift_Notice_Service trough the service constructor
+            $this->notice_service->add_suggestion( $rating['warnings'] );
+        }
+
+    }
 
 }

Spacing +56 added lines, -64 removed lines

@@ -122,14 +122,14 @@ 
 		$this->entity_type_service = Wordlift_Entity_Type_Service::get_instance();
 		$this->notice_service      = Wordlift_Notice_Service::get_instance();
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rating_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Rating_Service');
 
 	}
 
 	private static $instance;
 
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -145,27 +145,27 @@ 
 	 * @since 3.3.0
 	 *
 	 */
-	public function set_rating_for( $post_id ) {
+	public function set_rating_for($post_id) {
 
-		if ( ! apply_filters( 'wl_feature__enable__entity-rating', true ) ) {
+		if ( ! apply_filters('wl_feature__enable__entity-rating', true)) {
 			return;
 		}
 
-		if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if ( ! Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			return;
 		}
 
 		// Calculate rating for the given post.
-		$rating = $this->calculate_rating_for( $post_id );
+		$rating = $this->calculate_rating_for($post_id);
 
 		// Store the rating on db as post meta. Please notice that RATING_RAW_SCORE_META_KEY
 		// is saved on a different meta to allow score sorting. Both meta are managed as unique.
 		//
 		// See https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score'] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings'] );
+		update_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score']);
+		update_post_meta($post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings']);
 
-		$this->log->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score'] ) );
+		$this->log->trace(sprintf("Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score']));
 
 		// Finally returns the rating
 		return $rating;
@@ -182,30 +182,30 @@ 
 	 * @since 3.3.0
 	 *
 	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+	public function get_rating_for($post_id, $force_reload = false) {
 
 		// If forced reload is required or rating is missing.
-		if ( $force_reload ) {
-			$this->log->trace( "Force rating reload [ post_id :: $post_id ]" );
+		if ($force_reload) {
+			$this->log->trace("Force rating reload [ post_id :: $post_id ]");
 
-			return $this->set_rating_for( $post_id );
+			return $this->set_rating_for($post_id);
 		}
 
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );
+		$current_raw_score = get_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, true);
 
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
+		if ( ! is_numeric($current_raw_score)) {
+			$this->log->trace("Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]");
 
-			return $this->set_rating_for( $post_id );
+			return $this->set_rating_for($post_id);
 		}
 
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );
+		$current_warnings = get_post_meta($post_id, self::RATING_WARNINGS_META_KEY, true);
 
 		// Finally return score and warnings
 		return array(
 			'raw_score'           => $current_raw_score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $current_raw_score ),
+			'traffic_light_score' => $this->convert_raw_score_to_traffic_light($current_raw_score),
+			'percentage_score'    => $this->convert_raw_score_to_percentage($current_raw_score),
 			'warnings'            => $current_warnings,
 		);
 
@@ -232,14 +232,14 @@ 
 	 * @since 3.3.0
 	 *
 	 */
-	private function calculate_rating_for( $post_id ) {
+	private function calculate_rating_for($post_id) {
 
 		// If it's not an entity, return.
-		if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if ( ! Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			return array();
 		}
 		// Retrieve the post object.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Rating value.
 		$score = 0;
@@ -248,30 +248,25 @@ 
 		$warnings = array();
 
 		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'There are no related posts for the current entity.', 'wordlift' ) );
+		(0 < count(wl_core_get_related_post_ids($post->ID))) ?
+			$score++ : array_push($warnings, __('There are no related posts for the current entity.', 'wordlift'));
 
 		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'This entity has not description.', 'wordlift' ) );
+		( ! empty($post->post_content)) ?
+			$score++ : array_push($warnings, __('This entity has not description.', 'wordlift'));
 
 		// Is the current entity related to at least 1 entity?
 		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'There are no related entities for the current entity.', 'wordlift' ) );
+		(0 < count(wl_core_get_related_entity_ids($post->ID))) ?
+			$score++ : array_push($warnings, __('There are no related entities for the current entity.', 'wordlift'));
 
 		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'This entity is not published. It will not appear within analysis results.', 'wordlift' ) );
+		('publish' === get_post_status($post->ID)) ?
+			$score++ : array_push($warnings, __('This entity is not published. It will not appear within analysis results.', 'wordlift'));
 
 		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'This entity has no featured image yet.', 'wordlift' ) );
+		(has_post_thumbnail($post->ID)) ?
+			$score++ : array_push($warnings, __('This entity has no featured image yet.', 'wordlift'));
 
 		// Get all post meta keys for the current post
 		global $wpdb;
@@ -282,30 +277,27 @@ 
 
 		// Check intersection between available meta keys and expected ones
 		// arrays to detect missing values.
-		$available_meta_keys = $wpdb->get_col( $query );
+		$available_meta_keys = $wpdb->get_col($query);
 
 		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'There are no sameAs configured for this entity.', 'wordlift' ) );
+		(in_array(Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys)) ?
+			$score++ : array_push($warnings, __('There are no sameAs configured for this entity.', 'wordlift'));
 
-		$schema = $this->entity_type_service->get( $post_id );
+		$schema = $this->entity_type_service->get($post_id);
 
-		$expected_meta_keys = ( null === $schema['custom_fields'] ) ?
-			array() :
-			array_keys( $schema['custom_fields'] );
+		$expected_meta_keys = (null === $schema['custom_fields']) ?
+			array() : array_keys($schema['custom_fields']);
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+		$intersection = array_intersect($expected_meta_keys, $available_meta_keys);
 		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( 'Schema.org metadata for this entity are not completed.', 'wordlift' ) );
+		(count($intersection) === count($expected_meta_keys)) ?
+			$score++ : array_push($warnings, __('Schema.org metadata for this entity are not completed.', 'wordlift'));
 
 		// Finally return score and warnings
 		return array(
 			'raw_score'           => $score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $score ),
+			'traffic_light_score' => $this->convert_raw_score_to_traffic_light($score),
+			'percentage_score'    => $this->convert_raw_score_to_percentage($score),
 			'warnings'            => $warnings,
 		);
 
@@ -320,13 +312,13 @@ 
 	 * @since 3.3.0
 	 *
 	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
+	private function convert_raw_score_to_traffic_light($score) {
 		// RATING_MAX : $score = 3 : x
 		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+		$rating = round(($score * 3) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP);
 
 		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating;
+		return (0 == $rating) ? 1 : $rating;
 
 	}
 
@@ -339,10 +331,10 @@ 
 	 * @since 3.3.0
 	 *
 	 */
-	public function convert_raw_score_to_percentage( $score ) {
+	public function convert_raw_score_to_percentage($score) {
 
 		// RATING_MAX : $score = 100 : x
-		return round( ( $score * 100 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+		return round(($score * 100) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP);
 	}
 
 
@@ -354,33 +346,33 @@ 
 	public function in_admin_header() {
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( false === function_exists( 'get_current_screen' ) ) {
+		if (false === function_exists('get_current_screen')) {
 			return;
 		}
 
 		$screen = get_current_screen();
 		// If there is any valid screen nothing to do
-		if ( null === $screen ) {
+		if (null === $screen) {
 			return;
 		}
 
 		// If you're not in the entity post edit page, return.
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->id ) {
+		if (Wordlift_Entity_Service::TYPE_NAME !== $screen->id) {
 			return;
 		}
 		// Retrieve the current global post
 		global $post;
 		// If it's not an entity, return.
-		if ( ! Wordlift_Entity_Service::get_instance()->is_entity( $post->ID ) ) {
+		if ( ! Wordlift_Entity_Service::get_instance()->is_entity($post->ID)) {
 			return;
 		}
 		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
+		$rating = $this->get_rating_for($post->ID, true);
 
 		// If there is at least 1 warning
-		if ( isset( $rating['warnings'] ) && 0 < count( $rating['warnings'] ) ) {
+		if (isset($rating['warnings']) && 0 < count($rating['warnings'])) {
 			// TODO - Pass Wordlift_Notice_Service trough the service constructor
-			$this->notice_service->add_suggestion( $rating['warnings'] );
+			$this->notice_service->add_suggestion($rating['warnings']);
 		}
 
 	}

src/admin/class-wordlift-admin-dashboard.php

Indentation +195 added lines, -195 removed lines

@@ -18,100 +18,100 @@ 
  */
 class Wordlift_Dashboard_Service {
 
-	/**
-	 * Transient Name
-	 *
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_NAME = 'wl_dashboard_stats';
-
-	/**
-	 * Transient Expiration (in seconds)
-	 *
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_EXPIRATION = 86400;
-
-	/**
-	 * 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;
-
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.4.0
-	 *
-	 */
-	protected function __construct() {
-
-		$this->rating_service = Wordlift_Rating_Service::get_instance();
-		$this->entity_service = Wordlift_Entity_Service::get_instance();
-
-	}
-
-	private static $instance;
-
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Return stats layout
-	 *
-	 * @return string Dashboard widget html markup
-	 * @since 3.4.0
-	 *
-	 */
-	public function dashboard_widget_callback( $post ) {
-
-		$enriched_posts_title   = __( 'enriched posts', 'wordlift' );
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'annotatedPostsPercentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )
-		);
-
-		$rating_title   = __( 'average entity rating', 'wordlift' );
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
-		);
-
-		$graph_title   = __( 'triples in your graph', 'wordlift' );
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
-		);
-
-		$triples_label = __( 'triples', 'wordlift' );
-
-		echo <<<EOF
+    /**
+     * Transient Name
+     *
+     * @since  3.4.0
+     */
+    const TRANSIENT_NAME = 'wl_dashboard_stats';
+
+    /**
+     * Transient Expiration (in seconds)
+     *
+     * @since  3.4.0
+     */
+    const TRANSIENT_EXPIRATION = 86400;
+
+    /**
+     * 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;
+
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.4.0
+     *
+     */
+    protected function __construct() {
+
+        $this->rating_service = Wordlift_Rating_Service::get_instance();
+        $this->entity_service = Wordlift_Entity_Service::get_instance();
+
+    }
+
+    private static $instance;
+
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Return stats layout
+     *
+     * @return string Dashboard widget html markup
+     * @since 3.4.0
+     *
+     */
+    public function dashboard_widget_callback( $post ) {
+
+        $enriched_posts_title   = __( 'enriched posts', 'wordlift' );
+        $enriched_posts_caption = sprintf( wp_kses(
+            __( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'annotatedPostsPercentage' ),
+            esc_url( admin_url( 'edit.php' ) ),
+            $this->render_stat_param( 'annotated_posts' ),
+            $this->render_stat_param( 'posts' )
+        );
+
+        $rating_title   = __( 'average entity rating', 'wordlift' );
+        $rating_caption = sprintf( wp_kses(
+            __( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'entities' ),
+            esc_url( admin_url( 'edit.php?post_type=entity' ) ),
+            $this->render_stat_param( 'rating' )
+        );
+
+        $graph_title   = __( 'triples in your graph', 'wordlift' );
+        $graph_caption = sprintf( wp_kses(
+            __( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'wikidata' ),
+            esc_url( 'https://www.wikidata.org/' )
+        );
+
+        $triples_label = __( 'triples', 'wordlift' );
+
+        echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
 		<div class="wl-stat-card">
 			<div class="wl-stat-graph-wrapper">
@@ -140,109 +140,109 @@ 
 	</div>
 EOF;
 
-	}
-
-	/**
-	 * Return stats
-	 *
-	 * @return string markup
-	 * @since 3.4.0
-	 *
-	 */
-	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
-			$this,
-			'dashboard_widget_callback',
-		) );
-	}
-
-	/**
-	 * Return stats
-	 * @uses  https://codex.wordpress.org/Function_Reference/set_transient
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string JSON obj with all available stats.
-	 */
-	public function ajax_get_stats() {
-
-		// If needed, the transient is force to reloaded.
-		if ( isset( $_GET['force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
-		}
-
-		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
-
-		if ( ! $stats ) {
-			// Calculate stats
-			$stats = array(
-				'entities'        => $this->entity_service->count(),
-				'posts'           => $this->count_posts(),
-				'annotated_posts' => $this->count_annotated_posts(),
-				'triples'         => $this->count_triples() ?: '-',
-				'rating'          => $this->average_entities_rating(),
-			);
-			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
-		}
-		// Return stats as json object
-		wl_core_send_json( $stats );
-	}
-
-	/**
-	 * Calculate total number of published posts
-	 * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of published posts.
-	 */
-	public function count_posts() {
-
-		return (int) wp_count_posts()->publish;
-	}
-
-	/**
-	 * Calculate total number of annotated published posts
-	 * @return int Total number of annotated published posts.
-	 * @since 3.4.0
-	 *
-	 */
-	public function count_annotated_posts() {
-
-		// Prepare interaction with db
-		global $wpdb;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-		// Calculate sql statement
-		$sql_statement = <<<EOF
+    }
+
+    /**
+     * Return stats
+     *
+     * @return string markup
+     * @since 3.4.0
+     *
+     */
+    public function add_dashboard_widgets() {
+        wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
+            $this,
+            'dashboard_widget_callback',
+        ) );
+    }
+
+    /**
+     * Return stats
+     * @uses  https://codex.wordpress.org/Function_Reference/set_transient
+     *
+     * @since 3.4.0
+     *
+     * @return string JSON obj with all available stats.
+     */
+    public function ajax_get_stats() {
+
+        // If needed, the transient is force to reloaded.
+        if ( isset( $_GET['force_reload'] ) ) {
+            delete_transient( self::TRANSIENT_NAME );
+        }
+
+        // Try to retrieve the transient
+        $stats = get_transient( self::TRANSIENT_NAME );
+
+        if ( ! $stats ) {
+            // Calculate stats
+            $stats = array(
+                'entities'        => $this->entity_service->count(),
+                'posts'           => $this->count_posts(),
+                'annotated_posts' => $this->count_annotated_posts(),
+                'triples'         => $this->count_triples() ?: '-',
+                'rating'          => $this->average_entities_rating(),
+            );
+            // Cache stats results trough transient
+            set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+        }
+        // Return stats as json object
+        wl_core_send_json( $stats );
+    }
+
+    /**
+     * Calculate total number of published posts
+     * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of published posts.
+     */
+    public function count_posts() {
+
+        return (int) wp_count_posts()->publish;
+    }
+
+    /**
+     * Calculate total number of annotated published posts
+     * @return int Total number of annotated published posts.
+     * @since 3.4.0
+     *
+     */
+    public function count_annotated_posts() {
+
+        // Prepare interaction with db
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+        // Calculate sql statement
+        $sql_statement = <<<EOF
     		SELECT COUNT(distinct(p.id)) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 EOF;
 
-		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement );
-
-	}
-
-	/**
-	 * Calculate the average entities rating.
-	 *
-	 * @return int Average entities rating.
-	 * @since 3.4.0
-	 *
-	 * @since 3.20.0 this method is public.
-	 */
-	public function average_entities_rating() {
-
-		// Prepare interaction with db
-		global $wpdb;
-		$query = $wpdb->prepare(
-			"SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
-			Wordlift_Rating_Service::RATING_RAW_SCORE_META_KEY
-		);
-
-		// Perform the query.
-		return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
-	}
+        // Perform the query
+        return (int) $wpdb->get_var( $sql_statement );
+
+    }
+
+    /**
+     * Calculate the average entities rating.
+     *
+     * @return int Average entities rating.
+     * @since 3.4.0
+     *
+     * @since 3.20.0 this method is public.
+     */
+    public function average_entities_rating() {
+
+        // Prepare interaction with db
+        global $wpdb;
+        $query = $wpdb->prepare(
+            "SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
+            Wordlift_Rating_Service::RATING_RAW_SCORE_META_KEY
+        );
+
+        // Perform the query.
+        return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -66,7 +66,7 @@ 
 	private static $instance;
 
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -80,36 +80,36 @@ 
 	 * @since 3.4.0
 	 *
 	 */
-	public function dashboard_widget_callback( $post ) {
-
-		$enriched_posts_title   = __( 'enriched posts', 'wordlift' );
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'annotatedPostsPercentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )
+	public function dashboard_widget_callback($post) {
+
+		$enriched_posts_title   = __('enriched posts', 'wordlift');
+		$enriched_posts_caption = sprintf(wp_kses(
+			__('%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('annotatedPostsPercentage'),
+			esc_url(admin_url('edit.php')),
+			$this->render_stat_param('annotated_posts'),
+			$this->render_stat_param('posts')
 		);
 
-		$rating_title   = __( 'average entity rating', 'wordlift' );
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
+		$rating_title   = __('average entity rating', 'wordlift');
+		$rating_caption = sprintf(wp_kses(
+			__('You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('entities'),
+			esc_url(admin_url('edit.php?post_type=entity')),
+			$this->render_stat_param('rating')
 		);
 
-		$graph_title   = __( 'triples in your graph', 'wordlift' );
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
+		$graph_title   = __('triples in your graph', 'wordlift');
+		$graph_caption = sprintf(wp_kses(
+			__('Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('wikidata'),
+			esc_url('https://www.wikidata.org/')
 		);
 
-		$triples_label = __( 'triples', 'wordlift' );
+		$triples_label = __('triples', 'wordlift');
 
 		echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
@@ -150,10 +150,10 @@ 
 	 *
 	 */
 	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
+		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array(
 			$this,
 			'dashboard_widget_callback',
-		) );
+		));
 	}
 
 	/**
@@ -167,14 +167,14 @@ 
 	public function ajax_get_stats() {
 
 		// If needed, the transient is force to reloaded.
-		if ( isset( $_GET['force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
+		if (isset($_GET['force_reload'])) {
+			delete_transient(self::TRANSIENT_NAME);
 		}
 
 		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
+		$stats = get_transient(self::TRANSIENT_NAME);
 
-		if ( ! $stats ) {
+		if ( ! $stats) {
 			// Calculate stats
 			$stats = array(
 				'entities'        => $this->entity_service->count(),
@@ -184,10 +184,10 @@ 
 				'rating'          => $this->average_entities_rating(),
 			);
 			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+			set_transient(self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION);
 		}
 		// Return stats as json object
-		wl_core_send_json( $stats );
+		wl_core_send_json($stats);
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 EOF;
 
 		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement );
+		return (int) $wpdb->get_var($sql_statement);
 
 	}
 
@@ -242,7 +242,7 @@ 
 		);
 
 		// Perform the query.
-		return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
+		return $this->rating_service->convert_raw_score_to_percentage($wpdb->get_var($query));
 	}
 
 }

src/admin/partials/wordlift-admin-dashboard-v2.php

Spacing +32 added lines, -32 removed lines

@@ -119,11 +119,11 @@ 
             white-space: nowrap;
         }
 
-        <?php $blu_dot_url = plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'images/blu-dot.gif'; ?>
+        <?php $blu_dot_url = plugin_dir_url(dirname(dirname(__FILE__))).'images/blu-dot.gif'; ?>
         #wl-dashboard-v2 .wl-dashboard__block--top-entities .wl-dashboard__block__body > div:nth-child(even) {
             flex: calc(100% - 120px);
             background-color: #ebf6ff;
-            background-image: url('<?php echo esc_url( $blu_dot_url ); ?>'), url('<?php echo esc_url( $blu_dot_url ); ?>'), url('<?php echo esc_url( $blu_dot_url ); ?>');
+            background-image: url('<?php echo esc_url($blu_dot_url); ?>'), url('<?php echo esc_url($blu_dot_url); ?>'), url('<?php echo esc_url($blu_dot_url); ?>');
             background-position: 25% center, 50%, 75%;
             background-size: 1px 4px;
             background-repeat: repeat-y;
@@ -220,55 +220,55 @@ 
 $country_code          = $configuration_service->get_country_code();
 
 $top_entities = $this->get_top_entities();
-if ( ! empty( $top_entities ) ) {
+if ( ! empty($top_entities)) {
 	?>
     <div class="wl-dashboard__block wl-dashboard__block--top-entities">
         <header>
             <span class="dashicons dashicons-editor-help"></span>
-            <h3><?php echo __( 'Top entities', 'wordlift' ); ?></h3>
-            <span class="wl-dashboard__legend wl-dashboard__legend--entities"><?php echo esc_html( _x( 'Links with entities', 'Dashboard', 'wordlift' ) ); ?></span>
-            <span class="wl-dashboard__legend wl-dashboard__legend--posts"><?php echo esc_html( _x( 'Post with entities', 'Dashboard', 'wordlift' ) ); ?></span>
+            <h3><?php echo __('Top entities', 'wordlift'); ?></h3>
+            <span class="wl-dashboard__legend wl-dashboard__legend--entities"><?php echo esc_html(_x('Links with entities', 'Dashboard', 'wordlift')); ?></span>
+            <span class="wl-dashboard__legend wl-dashboard__legend--posts"><?php echo esc_html(_x('Post with entities', 'Dashboard', 'wordlift')); ?></span>
         </header>
         <div class="wl-dashboard__block__body">
 			<?php
 			$max         = $top_entities[0]->total;
-			$unit        = intval( '1' . str_repeat( '0', strlen( $max ) - 1 ) );
-			$max_value   = ceil( (float) $max / $unit ) * $unit;
+			$unit        = intval('1'.str_repeat('0', strlen($max) - 1));
+			$max_value   = ceil((float) $max / $unit) * $unit;
 			$chunk_value = $max_value / 4;
 			?>
             <div></div>
             <div class="wl-dashboard__block__body__table-header">
-				<?php for ( $i = 0; $i <= $max_value; $i += $chunk_value ) { ?>
-                    <span><?php echo esc_html( $i ); ?></span><?php } ?>
+				<?php for ($i = 0; $i <= $max_value; $i += $chunk_value) { ?>
+                    <span><?php echo esc_html($i); ?></span><?php } ?>
             </div>
 			<?php
 			$i = 0;
-			foreach ( $this->get_top_entities() as $post ) {
-				$permalink    = get_permalink( $post->ID );
+			foreach ($this->get_top_entities() as $post) {
+				$permalink    = get_permalink($post->ID);
 				$title        = $post->post_title;
 				$entities_100 = 100 * $post->entities / $max_value;
 				$posts_100    = 100 * $post->posts / $max_value;
 
 				?>
-                <div><a href="<?php echo esc_attr( $permalink ); ?>"><?php echo esc_html( $title ); ?></a></div>
+                <div><a href="<?php echo esc_attr($permalink); ?>"><?php echo esc_html($title); ?></a></div>
                 <div>
                     <div class="wl-dashboard__bar wl-dashboard__bar--posts"
-                         style="width: <?php echo esc_attr( $posts_100 ); ?>%;">
+                         style="width: <?php echo esc_attr($posts_100); ?>%;">
                     </div>
                     <div class="wl-dashboard__bar wl-dashboard__bar--entities"
-                         style="width: <?php echo esc_attr( $entities_100 ); ?>%;">
+                         style="width: <?php echo esc_attr($entities_100); ?>%;">
                     </div>
                 </div>
 				<?php
-				if ( 4 === $i ++ ) {
+				if (4 === $i++) {
 					?>
                     <input id="wl-dashboard__show-more" type="checkbox">
                     <label for="wl-dashboard__show-more">
 						<span>
-							<?php echo esc_html( __( 'Show more', 'wordlift' ) ); ?>
+							<?php echo esc_html(__('Show more', 'wordlift')); ?>
 						</span>
                         <span>
-							<?php echo esc_html( __( 'Hide', 'wordlift' ) ); ?>
+							<?php echo esc_html(__('Hide', 'wordlift')); ?>
 						</span>
                     </label>
 					<?php
@@ -280,42 +280,42 @@ 
 	<?php
 }
 
-$not_enriched_url  = admin_url( 'edit.php?post_type=post&wl_enriched=no' );
+$not_enriched_url  = admin_url('edit.php?post_type=post&wl_enriched=no');
 $dashboard_service = Wordlift_Dashboard_Service::get_instance();
 ?>
     <div class="wl-dashboard__block wl-dashboard__block--enriched-posts">
         <header>
             <span class="dashicons dashicons-editor-help"></span>
-            <h3><?php echo esc_html__( 'Enriched posts', 'wordlift' ); ?></h3>
+            <h3><?php echo esc_html__('Enriched posts', 'wordlift'); ?></h3>
         </header>
         <div class="wl-dashboard__block__body">
-            <a href="<?php echo esc_url( $not_enriched_url ); ?>"><?php echo esc_html( $dashboard_service->count_annotated_posts() ); ?></a>
-            / <?php echo esc_html( $dashboard_service->count_posts() ); ?>
-            <a href="<?php echo esc_url( $not_enriched_url ); ?>"><?php echo esc_html( _x( 'Enrich', 'Dashboard', 'wordlift' ) ); ?></a>
+            <a href="<?php echo esc_url($not_enriched_url); ?>"><?php echo esc_html($dashboard_service->count_annotated_posts()); ?></a>
+            / <?php echo esc_html($dashboard_service->count_posts()); ?>
+            <a href="<?php echo esc_url($not_enriched_url); ?>"><?php echo esc_html(_x('Enrich', 'Dashboard', 'wordlift')); ?></a>
         </div>
     </div>
 
-<?php $vocabulary_url = admin_url( 'edit.php?post_type=entity' ); ?>
+<?php $vocabulary_url = admin_url('edit.php?post_type=entity'); ?>
     <div class="wl-dashboard__block wl-dashboard__block--created-entities">
         <header>
             <span class="dashicons dashicons-editor-help"></span>
-            <h3><?php esc_html_e( 'Created entities', 'wordlift' ); ?></h3>
+            <h3><?php esc_html_e('Created entities', 'wordlift'); ?></h3>
         </header>
         <div class="wl-dashboard__block__body">
-            <a href="<?php echo esc_url( $vocabulary_url ); ?>"><?php echo esc_html( $this->entity_service->count() ); ?></a>
-            <a href="<?php echo esc_url( $vocabulary_url ); ?>"><?php echo esc_html( _x( 'Vocabulary', 'Dashboard', 'wordlift' ) ); ?></a>
+            <a href="<?php echo esc_url($vocabulary_url); ?>"><?php echo esc_html($this->entity_service->count()); ?></a>
+            <a href="<?php echo esc_url($vocabulary_url); ?>"><?php echo esc_html(_x('Vocabulary', 'Dashboard', 'wordlift')); ?></a>
         </div>
     </div>
 
-<?php $boost_url = admin_url( 'admin.php?page=wl_search_rankings' ); ?>
+<?php $boost_url = admin_url('admin.php?page=wl_search_rankings'); ?>
     <div class="wl-dashboard__block wl-dashboard__block--average-entity-rating">
         <header>
             <span class="dashicons dashicons-editor-help"></span>
-            <h3><?php echo esc_html__( 'Average entity rating', 'wordlift' ); ?></h3>
+            <h3><?php echo esc_html__('Average entity rating', 'wordlift'); ?></h3>
         </header>
         <div class="wl-dashboard__block__body">
-            <a href="<?php echo esc_url( $boost_url ); ?>"><?php echo esc_html( $dashboard_service->average_entities_rating() ); ?></a>
-            <a href="<?php echo esc_url( $boost_url ); ?>"><?php echo esc_html( _x( 'Boost', 'Dashboard', 'wordlift' ) ); ?></a>
+            <a href="<?php echo esc_url($boost_url); ?>"><?php echo esc_html($dashboard_service->average_entities_rating()); ?></a>
+            <a href="<?php echo esc_url($boost_url); ?>"><?php echo esc_html(_x('Boost', 'Dashboard', 'wordlift')); ?></a>
         </div>
     </div>
 <?php
@@ -326,4 +326,4 @@ 
  * @author Naveen Muthusamy <naveen@wordlift.io>
  * Action name : wl_admin_dashboard_widgets
  */
-do_action( 'wl_admin_dashboard_widgets' );
+do_action('wl_admin_dashboard_widgets');

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

Indentation +55 added lines, -55 removed lines

@@ -14,77 +14,77 @@
  */
 class Wordlift_Tinymce_Adapter {
 
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since  3.12.0
-	 * @access private
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since  3.12.0
+     * @access private
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
 
-	/**
-	 * Wordlift_Tinymce_Adapter constructor.
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	public function __construct( $plugin ) {
+    /**
+     * Wordlift_Tinymce_Adapter constructor.
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    public function __construct( $plugin ) {
 
-		$this->plugin = $plugin;
+        $this->plugin = $plugin;
 
-	}
+    }
 
-	/**
-	 * Load the TinyMCE plugin. This method is called by the WP mce_external_plugins hook.
-	 *
-	 * @param array $plugins The existing plugins array.
-	 *
-	 * @return array The modified plugins array.
-	 * @since 3.12.0
-	 */
-	function mce_external_plugins( $plugins ) {
+    /**
+     * Load the TinyMCE plugin. This method is called by the WP mce_external_plugins hook.
+     *
+     * @param array $plugins The existing plugins array.
+     *
+     * @return array The modified plugins array.
+     * @since 3.12.0
+     */
+    function mce_external_plugins( $plugins ) {
 
-		/**
-		 * Bail out if you are on Media Library
-		 *
-		 * @since 3.27.1
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/1122
-		 */
-		if ( isset( get_current_screen()->base ) && get_current_screen()->base === 'upload' ) {
-			return $plugins;
-		}
+        /**
+         * Bail out if you are on Media Library
+         *
+         * @since 3.27.1
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/1122
+         */
+        if ( isset( get_current_screen()->base ) && get_current_screen()->base === 'upload' ) {
+            return $plugins;
+        }
 
-		/*
+        /*
 		 * 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 ) ) {
-			return $plugins;
-		}
+        if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+            return $plugins;
+        }
 
-		// Get WordLift's version as a cache killer.
-		$version = $this->plugin->get_version();
+        // Get WordLift's version as a cache killer.
+        $version = $this->plugin->get_version();
 
-		// User can edit?
-		$can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+        // User can edit?
+        $can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
 
-		// If user can't edit or rich editing isn't enabled, bail out.
-		if ( ! $can_edit || ! get_user_option( 'rich_editing' ) ) {
-			return $plugins;
-		}
+        // If user can't edit or rich editing isn't enabled, bail out.
+        if ( ! $can_edit || ! get_user_option( 'rich_editing' ) ) {
+            return $plugins;
+        }
 
-		// Add our own JavaScript file to TinyMCE's extensions.
-		// DO NOT use the minified version, it'll yield errors with AngularJS.
-		$plugins['wordlift']      = plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-reloaded.js?ver=' . $version;
-		$plugins['wl_shortcodes'] = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift_shortcode_tinymce_plugin.js?ver=' . $version;
-		$plugins['wl_tinymce']    = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/tinymce.js?ver=' . $version;
-		$plugins['wl_tinymce_2']  = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/tiny-mce.js?ver=' . $version;
+        // Add our own JavaScript file to TinyMCE's extensions.
+        // DO NOT use the minified version, it'll yield errors with AngularJS.
+        $plugins['wordlift']      = plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-reloaded.js?ver=' . $version;
+        $plugins['wl_shortcodes'] = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift_shortcode_tinymce_plugin.js?ver=' . $version;
+        $plugins['wl_tinymce']    = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/tinymce.js?ver=' . $version;
+        $plugins['wl_tinymce_2']  = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/tiny-mce.js?ver=' . $version;
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
 	 */
-	public function __construct( $plugin ) {
+	public function __construct($plugin) {
 
 		$this->plugin = $plugin;
 
@@ -42,7 +42,7 @@ 
 	 * @return array The modified plugins array.
 	 * @since 3.12.0
 	 */
-	function mce_external_plugins( $plugins ) {
+	function mce_external_plugins($plugins) {
 
 		/**
 		 * Bail out if you are on Media Library
@@ -51,7 +51,7 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1122
 		 */
-		if ( isset( get_current_screen()->base ) && get_current_screen()->base === 'upload' ) {
+		if (isset(get_current_screen()->base) && get_current_screen()->base === 'upload') {
 			return $plugins;
 		}
 
@@ -62,7 +62,7 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 		 */
-		if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+		if ( ! apply_filters('wl_can_see_classification_box', true)) {
 			return $plugins;
 		}
 
@@ -70,19 +70,19 @@ 
 		$version = $this->plugin->get_version();
 
 		// User can edit?
-		$can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+		$can_edit = current_user_can('edit_posts') || current_user_can('edit_pages');
 
 		// If user can't edit or rich editing isn't enabled, bail out.
-		if ( ! $can_edit || ! get_user_option( 'rich_editing' ) ) {
+		if ( ! $can_edit || ! get_user_option('rich_editing')) {
 			return $plugins;
 		}
 
 		// Add our own JavaScript file to TinyMCE's extensions.
 		// DO NOT use the minified version, it'll yield errors with AngularJS.
-		$plugins['wordlift']      = plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-reloaded.js?ver=' . $version;
-		$plugins['wl_shortcodes'] = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift_shortcode_tinymce_plugin.js?ver=' . $version;
-		$plugins['wl_tinymce']    = plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/tinymce.js?ver=' . $version;
-		$plugins['wl_tinymce_2']  = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/tiny-mce.js?ver=' . $version;
+		$plugins['wordlift']      = plugin_dir_url(dirname(__FILE__)).'js/wordlift-reloaded.js?ver='.$version;
+		$plugins['wl_shortcodes'] = plugin_dir_url(dirname(__FILE__)).'admin/js/wordlift_shortcode_tinymce_plugin.js?ver='.$version;
+		$plugins['wl_tinymce']    = plugin_dir_url(dirname(__FILE__)).'admin/js/1/tinymce.js?ver='.$version;
+		$plugins['wl_tinymce_2']  = plugin_dir_url(dirname(__FILE__)).'js/dist/tiny-mce.js?ver='.$version;
 
 		return $plugins;
 	}

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

Indentation +89 added lines, -89 removed lines

@@ -20,95 +20,95 @@
 
 class Term_Relation_Service extends Singleton implements Relation_Service_Interface {
 
-	/**
-	 * @var Type_Service
-	 */
-	private $term_entity_type_service;
-
-
-	public function __construct() {
-		parent::__construct();
-		$this->term_entity_type_service = Type_Service::get_instance();
-	}
-
-	/**
-	 * @return Term_Relation_Service
-	 */
-	public static function get_instance() {
-		return parent::get_instance();
-	}
-
-
-	public function get_references( $subject_id, $subject_type ) {
-		global $wpdb;
-		$table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$query      = $wpdb->prepare( "SELECT object_id FROM $table_name WHERE subject_id = %d AND object_type = %d AND subject_type = %d",
-			$subject_id,
-			Object_Type_Enum::TERM,
-			$subject_type
-		);
-
-		$term_ids = $wpdb->get_col( $query );
-
-		return array_map( function ( $term_id ) {
-			return new Term_Reference( $term_id );
-		}, $term_ids );
-	}
-
-
-	public function get_relations_from_content( $content, $subject_type, $local_entity_uris ) {
-		$entity_uris = Object_Relation_Service::get_entity_uris( $content );
-
-		return $this->get_relations_from_entity_uris( $subject_type, $entity_uris );
-	}
-
-	/**
-	 * @param $term_id int Term id.
-	 */
-	public function get_relation_type( $term_id ) {
-		$schema               = $this->term_entity_type_service->get_schema(
-			$term_id
-		);
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-
-		$entity_type = str_replace( 'wl-', '', $schema['css_class'] );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
-				return $cb['id'];
-			}
-		}
-
-		return WL_WHAT_RELATION;
-	}
-
-	/**
-	 * @param $subject_type
-	 * @param $entity_uris
-	 *
-	 * @return false[]|Types\Relation[]
-	 */
-	public function get_relations_from_entity_uris( $subject_type, $entity_uris ) {
-		$that = $this;
-
-		return array_map( function ( $entity_uri ) use ( $subject_type, $that ) {
-
-			try {
-				$content = Wordpress_Term_Content_Legacy_Service::get_instance()
-				                                                ->get_by_entity_id( $entity_uri );
-
-				if ( ! isset( $content ) ) {
-					return false;
-				}
-
-				$term_id = $content->get_bag()->term_id;
-
-				return new Term_Relation( $term_id, $that->get_relation_type( $term_id ), $subject_type );
-			} catch ( \Exception $e ) {
-				return false;
-			}
-
-		}, $entity_uris );
-	}
+    /**
+     * @var Type_Service
+     */
+    private $term_entity_type_service;
+
+
+    public function __construct() {
+        parent::__construct();
+        $this->term_entity_type_service = Type_Service::get_instance();
+    }
+
+    /**
+     * @return Term_Relation_Service
+     */
+    public static function get_instance() {
+        return parent::get_instance();
+    }
+
+
+    public function get_references( $subject_id, $subject_type ) {
+        global $wpdb;
+        $table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+        $query      = $wpdb->prepare( "SELECT object_id FROM $table_name WHERE subject_id = %d AND object_type = %d AND subject_type = %d",
+            $subject_id,
+            Object_Type_Enum::TERM,
+            $subject_type
+        );
+
+        $term_ids = $wpdb->get_col( $query );
+
+        return array_map( function ( $term_id ) {
+            return new Term_Reference( $term_id );
+        }, $term_ids );
+    }
+
+
+    public function get_relations_from_content( $content, $subject_type, $local_entity_uris ) {
+        $entity_uris = Object_Relation_Service::get_entity_uris( $content );
+
+        return $this->get_relations_from_entity_uris( $subject_type, $entity_uris );
+    }
+
+    /**
+     * @param $term_id int Term id.
+     */
+    public function get_relation_type( $term_id ) {
+        $schema               = $this->term_entity_type_service->get_schema(
+            $term_id
+        );
+        $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+
+        $entity_type = str_replace( 'wl-', '', $schema['css_class'] );
+        foreach ( $classification_boxes as $cb ) {
+            if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+                return $cb['id'];
+            }
+        }
+
+        return WL_WHAT_RELATION;
+    }
+
+    /**
+     * @param $subject_type
+     * @param $entity_uris
+     *
+     * @return false[]|Types\Relation[]
+     */
+    public function get_relations_from_entity_uris( $subject_type, $entity_uris ) {
+        $that = $this;
+
+        return array_map( function ( $entity_uri ) use ( $subject_type, $that ) {
+
+            try {
+                $content = Wordpress_Term_Content_Legacy_Service::get_instance()
+                                                                ->get_by_entity_id( $entity_uri );
+
+                if ( ! isset( $content ) ) {
+                    return false;
+                }
+
+                $term_id = $content->get_bag()->term_id;
+
+                return new Term_Relation( $term_id, $that->get_relation_type( $term_id ), $subject_type );
+            } catch ( \Exception $e ) {
+                return false;
+            }
+
+        }, $entity_uris );
+    }
 
 
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -39,41 +39,41 @@ 
 	}
 
 
-	public function get_references( $subject_id, $subject_type ) {
+	public function get_references($subject_id, $subject_type) {
 		global $wpdb;
-		$table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$query      = $wpdb->prepare( "SELECT object_id FROM $table_name WHERE subject_id = %d AND object_type = %d AND subject_type = %d",
+		$table_name = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
+		$query      = $wpdb->prepare("SELECT object_id FROM $table_name WHERE subject_id = %d AND object_type = %d AND subject_type = %d",
 			$subject_id,
 			Object_Type_Enum::TERM,
 			$subject_type
 		);
 
-		$term_ids = $wpdb->get_col( $query );
+		$term_ids = $wpdb->get_col($query);
 
-		return array_map( function ( $term_id ) {
-			return new Term_Reference( $term_id );
-		}, $term_ids );
+		return array_map(function($term_id) {
+			return new Term_Reference($term_id);
+		}, $term_ids);
 	}
 
 
-	public function get_relations_from_content( $content, $subject_type, $local_entity_uris ) {
-		$entity_uris = Object_Relation_Service::get_entity_uris( $content );
+	public function get_relations_from_content($content, $subject_type, $local_entity_uris) {
+		$entity_uris = Object_Relation_Service::get_entity_uris($content);
 
-		return $this->get_relations_from_entity_uris( $subject_type, $entity_uris );
+		return $this->get_relations_from_entity_uris($subject_type, $entity_uris);
 	}
 
 	/**
 	 * @param $term_id int Term id.
 	 */
-	public function get_relation_type( $term_id ) {
+	public function get_relation_type($term_id) {
 		$schema               = $this->term_entity_type_service->get_schema(
 			$term_id
 		);
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+		$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
 
-		$entity_type = str_replace( 'wl-', '', $schema['css_class'] );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+		$entity_type = str_replace('wl-', '', $schema['css_class']);
+		foreach ($classification_boxes as $cb) {
+			if (in_array($entity_type, $cb['registeredTypes'])) {
 				return $cb['id'];
 			}
 		}
@@ -87,27 +87,27 @@ 
 	 *
 	 * @return false[]|Types\Relation[]
 	 */
-	public function get_relations_from_entity_uris( $subject_type, $entity_uris ) {
+	public function get_relations_from_entity_uris($subject_type, $entity_uris) {
 		$that = $this;
 
-		return array_map( function ( $entity_uri ) use ( $subject_type, $that ) {
+		return array_map(function($entity_uri) use ($subject_type, $that) {
 
 			try {
 				$content = Wordpress_Term_Content_Legacy_Service::get_instance()
-				                                                ->get_by_entity_id( $entity_uri );
+				                                                ->get_by_entity_id($entity_uri);
 
-				if ( ! isset( $content ) ) {
+				if ( ! isset($content)) {
 					return false;
 				}
 
 				$term_id = $content->get_bag()->term_id;
 
-				return new Term_Relation( $term_id, $that->get_relation_type( $term_id ), $subject_type );
-			} catch ( \Exception $e ) {
+				return new Term_Relation($term_id, $that->get_relation_type($term_id), $subject_type);
+			} catch (\Exception $e) {
 				return false;
 			}
 
-		}, $entity_uris );
+		}, $entity_uris);
 	}
 
 

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

Indentation +364 added lines, -364 removed lines

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

Spacing +77 added lines, -77 removed lines

@@ -31,14 +31,14 @@ 
 	public function __construct() {
 
 		// Bail out if block editor's functions aren't available.
-		if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
+		if ( ! function_exists('register_block_type') || ! function_exists('parse_blocks')) {
 			return;
 		}
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'init', array( $this, 'init' ) );
-		add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
+		add_action('init', array($this, 'init'));
+		add_filter('wp_insert_post_data', array($this, 'wp_insert_post_data'), 10, 2);
 
 	}
 
@@ -48,12 +48,12 @@ 
 	 */
 	public function init() {
 
-		register_block_type( 'wordlift/classification', array(
+		register_block_type('wordlift/classification', array(
 			'editor_script' => 'wl-block-editor',
 			'attributes'    => array(
-				'entities' => array( 'type' => 'array' ),
+				'entities' => array('type' => 'array'),
 			),
-		) );
+		));
 
 	}
 
@@ -87,45 +87,45 @@ 
 	 *
 	 * @return array The data array.
 	 */
-	public function wp_insert_post_data( $data, $postarr ) {
+	public function wp_insert_post_data($data, $postarr) {
 
 		$post_status = $data['post_status'];
-		if ( 'auto-draft' === $post_status || 'inherit' === $post_status ) {
+		if ('auto-draft' === $post_status || 'inherit' === $post_status) {
 			return $data;
 		}
 
-		$this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
-		                   . var_export( $data, true ) );
+		$this->log->trace("The following data has been received by `wp_insert_post_data`:\n"
+		                   . var_export($data, true));
 
 
 		try {
-			$entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
+			$entities = $this->parse_content(wp_unslash($data['post_content']));
 
-			foreach ( $entities as $entity ) {
+			foreach ($entities as $entity) {
 
-				$entity_id = array_key_exists( 'id', $entity ) ? $entity['id'] : '';
+				$entity_id = array_key_exists('id', $entity) ? $entity['id'] : '';
 
-				if ( ! $this->entity_id_valid( $entity_id ) ) {
+				if ( ! $this->entity_id_valid($entity_id)) {
 					continue;
 				}
 
-				$entity_uris = $this->get_entity_uris( $entity );
+				$entity_uris = $this->get_entity_uris($entity);
 
-				if ( $this->get_first_matching_entity_by_uri( $entity_uris ) === null &&
-				     Post_Entities_Validator::is_local_entity_uri_exist( Wordlift_Entity_Uri_Service::get_instance(), $entity_uris ) ) {
+				if ($this->get_first_matching_entity_by_uri($entity_uris) === null &&
+				     Post_Entities_Validator::is_local_entity_uri_exist(Wordlift_Entity_Uri_Service::get_instance(), $entity_uris)) {
 					// Skip the entity
 					continue;
 				}
 
 				// If 'entity auto publish' is false, we set the status to `draft` by default.
-				$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
+				$post_status = apply_filters('wl_feature__enable__entity-auto-publish', true)
 					? $data['post_status'] : 'draft';
-				$this->create_or_update_entity( $entity, $post_status );
+				$this->create_or_update_entity($entity, $post_status);
 
 			}
 
-		} catch ( \Exception $e ) {
-			$this->log->error( $e->getMessage() );
+		} catch (\Exception $e) {
+			$this->log->error($e->getMessage());
 		}
 
 
@@ -140,27 +140,27 @@ 
 	 * @return array An array of entities' structures.
 	 * @throws \Exception
 	 */
-	private function parse_content( $post_content ) {
+	private function parse_content($post_content) {
 
-		$all_blocks = parse_blocks( $post_content );
-		$this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
-		                   . var_export( $all_blocks, true ) );
+		$all_blocks = parse_blocks($post_content);
+		$this->log->trace("The following blocks have been parsed while in `wp_insert_post`:\n"
+		                   . var_export($all_blocks, true));
 
-		$blocks = array_filter( $all_blocks, function ( $item ) {
-			return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
+		$blocks = array_filter($all_blocks, function($item) {
+			return ! empty($item['blockName']) && 'wordlift/classification' === $item['blockName'];
 		} );
 
 		// Bail out if the blocks' array is empty.
-		if ( empty( $blocks ) ) {
+		if (empty($blocks)) {
 			return array();
 		}
 
-		$block = current( $blocks );
-		$this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
-		                   . var_export( $block, true ) );
+		$block = current($blocks);
+		$this->log->trace("The following block has been found while in `wp_insert_post`:\n"
+		                   . var_export($block, true));
 
 		// Bail out if the entities array is empty.
-		if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
+		if (empty($block['attrs']) && empty($block['attrs']['entities'])) {
 			return array();
 		}
 
@@ -205,14 +205,14 @@ 
 	 *
 	 * @return array An array of labels.
 	 */
-	public function get_labels( $entity ) {
+	public function get_labels($entity) {
 
-		$args = wp_parse_args( $entity, array(
+		$args = wp_parse_args($entity, array(
 			'label'       => array(),
 			'synonyms'    => array(),
 			'annotations' => array(),
 			'occurrences' => array(),
-		) );
+		));
 
 		// We gather all the labels, occurrences texts and synonyms into one array.
 		$initial = array_merge(
@@ -222,20 +222,20 @@ 
 
 		$annotations = $args['annotations'];
 
-		return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
+		return array_reduce($args['occurrences'], function($carry, $item) use ($annotations) {
 
 			// Bail out if occurrences->$item->text isn't set or its contents are already
 			// in `$carry`.
-			if ( ! isset( $annotations[ $item ]['text'] )
-			     || in_array( $annotations[ $item ]['text'], $carry ) ) {
+			if ( ! isset($annotations[$item]['text'])
+			     || in_array($annotations[$item]['text'], $carry)) {
 				return $carry;
 			}
 
 			// Push the label.
-			$carry[] = $annotations[ $item ]['text'];
+			$carry[] = $annotations[$item]['text'];
 
 			return $carry;
-		}, $initial );
+		}, $initial);
 	}
 
 	/**
@@ -259,53 +259,53 @@ 
 	 * @return int|\WP_Error
 	 * @throws \Exception
 	 */
-	private function create_or_update_entity( $entity, $post_status = 'draft' ) {
+	private function create_or_update_entity($entity, $post_status = 'draft') {
 
 		// Get only valid IDs.
-		$uris = $this->get_entity_uris( $entity );
+		$uris = $this->get_entity_uris($entity);
 
-		$post = $this->get_first_matching_entity_by_uri( $uris );
+		$post = $this->get_first_matching_entity_by_uri($uris);
 
-		$this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
-		                   . var_export( $uris, true ) );
+		$this->log->trace('Entity'.(empty($post) ? ' not' : '')." found with the following URIs:\n"
+		                   . var_export($uris, true));
 
 		// Get the labels.
-		$labels = $this->get_labels( $entity );
+		$labels = $this->get_labels($entity);
 
-		if ( empty( $post ) ) {
-			$entity_description = array_key_exists( 'description', $entity ) ? $entity['description'] : '';
+		if (empty($post)) {
+			$entity_description = array_key_exists('description', $entity) ? $entity['description'] : '';
 			// Create the entity if it doesn't exist.
-			$post_id = Entity_Store::get_instance()->create( array(
+			$post_id = Entity_Store::get_instance()->create(array(
 				'labels'      => $labels,
 				'description' => $entity_description,
 				'same_as'     => $uris,
-			), $post_status );
+			), $post_status);
 
 			// Return the WP_Error if we got one.
-			if ( is_wp_error( $post_id ) ) {
+			if (is_wp_error($post_id)) {
 				return $post_id;
 			}
 
 			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			if (isset($entity['mainType'])) {
+				wp_set_object_terms($post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 			}
 
-			if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
+			if (isset($entity['properties']) && isset($entity['properties']['latitude']) && isset($entity['properties']['longitude'])) {
+				add_post_meta($post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude']);
+				add_post_meta($post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude']);
 			}
 		} else {
 			// Update the entity otherwise.
-			$post_id = Entity_Store::get_instance()->update( array(
+			$post_id = Entity_Store::get_instance()->update(array(
 				'ID'      => $post->ID,
 				'labels'  => $labels,
 				'same_as' => $uris,
-			) );
+			));
 
 			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			if (isset($entity['mainType'])) {
+				wp_add_object_terms($post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 			}
 
 			// see https://github.com/insideout10/wordlift-plugin/issues/1304
@@ -313,11 +313,11 @@ 
 			// created using rest endpoint on block editor, so that they get published
 			// when the post is published.
 			// Once the entity is published dont update the post status.
-			if ( $post->post_status !== 'publish' ) {
-				wp_update_post( array(
+			if ($post->post_status !== 'publish') {
+				wp_update_post(array(
 					'ID'          => $post->ID,
 					'post_status' => $post_status
-				) );
+				));
 			}
 		}
 
@@ -333,19 +333,19 @@ 
 	 *
 	 * @return \WP_Post|null The entity WP_Post if found or null if not found.
 	 */
-	private function get_first_matching_entity_by_uri( $uris ) {
+	private function get_first_matching_entity_by_uri($uris) {
 
-		foreach ( $uris as $uri ) {
+		foreach ($uris as $uri) {
 
-			$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
+			$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as($uri);
 
-			if ( ! $content ) {
+			if ( ! $content) {
 				continue;
 			}
 
 			$existing_entity = $content->get_bag();
 
-			if ( is_a( $existing_entity, 'WP_Post' ) ) {
+			if (is_a($existing_entity, 'WP_Post')) {
 				return $existing_entity;
 			}
 		}
@@ -358,11 +358,11 @@ 
 	 *
 	 * @return array
 	 */
-	private function filter_valid_entity_ids( $entity ) {
+	private function filter_valid_entity_ids($entity) {
 		$id = $entity['id'];
 
-		return array_filter( (array) $id, function ( $id ) {
-			return preg_match( '|^https?://|', $id );
+		return array_filter((array) $id, function($id) {
+			return preg_match('|^https?://|', $id);
 		} );
 	}
 
@@ -371,9 +371,9 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_entity_uris( $entity ) {
-		$ids     = $this->filter_valid_entity_ids( $entity );
-		$same_as = array_key_exists( 'sameAs', $entity ) ? $entity['sameAs'] : array();
+	private function get_entity_uris($entity) {
+		$ids     = $this->filter_valid_entity_ids($entity);
+		$same_as = array_key_exists('sameAs', $entity) ? $entity['sameAs'] : array();
 
 		return array_merge(
 			(array) $ids,
@@ -381,8 +381,8 @@ 
 		);
 	}
 
-	private function entity_id_valid( $entity_id ) {
-		return preg_match( '#^https?://#i', $entity_id ) === 1;
+	private function entity_id_valid($entity_id) {
+		return preg_match('#^https?://#i', $entity_id) === 1;
 	}
 
 }

src/wordlift/vocabulary/class-analysis-service.php

Indentation +142 added lines, -142 removed lines

@@ -13,184 +13,184 @@
  */
 class Analysis_Service {
 
-	/**
-	 * @var Default_Api_Service
-	 */
-	private $api_service;
-	/**
-	 * @var Cache
-	 */
-	private $cache_service;
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
+    /**
+     * @var Default_Api_Service
+     */
+    private $api_service;
+    /**
+     * @var Cache
+     */
+    private $cache_service;
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
 
 
-	/**
-	 * Tag_Rest_Endpoint constructor.
-	 *
-	 * @param Default_Api_Service $api_service
-	 * @param Cache $cache_service
-	 */
-	public function __construct( $api_service, $cache_service ) {
+    /**
+     * Tag_Rest_Endpoint constructor.
+     *
+     * @param Default_Api_Service $api_service
+     * @param Cache $cache_service
+     */
+    public function __construct( $api_service, $cache_service ) {
 
-		$this->api_service = $api_service;
+        $this->api_service = $api_service;
 
-		$this->cache_service = $cache_service;
+        $this->cache_service = $cache_service;
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
 
-	}
+    }
 
 
-	/**
-	 * Check if entities are in cache, if not return the results from
-	 * cache service.
-	 *
-	 * @param $tag \WP_Term
-	 */
-	public function get_entities( $tag ) {
+    /**
+     * Check if entities are in cache, if not return the results from
+     * cache service.
+     *
+     * @param $tag \WP_Term
+     */
+    public function get_entities( $tag ) {
 
-		$cache_key    = $tag->term_id;
-		$cache_result = $this->cache_service->get( $cache_key );
-		if ( $cache_result !== false ) {
-			return $cache_result;
-		}
+        $cache_key    = $tag->term_id;
+        $cache_result = $this->cache_service->get( $cache_key );
+        if ( $cache_result !== false ) {
+            return $cache_result;
+        }
 
-		// send the request.
-		$tag_name = $tag->name;
+        // send the request.
+        $tag_name = $tag->name;
 
-		$entities = $this->get_entities_by_search_query( $tag_name );
+        $entities = $this->get_entities_by_search_query( $tag_name );
 
-		if ( ! $entities ) {
-			return false;
-		}
-
-		$this->cache_service->put( $cache_key, $entities );
-
-		return $entities;
-
-	}
-
-
-	/**
-	 * @param $entity_url string
-	 * Formats the entity url from https://foo.com/some/path to
-	 * https/foo.com/some/path
-	 *
-	 * @return bool|string
-	 */
-	public static function format_entity_url( $entity_url ) {
-		$result = parse_url( $entity_url );
-		if ( ! $result ) {
-			return false;
-		}
-		if ( ! array_key_exists( 'scheme', $result )
-		     || ! array_key_exists( 'host', $result )
-		     || ! array_key_exists( 'path', $result ) ) {
-			return false;
-		}
+        if ( ! $entities ) {
+            return false;
+        }
+
+        $this->cache_service->put( $cache_key, $entities );
+
+        return $entities;
+
+    }
+
+
+    /**
+     * @param $entity_url string
+     * Formats the entity url from https://foo.com/some/path to
+     * https/foo.com/some/path
+     *
+     * @return bool|string
+     */
+    public static function format_entity_url( $entity_url ) {
+        $result = parse_url( $entity_url );
+        if ( ! $result ) {
+            return false;
+        }
+        if ( ! array_key_exists( 'scheme', $result )
+             || ! array_key_exists( 'host', $result )
+             || ! array_key_exists( 'path', $result ) ) {
+            return false;
+        }
 
-		return $result['scheme'] . "/" . $result['host'] . $result['path'];
-	}
+        return $result['scheme'] . "/" . $result['host'] . $result['path'];
+    }
 
-	private function get_meta( $entity_url ) {
+    private function get_meta( $entity_url ) {
 
 
-		$cache_results = $this->cache_service->get( $entity_url );
+        $cache_results = $this->cache_service->get( $entity_url );
 
-		if ( $cache_results !== false ) {
-			return $cache_results;
-		}
+        if ( $cache_results !== false ) {
+            return $cache_results;
+        }
 
-		$formatted_url = self::format_entity_url( $entity_url );
+        $formatted_url = self::format_entity_url( $entity_url );
 
-		if ( ! $formatted_url ) {
-			return array();
-		}
+        if ( ! $formatted_url ) {
+            return array();
+        }
 
-		$meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
+        $meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
 
-		$response = wp_remote_get( $meta_url );
+        $response = wp_remote_get( $meta_url );
 
-		if ( is_wp_error( $response )
-		     || ! isset( $response['response']['code'] )
-		     || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
+        if ( is_wp_error( $response )
+             || ! isset( $response['response']['code'] )
+             || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
 
-		$this->log->debug( "Requesting entity data for url :" . $meta_url );
-		$this->log->debug( "Got entity meta data as : " );
-		$this->log->debug( var_export( $response, true ) );
-		if ( ! is_wp_error( $response ) ) {
-			$meta = json_decode( wp_remote_retrieve_body( $response ), true );
-			$this->log->debug( "Saved entity data to meta :" );
-			$this->log->debug( var_export( $meta, true ) );
-			$this->cache_service->put( $entity_url, $meta );
+        $this->log->debug( "Requesting entity data for url :" . $meta_url );
+        $this->log->debug( "Got entity meta data as : " );
+        $this->log->debug( var_export( $response, true ) );
+        if ( ! is_wp_error( $response ) ) {
+            $meta = json_decode( wp_remote_retrieve_body( $response ), true );
+            $this->log->debug( "Saved entity data to meta :" );
+            $this->log->debug( var_export( $meta, true ) );
+            $this->cache_service->put( $entity_url, $meta );
 
-			return $meta;
-		}
+            return $meta;
+        }
 
 
-		return array();
+        return array();
 
-	}
+    }
 
-	private function get_meta_for_entities( $entities ) {
+    private function get_meta_for_entities( $entities ) {
 
-		$filtered_entities = array();
-		foreach ( $entities as $entity ) {
-			$entity['meta'] = array();
-			$meta           = $this->get_meta( $entity['entityId'] );
-			if ( $meta ) {
-				$meta                = Default_Entity_List::compact_jsonld( $meta );
-				$entity['meta']      = $meta;
-				$filtered_entities[] = $entity;
-			}
-		}
-		$this->log->debug( "Returning filtered entities as" );
-		$this->log->debug( var_export( $filtered_entities, true ) );
+        $filtered_entities = array();
+        foreach ( $entities as $entity ) {
+            $entity['meta'] = array();
+            $meta           = $this->get_meta( $entity['entityId'] );
+            if ( $meta ) {
+                $meta                = Default_Entity_List::compact_jsonld( $meta );
+                $entity['meta']      = $meta;
+                $filtered_entities[] = $entity;
+            }
+        }
+        $this->log->debug( "Returning filtered entities as" );
+        $this->log->debug( var_export( $filtered_entities, true ) );
 
-		return $filtered_entities;
+        return $filtered_entities;
 
-	}
+    }
 
-	/**
-	 * @param $tag_name
-	 *
-	 * @return array
-	 */
-	public function get_entities_by_search_query( $tag_name ) {
-		$response = $this->api_service->request(
-			'POST',
-			"/analysis/single",
-			array( 'Content-Type' => 'application/json' ),
-			wp_json_encode( array(
-				"content"         => $tag_name,
-				"contentType"     => "text/plain",
-				"version"         => "1.0.0",
-				"contentLanguage" => "en",
-				"scope"           => "all",
-			) )
-		);
-
-
-		if ( ! $response->is_success() ) {
-			return false;
-		}
-
-		$response = json_decode( $response->get_body(), true );
+    /**
+     * @param $tag_name
+     *
+     * @return array
+     */
+    public function get_entities_by_search_query( $tag_name ) {
+        $response = $this->api_service->request(
+            'POST',
+            "/analysis/single",
+            array( 'Content-Type' => 'application/json' ),
+            wp_json_encode( array(
+                "content"         => $tag_name,
+                "contentType"     => "text/plain",
+                "version"         => "1.0.0",
+                "contentLanguage" => "en",
+                "scope"           => "all",
+            ) )
+        );
+
+
+        if ( ! $response->is_success() ) {
+            return false;
+        }
+
+        $response = json_decode( $response->get_body(), true );
 
-		if ( ! array_key_exists( 'entities', $response ) ) {
-			return false;
-		}
+        if ( ! array_key_exists( 'entities', $response ) ) {
+            return false;
+        }
 
 
-		$entities = $this->get_meta_for_entities( $response['entities'] );
+        $entities = $this->get_meta_for_entities( $response['entities'] );
 
-		return $entities;
-	}
+        return $entities;
+    }
 
 
 }

Spacing +48 added lines, -48 removed lines

@@ -33,13 +33,13 @@ 
 	 * @param Default_Api_Service $api_service
 	 * @param Cache $cache_service
 	 */
-	public function __construct( $api_service, $cache_service ) {
+	public function __construct($api_service, $cache_service) {
 
 		$this->api_service = $api_service;
 
 		$this->cache_service = $cache_service;
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 	}
 
@@ -50,24 +50,24 @@ 
 	 *
 	 * @param $tag \WP_Term
 	 */
-	public function get_entities( $tag ) {
+	public function get_entities($tag) {
 
 		$cache_key    = $tag->term_id;
-		$cache_result = $this->cache_service->get( $cache_key );
-		if ( $cache_result !== false ) {
+		$cache_result = $this->cache_service->get($cache_key);
+		if ($cache_result !== false) {
 			return $cache_result;
 		}
 
 		// send the request.
 		$tag_name = $tag->name;
 
-		$entities = $this->get_entities_by_search_query( $tag_name );
+		$entities = $this->get_entities_by_search_query($tag_name);
 
-		if ( ! $entities ) {
+		if ( ! $entities) {
 			return false;
 		}
 
-		$this->cache_service->put( $cache_key, $entities );
+		$this->cache_service->put($cache_key, $entities);
 
 		return $entities;
 
@@ -81,53 +81,53 @@ 
 	 *
 	 * @return bool|string
 	 */
-	public static function format_entity_url( $entity_url ) {
-		$result = parse_url( $entity_url );
-		if ( ! $result ) {
+	public static function format_entity_url($entity_url) {
+		$result = parse_url($entity_url);
+		if ( ! $result) {
 			return false;
 		}
-		if ( ! array_key_exists( 'scheme', $result )
-		     || ! array_key_exists( 'host', $result )
-		     || ! array_key_exists( 'path', $result ) ) {
+		if ( ! array_key_exists('scheme', $result)
+		     || ! array_key_exists('host', $result)
+		     || ! array_key_exists('path', $result)) {
 			return false;
 		}
 
-		return $result['scheme'] . "/" . $result['host'] . $result['path'];
+		return $result['scheme']."/".$result['host'].$result['path'];
 	}
 
-	private function get_meta( $entity_url ) {
+	private function get_meta($entity_url) {
 
 
-		$cache_results = $this->cache_service->get( $entity_url );
+		$cache_results = $this->cache_service->get($entity_url);
 
-		if ( $cache_results !== false ) {
+		if ($cache_results !== false) {
 			return $cache_results;
 		}
 
-		$formatted_url = self::format_entity_url( $entity_url );
+		$formatted_url = self::format_entity_url($entity_url);
 
-		if ( ! $formatted_url ) {
+		if ( ! $formatted_url) {
 			return array();
 		}
 
-		$meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
+		$meta_url = 'https://api.wordlift.io/id/'.$formatted_url;
 
-		$response = wp_remote_get( $meta_url );
+		$response = wp_remote_get($meta_url);
 
-		if ( is_wp_error( $response )
-		     || ! isset( $response['response']['code'] )
-		     || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response)
+		     || ! isset($response['response']['code'])
+		     || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
 
-		$this->log->debug( "Requesting entity data for url :" . $meta_url );
-		$this->log->debug( "Got entity meta data as : " );
-		$this->log->debug( var_export( $response, true ) );
-		if ( ! is_wp_error( $response ) ) {
-			$meta = json_decode( wp_remote_retrieve_body( $response ), true );
-			$this->log->debug( "Saved entity data to meta :" );
-			$this->log->debug( var_export( $meta, true ) );
-			$this->cache_service->put( $entity_url, $meta );
+		$this->log->debug("Requesting entity data for url :".$meta_url);
+		$this->log->debug("Got entity meta data as : ");
+		$this->log->debug(var_export($response, true));
+		if ( ! is_wp_error($response)) {
+			$meta = json_decode(wp_remote_retrieve_body($response), true);
+			$this->log->debug("Saved entity data to meta :");
+			$this->log->debug(var_export($meta, true));
+			$this->cache_service->put($entity_url, $meta);
 
 			return $meta;
 		}
@@ -137,20 +137,20 @@ 
 
 	}
 
-	private function get_meta_for_entities( $entities ) {
+	private function get_meta_for_entities($entities) {
 
 		$filtered_entities = array();
-		foreach ( $entities as $entity ) {
+		foreach ($entities as $entity) {
 			$entity['meta'] = array();
-			$meta           = $this->get_meta( $entity['entityId'] );
-			if ( $meta ) {
-				$meta                = Default_Entity_List::compact_jsonld( $meta );
+			$meta           = $this->get_meta($entity['entityId']);
+			if ($meta) {
+				$meta                = Default_Entity_List::compact_jsonld($meta);
 				$entity['meta']      = $meta;
 				$filtered_entities[] = $entity;
 			}
 		}
-		$this->log->debug( "Returning filtered entities as" );
-		$this->log->debug( var_export( $filtered_entities, true ) );
+		$this->log->debug("Returning filtered entities as");
+		$this->log->debug(var_export($filtered_entities, true));
 
 		return $filtered_entities;
 
@@ -161,33 +161,33 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_entities_by_search_query( $tag_name ) {
+	public function get_entities_by_search_query($tag_name) {
 		$response = $this->api_service->request(
 			'POST',
 			"/analysis/single",
-			array( 'Content-Type' => 'application/json' ),
-			wp_json_encode( array(
+			array('Content-Type' => 'application/json'),
+			wp_json_encode(array(
 				"content"         => $tag_name,
 				"contentType"     => "text/plain",
 				"version"         => "1.0.0",
 				"contentLanguage" => "en",
 				"scope"           => "all",
-			) )
+			))
 		);
 
 
-		if ( ! $response->is_success() ) {
+		if ( ! $response->is_success()) {
 			return false;
 		}
 
-		$response = json_decode( $response->get_body(), true );
+		$response = json_decode($response->get_body(), true);
 
-		if ( ! array_key_exists( 'entities', $response ) ) {
+		if ( ! array_key_exists('entities', $response)) {
 			return false;
 		}
 
 
-		$entities = $this->get_meta_for_entities( $response['entities'] );
+		$entities = $this->get_meta_for_entities($response['entities']);
 
 		return $entities;
 	}