insideout10 / wordlift-plugin

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

Indentation +174 added lines, -174 removed lines

@@ -16,189 +16,189 @@
  */
 class Wordlift_Api_Service {
 
-	/**
-	 * The {@link Wordlift_Api_Service} singleton instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Api_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Api_Service} instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 */
-	public function __construct() {
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the {@link Wordlift_Api_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Api_Service The {@link Wordlift_Api_Service} singleton instance.
-	 * @since 3.20.0
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Perform a `GET` request towards the requested path.
-	 *
-	 * @param string $path The relative path.
-	 *
-	 * @return array|WP_Error
-	 * @since 3.20.0
-	 *
-	 */
-	public function get( $path ) {
-
-		// Prepare the target URL.
-		$url = Wordlift_Configuration_Service::get_instance()->get_api_url() . $path;
-
-		// Get the response value.
-		$response = wp_remote_get( $url, array(
-			'user-agent' => User_Agent::get_user_agent(),
-			'headers'    => array(
-				'X-Authorization' => Wordlift_Configuration_Service::get_instance()->get_key(),
-			),
-			/*
+    /**
+     * The {@link Wordlift_Api_Service} singleton instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Api_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Api_Service} instance.
+     *
+     * @since 3.20.0
+     *
+     */
+    public function __construct() {
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the {@link Wordlift_Api_Service} singleton instance.
+     *
+     * @return \Wordlift_Api_Service The {@link Wordlift_Api_Service} singleton instance.
+     * @since 3.20.0
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Perform a `GET` request towards the requested path.
+     *
+     * @param string $path The relative path.
+     *
+     * @return array|WP_Error
+     * @since 3.20.0
+     *
+     */
+    public function get( $path ) {
+
+        // Prepare the target URL.
+        $url = Wordlift_Configuration_Service::get_instance()->get_api_url() . $path;
+
+        // Get the response value.
+        $response = wp_remote_get( $url, array(
+            'user-agent' => User_Agent::get_user_agent(),
+            'headers'    => array(
+                'X-Authorization' => Wordlift_Configuration_Service::get_instance()->get_key(),
+            ),
+            /*
 			 * Increase the timeout from the default of 5 to 30 secs.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/906
 			 *
 			 * @since 3.20.1
 			 */
-			'timeout'    => 30,
-		) );
-
-		return self::get_message_or_error( $response );
-	}
-
-	/**
-	 * Perform a `POST` request towards the requested path.
-	 *
-	 * @param string $path The relative path.
-	 * @param array|object $body The request body (will be serialized to JSON).
-	 *
-	 * @return array|WP_Error
-	 * @since 3.20.0
-	 *
-	 */
-	public function post( $path, $body ) {
-
-		return $this->post_custom_content_type(
-			$path, json_encode( $body ), 'application/json; ' . get_bloginfo( 'charset' )
-		);
-	}
-
-	public function post_custom_content_type( $path, $body, $content_type ) {
-
-		// Prepare the target URL.
-		$url = apply_filters( 'wl_api_service_api_url_path', Wordlift_Configuration_Service::get_instance()->get_api_url() . $path );
-
-		// Give some time for the operation to complete, more than the time we give to the HTTP operation to complete.
-		@set_time_limit( 90 );
-
-		// Get the response value.
-		$key      = Wordlift_Configuration_Service::get_instance()->get_key();
-		$response = wp_remote_post( $url, array(
-			'timeout'    => 60,
-			'user-agent' => User_Agent::get_user_agent(),
-			'headers'    => array(
-				'Content-Type'    => $content_type,
-				'X-Authorization' => $key,
-				'Authorization'   => "Key $key",
-				/*
+            'timeout'    => 30,
+        ) );
+
+        return self::get_message_or_error( $response );
+    }
+
+    /**
+     * Perform a `POST` request towards the requested path.
+     *
+     * @param string $path The relative path.
+     * @param array|object $body The request body (will be serialized to JSON).
+     *
+     * @return array|WP_Error
+     * @since 3.20.0
+     *
+     */
+    public function post( $path, $body ) {
+
+        return $this->post_custom_content_type(
+            $path, json_encode( $body ), 'application/json; ' . get_bloginfo( 'charset' )
+        );
+    }
+
+    public function post_custom_content_type( $path, $body, $content_type ) {
+
+        // Prepare the target URL.
+        $url = apply_filters( 'wl_api_service_api_url_path', Wordlift_Configuration_Service::get_instance()->get_api_url() . $path );
+
+        // Give some time for the operation to complete, more than the time we give to the HTTP operation to complete.
+        @set_time_limit( 90 );
+
+        // Get the response value.
+        $key      = Wordlift_Configuration_Service::get_instance()->get_key();
+        $response = wp_remote_post( $url, array(
+            'timeout'    => 60,
+            'user-agent' => User_Agent::get_user_agent(),
+            'headers'    => array(
+                'Content-Type'    => $content_type,
+                'X-Authorization' => $key,
+                'Authorization'   => "Key $key",
+                /*
 				 * This is required to avoid CURL receiving 502 Bad Gateway errors.
 				 *
 				 * @see https://stackoverflow.com/questions/30601075/curl-to-google-compute-load-balancer-gets-error-502
 				 */
-				'Expect'          => '',
-			),
-			'body'       => $body,
-		) );
-
-		return self::get_message_or_error( $response );
-	}
-
-	public function delete( $path ) {
-
-		// Prepare the target URL.
-		$url = Wordlift_Configuration_Service::get_instance()->get_api_url() . $path;
-
-		// Get the response value.
-		$response = wp_remote_request( $url, array(
-			'method'     => 'DELETE',
-			'user-agent' => User_Agent::get_user_agent(),
-			'headers'    => array(
-				'X-Authorization' => Wordlift_Configuration_Service::get_instance()->get_key(),
-			),
-		) );
-
-		return self::get_message_or_error( $response );
-	}
-
-	/**
-	 * Return the {@link WP_Error} in case of error or the actual reply if successful.
-	 *
-	 * @param array|WP_Error $response The response of an http call.
-	 *
-	 * @return string|object|WP_Error A {@link WP_Error} instance or the actual response content.
-	 * @since 3.20.0
-	 *
-	 */
-	private static function get_message_or_error( $response ) {
-
-		// Result is WP_Error.
-		if ( is_wp_error( $response ) ) {
-			return $response;
-		}
-
-		// `code` not set or not numeric.
-		$code    = wp_remote_retrieve_response_code( $response );
-		$message = @wp_remote_retrieve_response_message( $response );
-
-		if ( empty( $code ) || ! is_numeric( $code ) ) {
-			return new WP_Error( 0, $message );
-		}
-
-		// Code not 2xx.
-		if ( 2 !== intval( $code / 100 ) ) {
-			return new WP_Error( $code, $message );
-		}
-
-		// Everything's fine, return the message.
-		return self::try_json_decode( $response );
-	}
-
-	/**
-	 * Try to decode the json response
-	 *
-	 * @param array $response The response array.
-	 *
-	 * @return array|mixed|object The decoded response or the original response body.
-	 * @since 3.20.0
-	 *
-	 */
-	private static function try_json_decode( $response ) {
-
-		// Get the headers.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-		$body         = wp_remote_retrieve_body( $response );
-
-		// If it's not an `application/json` return the plain response body.
-		if ( 0 !== strpos( strtolower( $content_type ), 'application/json' ) ) {
-			return $body;
-		}
-
-		// Decode and return the structured result.
-		return json_decode( $body );
-	}
+                'Expect'          => '',
+            ),
+            'body'       => $body,
+        ) );
+
+        return self::get_message_or_error( $response );
+    }
+
+    public function delete( $path ) {
+
+        // Prepare the target URL.
+        $url = Wordlift_Configuration_Service::get_instance()->get_api_url() . $path;
+
+        // Get the response value.
+        $response = wp_remote_request( $url, array(
+            'method'     => 'DELETE',
+            'user-agent' => User_Agent::get_user_agent(),
+            'headers'    => array(
+                'X-Authorization' => Wordlift_Configuration_Service::get_instance()->get_key(),
+            ),
+        ) );
+
+        return self::get_message_or_error( $response );
+    }
+
+    /**
+     * Return the {@link WP_Error} in case of error or the actual reply if successful.
+     *
+     * @param array|WP_Error $response The response of an http call.
+     *
+     * @return string|object|WP_Error A {@link WP_Error} instance or the actual response content.
+     * @since 3.20.0
+     *
+     */
+    private static function get_message_or_error( $response ) {
+
+        // Result is WP_Error.
+        if ( is_wp_error( $response ) ) {
+            return $response;
+        }
+
+        // `code` not set or not numeric.
+        $code    = wp_remote_retrieve_response_code( $response );
+        $message = @wp_remote_retrieve_response_message( $response );
+
+        if ( empty( $code ) || ! is_numeric( $code ) ) {
+            return new WP_Error( 0, $message );
+        }
+
+        // Code not 2xx.
+        if ( 2 !== intval( $code / 100 ) ) {
+            return new WP_Error( $code, $message );
+        }
+
+        // Everything's fine, return the message.
+        return self::try_json_decode( $response );
+    }
+
+    /**
+     * Try to decode the json response
+     *
+     * @param array $response The response array.
+     *
+     * @return array|mixed|object The decoded response or the original response body.
+     * @since 3.20.0
+     *
+     */
+    private static function try_json_decode( $response ) {
+
+        // Get the headers.
+        $content_type = wp_remote_retrieve_header( $response, 'content-type' );
+        $body         = wp_remote_retrieve_body( $response );
+
+        // If it's not an `application/json` return the plain response body.
+        if ( 0 !== strpos( strtolower( $content_type ), 'application/json' ) ) {
+            return $body;
+        }
+
+        // Decode and return the structured result.
+        return json_decode( $body );
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -56,13 +56,13 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function get( $path ) {
+	public function get($path) {
 
 		// Prepare the target URL.
-		$url = Wordlift_Configuration_Service::get_instance()->get_api_url() . $path;
+		$url = Wordlift_Configuration_Service::get_instance()->get_api_url().$path;
 
 		// Get the response value.
-		$response = wp_remote_get( $url, array(
+		$response = wp_remote_get($url, array(
 			'user-agent' => User_Agent::get_user_agent(),
 			'headers'    => array(
 				'X-Authorization' => Wordlift_Configuration_Service::get_instance()->get_key(),
@@ -75,9 +75,9 @@ 
 			 * @since 3.20.1
 			 */
 			'timeout'    => 30,
-		) );
+		));
 
-		return self::get_message_or_error( $response );
+		return self::get_message_or_error($response);
 	}
 
 	/**
@@ -90,24 +90,24 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function post( $path, $body ) {
+	public function post($path, $body) {
 
 		return $this->post_custom_content_type(
-			$path, json_encode( $body ), 'application/json; ' . get_bloginfo( 'charset' )
+			$path, json_encode($body), 'application/json; '.get_bloginfo('charset')
 		);
 	}
 
-	public function post_custom_content_type( $path, $body, $content_type ) {
+	public function post_custom_content_type($path, $body, $content_type) {
 
 		// Prepare the target URL.
-		$url = apply_filters( 'wl_api_service_api_url_path', Wordlift_Configuration_Service::get_instance()->get_api_url() . $path );
+		$url = apply_filters('wl_api_service_api_url_path', Wordlift_Configuration_Service::get_instance()->get_api_url().$path);
 
 		// Give some time for the operation to complete, more than the time we give to the HTTP operation to complete.
-		@set_time_limit( 90 );
+		@set_time_limit(90);
 
 		// Get the response value.
 		$key      = Wordlift_Configuration_Service::get_instance()->get_key();
-		$response = wp_remote_post( $url, array(
+		$response = wp_remote_post($url, array(
 			'timeout'    => 60,
 			'user-agent' => User_Agent::get_user_agent(),
 			'headers'    => array(
@@ -122,26 +122,26 @@ 
 				'Expect'          => '',
 			),
 			'body'       => $body,
-		) );
+		));
 
-		return self::get_message_or_error( $response );
+		return self::get_message_or_error($response);
 	}
 
-	public function delete( $path ) {
+	public function delete($path) {
 
 		// Prepare the target URL.
-		$url = Wordlift_Configuration_Service::get_instance()->get_api_url() . $path;
+		$url = Wordlift_Configuration_Service::get_instance()->get_api_url().$path;
 
 		// Get the response value.
-		$response = wp_remote_request( $url, array(
+		$response = wp_remote_request($url, array(
 			'method'     => 'DELETE',
 			'user-agent' => User_Agent::get_user_agent(),
 			'headers'    => array(
 				'X-Authorization' => Wordlift_Configuration_Service::get_instance()->get_key(),
 			),
-		) );
+		));
 
-		return self::get_message_or_error( $response );
+		return self::get_message_or_error($response);
 	}
 
 	/**
@@ -153,28 +153,28 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private static function get_message_or_error( $response ) {
+	private static function get_message_or_error($response) {
 
 		// Result is WP_Error.
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
 		// `code` not set or not numeric.
-		$code    = wp_remote_retrieve_response_code( $response );
-		$message = @wp_remote_retrieve_response_message( $response );
+		$code    = wp_remote_retrieve_response_code($response);
+		$message = @wp_remote_retrieve_response_message($response);
 
-		if ( empty( $code ) || ! is_numeric( $code ) ) {
-			return new WP_Error( 0, $message );
+		if (empty($code) || ! is_numeric($code)) {
+			return new WP_Error(0, $message);
 		}
 
 		// Code not 2xx.
-		if ( 2 !== intval( $code / 100 ) ) {
-			return new WP_Error( $code, $message );
+		if (2 !== intval($code / 100)) {
+			return new WP_Error($code, $message);
 		}
 
 		// Everything's fine, return the message.
-		return self::try_json_decode( $response );
+		return self::try_json_decode($response);
 	}
 
 	/**
@@ -186,19 +186,19 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private static function try_json_decode( $response ) {
+	private static function try_json_decode($response) {
 
 		// Get the headers.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-		$body         = wp_remote_retrieve_body( $response );
+		$content_type = wp_remote_retrieve_header($response, 'content-type');
+		$body         = wp_remote_retrieve_body($response);
 
 		// If it's not an `application/json` return the plain response body.
-		if ( 0 !== strpos( strtolower( $content_type ), 'application/json' ) ) {
+		if (0 !== strpos(strtolower($content_type), 'application/json')) {
 			return $body;
 		}
 
 		// Decode and return the structured result.
-		return json_decode( $body );
+		return json_decode($body);
 	}
 
 }

src/includes/class-wordlift-countries.php

Indentation +524 added lines, -524 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,529 +21,529 @@ 
  */
 class Wordlift_Countries {
 
-	/**
-	 * An array that will contain country codes => country names pairs. It gets lazily loaded the first time by the
-	 * `get_countries` function.
-	 *
-	 * @since 3.18.0
-	 * @var array An array of country codes => country names pairs or NULL if not initialized yet.
-	 */
-	private static $countries = array();
-
-	/**
-	 * The list of supported country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
-	 *
-	 * WARNING! If you change the list of supported countries, *you have* to add the related flag
-	 * in the images/flags folder.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @var array An array of country codes => supported_languages_array
-	 */
-	public static $codes = array();
-
-	/**
-	 * The list of country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
-	 *
-	 * WARNING! If you change the list of supported countries, *you have* to add the related flag
-	 * in the images/flags folder.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @var array An array of country codes => country names.
-	 */
-	private static $country_codes = array();
-
-	/**
-	 * An array of flag filenames.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @var array An array of flag filenames.
-	 */
-	private static $country_flags = array(
-		'af' => 'Afghanistan',
-		'ax' => 'Aland',
-		'al' => 'Albania',
-		'dz' => 'Algeria',
-		'as' => 'American-Samoa',
-		'ad' => 'Andorra',
-		'ao' => 'Angola',
-		'ai' => 'Anguilla',
-		'aq' => 'Antarctica',
-		'ag' => 'Antigua-and-Barbuda',
-		'ar' => 'Argentina',
-		'am' => 'Armenia',
-		'aw' => 'Aruba',
-		'au' => 'Australia',
-		'at' => 'Austria',
-		'az' => 'Azerbaijan',
-		'bs' => 'Bahamas',
-		'bh' => 'Bahrain',
-		'bd' => 'Bangladesh',
-		'bb' => 'Barbados',
-		'by' => 'Belarus',
-		'be' => 'Belgium',
-		'bz' => 'Belize',
-		'bj' => 'Benin',
-		'bm' => 'Bermuda',
-		'bt' => 'Bhutan',
-		'bo' => 'Bolivia',
-		// Uses Netherlands' flag, see https://en.wikipedia.org/wiki/Caribbean_Netherlands.
-		'bq' => 'Netherlands',
-		'ba' => 'Bosnia-and-Herzegovina',
-		'bw' => 'Botswana',
-		'bv' => 'Bouvet Island',
-		'br' => 'Brazil',
-		'io' => null,
-		'bn' => 'Brunei',
-		'bg' => 'Bulgaria',
-		'bf' => 'Burkina-Faso',
-		'bi' => 'Burundi',
-		'kh' => 'Cambodia',
-		'cm' => 'Cameroon',
-		'ca' => 'Canada',
-		'cv' => 'Cape-Verde',
-		'ky' => 'Cayman-Islands',
-		'cf' => 'Central-African-Republic',
-		'td' => 'Chad',
-		'cl' => 'Chile',
-		'cn' => 'China',
-		'cx' => 'Christmas-Island',
-		'cc' => 'Cocos-Keeling-Islands',
-		'co' => 'Colombia',
-		'km' => 'Comoros',
-		'cg' => 'Republic-of-the-Congo',
-		'cd' => 'Democratic-Republic-of-the-Congo',
-		'ck' => 'Cook-Islands',
-		'cr' => 'Costa-Rica',
-		'ci' => 'Cote-dIvoire',
-		'hr' => 'Croatia',
-		'cu' => 'Cuba',
-		'cw' => 'Curacao',
-		'cy' => 'Cyprus',
-		'cz' => 'Czech-Republic',
-		'dk' => 'Denmark',
-		'dj' => 'Djibouti',
-		'dm' => 'Dominica',
-		'do' => 'Dominican-Republic',
-		'ec' => 'Ecuador',
-		'eg' => 'Egypt',
-		'sv' => 'El-Salvador',
-		'gq' => 'Equatorial-Guinea',
-		'er' => 'Eritrea',
-		'ee' => 'Estonia',
-		'et' => 'Ethiopia',
-		'fk' => 'Falkland-Islands',
-		'fo' => 'Faroes',
-		'fj' => 'Fiji',
-		'fi' => 'Finland',
-		'fr' => 'France',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/French_Guiana.
-		'gf' => 'France',
-		'pf' => 'French-Polynesia',
-		'tf' => 'French-Southern-Territories',
-		'ga' => 'Gabon',
-		'gm' => 'Gambia',
-		'ge' => 'Georgia',
-		'de' => 'Germany',
-		'gh' => 'Ghana',
-		'gi' => 'Gibraltar',
-		'gr' => 'Greece',
-		'gl' => 'Greenland',
-		'gd' => 'Grenada',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/Guadeloupe.
-		'gp' => 'France',
-		'gu' => 'Guam',
-		'gt' => 'Guatemala',
-		'gg' => 'Guernsey',
-		'gn' => 'Guinea',
-		'gw' => 'Guinea-Bissau',
-		'gy' => 'Guyana',
-		'ht' => 'Haiti',
-		// Uses Australia's flag, see https://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands.
-		'hm' => 'Australia',
-		'va' => 'Vatican-City',
-		'hn' => 'Honduras',
-		'hk' => 'Hong-Kong',
-		'hu' => 'Hungary',
-		'is' => 'Iceland',
-		'in' => 'India',
-		'id' => 'Indonesia',
-		'ir' => 'Iran',
-		'iq' => 'Iraq',
-		'ie' => 'Ireland',
-		'im' => 'Isle-of-Man',
-		'il' => 'Israel',
-		'it' => 'Italy',
-		'jm' => 'Jamaica',
-		'jp' => 'Japan',
-		'je' => 'Jersey',
-		'jo' => 'Jordan',
-		'kz' => 'Kazakhstan',
-		'ke' => 'Kenya',
-		'ki' => 'Kiribati',
-		'kp' => 'North-Korea',
-		'kr' => 'South-Korea',
-		'kw' => 'Kuwait',
-		'kg' => 'Kyrgyzstan',
-		'la' => 'Laos',
-		'lv' => 'Latvia',
-		'lb' => 'Lebanon',
-		'ls' => 'Lesotho',
-		'lr' => 'Liberia',
-		'ly' => 'Libya',
-		'li' => 'Liechtenstein',
-		'lt' => 'Lithuania',
-		'lu' => 'Luxembourg',
-		'mo' => 'Macau',
-		'mk' => 'Macedonia',
-		'mg' => 'Madagascar',
-		'mw' => 'Malawi',
-		'my' => 'Malaysia',
-		'mv' => 'Maldives',
-		'ml' => 'Mali',
-		'mt' => 'Malta',
-		'mh' => 'Marshall-Islands',
-		'mq' => 'Martinique',
-		'mr' => 'Mauritania',
-		'mu' => 'Mauritius',
-		'yt' => 'Mayotte',
-		'mx' => 'Mexico',
-		'fm' => 'Micronesia',
-		'md' => 'Moldova',
-		'mc' => 'Monaco',
-		'mn' => 'Mongolia',
-		'me' => 'Montenegro',
-		'ms' => 'Montserrat',
-		'ma' => 'Morocco',
-		'mz' => 'Mozambique',
-		'mm' => 'Myanmar',
-		'na' => 'Namibia',
-		'nr' => 'Nauru',
-		'np' => 'Nepal',
-		'nl' => 'Netherlands',
-		'nc' => 'New-Caledonia',
-		'nz' => 'New-Zealand',
-		'ni' => 'Nicaragua',
-		'ne' => 'Niger',
-		'ng' => 'Nigeria',
-		'nu' => 'Niue',
-		'nf' => 'Norfolk-Island',
-		'mp' => 'Northern-Mariana-Islands',
-		'no' => 'Norway',
-		'om' => 'Oman',
-		'pk' => 'Pakistan',
-		'pw' => 'Palau',
-		'ps' => 'Palestine',
-		'pa' => 'Panama',
-		'pg' => 'Papua-New-Guinea',
-		'py' => 'Paraguay',
-		'pe' => 'Peru',
-		'ph' => 'Philippines',
-		'pn' => 'Pitcairn-Islands',
-		'pl' => 'Poland',
-		'pt' => 'Portugal',
-		'pr' => 'Puerto Rico',
-		'qa' => 'Qatar',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/R%C3%A9union.
-		're' => 'France',
-		'ro' => 'Romania',
-		'ru' => 'Russia',
-		'rw' => 'Rwanda',
-		'bl' => 'Saint-Barthelemy',
-		'sh' => 'Saint-Helena',
-		'kn' => 'Saint-Kitts-and-Nevis',
-		'lc' => 'Saint-Lucia',
-		'mf' => 'Saint-Martin',
-		// Uses France's flag, see https://en.wikipedia.org/wiki/Saint_Pierre_and_Miquelon.
-		'pm' => 'France',
-		'vc' => 'Saint-Vincent-and-the-Grenadines',
-		'ws' => 'Samoa',
-		'sm' => 'San-Marino',
-		'st' => 'Sao-Tome-and-Principe',
-		'sa' => 'Saudi-Arabia',
-		'sn' => 'Senegal',
-		'rs' => 'Serbia',
-		'sc' => 'Seychelles',
-		'sl' => 'Sierra-Leone',
-		'sg' => 'Singapore',
-		'sx' => null,
-		'sk' => 'Slovakia',
-		'si' => 'Slovenia',
-		'sb' => 'Solomon-Islands',
-		'so' => 'Somalia',
-		'za' => 'South-Africa',
-		'gs' => 'South-Georgia-and-the-South-Sandwich-Islands',
-		'ss' => 'South-Sudan',
-		'es' => 'Spain',
-		'lk' => 'Sri-Lanka',
-		'sd' => 'Sudan',
-		'sr' => 'Suriname',
-		// Uses Norway's flag, see https://en.wikipedia.org/wiki/Svalbard_and_Jan_Mayen.
-		'sj' => 'Norway',
-		'sz' => 'Swaziland',
-		'se' => 'Sweden',
-		'ch' => 'Switzerland',
-		'sy' => 'Syria',
-		'tw' => 'Taiwan',
-		'tj' => 'Tajikistan',
-		'tz' => 'Tanzania',
-		'th' => 'Thailand',
-		'tl' => 'East-Timor',
-		'tg' => 'Togo',
-		'tk' => 'Tokelau',
-		'to' => 'Tonga',
-		'tt' => 'Trinidad-and-Tobago',
-		'tn' => 'Tunisia',
-		'tr' => 'Turkey',
-		'tm' => 'Turkmenistan',
-		'tc' => 'Turks-and-Caicos-Islands',
-		'tv' => 'Tuvalu',
-		'ug' => 'Uganda',
-		'ua' => 'Ukraine',
-		'ae' => 'United-Arab-Emirates',
-		'gb' => 'United-Kingdom',
-		'uk' => 'United-Kingdom',
-		'us' => 'United-States',
-		'um' => 'United-States',
-		'uy' => 'Uruguay',
-		'uz' => 'Uzbekistan',
-		'vu' => 'Vanuatu',
-		've' => 'Venezuela',
-		'vn' => 'Vietnam',
-		'vg' => 'British-Virgin-Islands',
-		'vi' => 'US-Virgin-Islands',
-		'wf' => 'Wallis-And-Futuna',
-		'eh' => 'Western-Sahara',
-		'ye' => 'Yemen',
-		'zm' => 'Zambia',
-		'zw' => 'Zimbabwe',
-	);
-
-	/**
-	 * Parse_country_code_json_file_to_array.
-	 *
-	 * @param string $file_name The json file name where the supported country
-	 * and languages are present.
-	 *
-	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
-	 */
-	public static function parse_country_code_json_file_to_array( $file_name ) {
-		$json_file_contents = file_get_contents( $file_name );
-		$decoded_array      = json_decode( $json_file_contents, true );
-		// decoded array would be null if the json_decode parses
-		// invalid content.
-		if ( null === $decoded_array ) {
-			return array(
-				'country_code_name_map'     => array(),
-				'country_code_language_map' => array(),
-			);
-		}
-		$result = array();
-		// country_code => country_language map.
-		$country_code_language_map = array();
-		// country_code => country_name map.
-		$country_code_name_map = array();
-		foreach ( $decoded_array as $key => $value ) {
-			$country_code_language_map[ $key ] = $value['supportedLang'];
-			$country_code_name_map [ $key ]    = $value['defaultLoc']['loc_name'];
-		}
-		$result['country_code_language_map'] = $country_code_language_map;
-		$result['country_code_name_map']     = $country_code_name_map;
-
-		return $result;
-	}
-
-	/**
-	 * Get the list of WordLift's supported country codes from json file mapping country_code => languages.
-	 *
-	 * @param string $file_name The json file where the supported country codes and language_codes are stored.
-	 *
-	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
-	 * @since 3.22.5.1
-	 *
-	 */
-	public static function get_codes_from_json_file( $file_name ) {
-		if ( file_exists( $file_name ) ) {
-			return self::parse_country_code_json_file_to_array( $file_name );
-		}
-
-		return array(
-			'country_code_name_map'     => array(),
-			'country_code_language_map' => array(),
-		);
-	}
-
-	/**
-	 * Returns the country language pairs.
-	 *
-	 * @return array The country language pairs.
-	 * @since 3.18.0
-	 *
-	 */
-	public static function get_codes() {
-		return self::$codes;
-	}
-
-	/**
-	 * Populate self::codes and self::country_codes if not done before.
-	 *
-	 * @param string $file_name The json file where the supported country codes and language_codes are stored.
-	 *
-	 * @return void
-	 * @since 3.22.5.1
-	 *
-	 */
-	private static function lazy_populate_codes_and_country_codes_array( $file_name ) {
-		if ( null === $file_name ) {
-			$file_name = __DIR__ . '/supported-countries.json';
-		}
-		if ( 0 === count( self::$codes ) || 0 === count( self::$country_codes ) ) {
-			// populate the two arrays.
-			$result_array        = self::get_codes_from_json_file( $file_name );
-			self::$codes         = $result_array['country_code_language_map'];
-			self::$country_codes = $result_array['country_code_name_map'];
-		}
-
-	}
-
-	/**
-	 * Reset codes_and_country_codes static variable, used for testing
-	 *
-	 * @return void
-	 * @since 3.22.5.1
-	 *
-	 */
-	public static function reset_codes_and_country_codes() {
-		self::$codes         = array();
-		self::$country_codes = array();
-	}
-
-
-	/**
-	 * Get the list of WordLift's supported countries in an array with country code => country name pairs.
-	 *
-	 * @param string|false $lang Optional. The language code we are looking for. Default `any`.
-	 *
-	 * @param string|null $file_name Optional. The json file containing country codes
-	 *  and language data.
-	 *
-	 * @return array An array with country code => country name pairs.
-	 * @since 3.18.0
-	 *
-	 */
-	public static function get_countries( $lang = false, $file_name = null ) {
-
-		// populate the codes and countries array if it is not done before.
-		self::lazy_populate_codes_and_country_codes_array( $file_name );
-
-		// Lazily load the countries.
+    /**
+     * An array that will contain country codes => country names pairs. It gets lazily loaded the first time by the
+     * `get_countries` function.
+     *
+     * @since 3.18.0
+     * @var array An array of country codes => country names pairs or NULL if not initialized yet.
+     */
+    private static $countries = array();
+
+    /**
+     * The list of supported country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
+     *
+     * WARNING! If you change the list of supported countries, *you have* to add the related flag
+     * in the images/flags folder.
+     *
+     * @since 3.18.0
+     *
+     * @var array An array of country codes => supported_languages_array
+     */
+    public static $codes = array();
+
+    /**
+     * The list of country codes, this is populated by self::lazy_populate_codes_and_country_codes_array.
+     *
+     * WARNING! If you change the list of supported countries, *you have* to add the related flag
+     * in the images/flags folder.
+     *
+     * @since 3.18.0
+     *
+     * @var array An array of country codes => country names.
+     */
+    private static $country_codes = array();
+
+    /**
+     * An array of flag filenames.
+     *
+     * @since 3.20.0
+     *
+     * @var array An array of flag filenames.
+     */
+    private static $country_flags = array(
+        'af' => 'Afghanistan',
+        'ax' => 'Aland',
+        'al' => 'Albania',
+        'dz' => 'Algeria',
+        'as' => 'American-Samoa',
+        'ad' => 'Andorra',
+        'ao' => 'Angola',
+        'ai' => 'Anguilla',
+        'aq' => 'Antarctica',
+        'ag' => 'Antigua-and-Barbuda',
+        'ar' => 'Argentina',
+        'am' => 'Armenia',
+        'aw' => 'Aruba',
+        'au' => 'Australia',
+        'at' => 'Austria',
+        'az' => 'Azerbaijan',
+        'bs' => 'Bahamas',
+        'bh' => 'Bahrain',
+        'bd' => 'Bangladesh',
+        'bb' => 'Barbados',
+        'by' => 'Belarus',
+        'be' => 'Belgium',
+        'bz' => 'Belize',
+        'bj' => 'Benin',
+        'bm' => 'Bermuda',
+        'bt' => 'Bhutan',
+        'bo' => 'Bolivia',
+        // Uses Netherlands' flag, see https://en.wikipedia.org/wiki/Caribbean_Netherlands.
+        'bq' => 'Netherlands',
+        'ba' => 'Bosnia-and-Herzegovina',
+        'bw' => 'Botswana',
+        'bv' => 'Bouvet Island',
+        'br' => 'Brazil',
+        'io' => null,
+        'bn' => 'Brunei',
+        'bg' => 'Bulgaria',
+        'bf' => 'Burkina-Faso',
+        'bi' => 'Burundi',
+        'kh' => 'Cambodia',
+        'cm' => 'Cameroon',
+        'ca' => 'Canada',
+        'cv' => 'Cape-Verde',
+        'ky' => 'Cayman-Islands',
+        'cf' => 'Central-African-Republic',
+        'td' => 'Chad',
+        'cl' => 'Chile',
+        'cn' => 'China',
+        'cx' => 'Christmas-Island',
+        'cc' => 'Cocos-Keeling-Islands',
+        'co' => 'Colombia',
+        'km' => 'Comoros',
+        'cg' => 'Republic-of-the-Congo',
+        'cd' => 'Democratic-Republic-of-the-Congo',
+        'ck' => 'Cook-Islands',
+        'cr' => 'Costa-Rica',
+        'ci' => 'Cote-dIvoire',
+        'hr' => 'Croatia',
+        'cu' => 'Cuba',
+        'cw' => 'Curacao',
+        'cy' => 'Cyprus',
+        'cz' => 'Czech-Republic',
+        'dk' => 'Denmark',
+        'dj' => 'Djibouti',
+        'dm' => 'Dominica',
+        'do' => 'Dominican-Republic',
+        'ec' => 'Ecuador',
+        'eg' => 'Egypt',
+        'sv' => 'El-Salvador',
+        'gq' => 'Equatorial-Guinea',
+        'er' => 'Eritrea',
+        'ee' => 'Estonia',
+        'et' => 'Ethiopia',
+        'fk' => 'Falkland-Islands',
+        'fo' => 'Faroes',
+        'fj' => 'Fiji',
+        'fi' => 'Finland',
+        'fr' => 'France',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/French_Guiana.
+        'gf' => 'France',
+        'pf' => 'French-Polynesia',
+        'tf' => 'French-Southern-Territories',
+        'ga' => 'Gabon',
+        'gm' => 'Gambia',
+        'ge' => 'Georgia',
+        'de' => 'Germany',
+        'gh' => 'Ghana',
+        'gi' => 'Gibraltar',
+        'gr' => 'Greece',
+        'gl' => 'Greenland',
+        'gd' => 'Grenada',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/Guadeloupe.
+        'gp' => 'France',
+        'gu' => 'Guam',
+        'gt' => 'Guatemala',
+        'gg' => 'Guernsey',
+        'gn' => 'Guinea',
+        'gw' => 'Guinea-Bissau',
+        'gy' => 'Guyana',
+        'ht' => 'Haiti',
+        // Uses Australia's flag, see https://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands.
+        'hm' => 'Australia',
+        'va' => 'Vatican-City',
+        'hn' => 'Honduras',
+        'hk' => 'Hong-Kong',
+        'hu' => 'Hungary',
+        'is' => 'Iceland',
+        'in' => 'India',
+        'id' => 'Indonesia',
+        'ir' => 'Iran',
+        'iq' => 'Iraq',
+        'ie' => 'Ireland',
+        'im' => 'Isle-of-Man',
+        'il' => 'Israel',
+        'it' => 'Italy',
+        'jm' => 'Jamaica',
+        'jp' => 'Japan',
+        'je' => 'Jersey',
+        'jo' => 'Jordan',
+        'kz' => 'Kazakhstan',
+        'ke' => 'Kenya',
+        'ki' => 'Kiribati',
+        'kp' => 'North-Korea',
+        'kr' => 'South-Korea',
+        'kw' => 'Kuwait',
+        'kg' => 'Kyrgyzstan',
+        'la' => 'Laos',
+        'lv' => 'Latvia',
+        'lb' => 'Lebanon',
+        'ls' => 'Lesotho',
+        'lr' => 'Liberia',
+        'ly' => 'Libya',
+        'li' => 'Liechtenstein',
+        'lt' => 'Lithuania',
+        'lu' => 'Luxembourg',
+        'mo' => 'Macau',
+        'mk' => 'Macedonia',
+        'mg' => 'Madagascar',
+        'mw' => 'Malawi',
+        'my' => 'Malaysia',
+        'mv' => 'Maldives',
+        'ml' => 'Mali',
+        'mt' => 'Malta',
+        'mh' => 'Marshall-Islands',
+        'mq' => 'Martinique',
+        'mr' => 'Mauritania',
+        'mu' => 'Mauritius',
+        'yt' => 'Mayotte',
+        'mx' => 'Mexico',
+        'fm' => 'Micronesia',
+        'md' => 'Moldova',
+        'mc' => 'Monaco',
+        'mn' => 'Mongolia',
+        'me' => 'Montenegro',
+        'ms' => 'Montserrat',
+        'ma' => 'Morocco',
+        'mz' => 'Mozambique',
+        'mm' => 'Myanmar',
+        'na' => 'Namibia',
+        'nr' => 'Nauru',
+        'np' => 'Nepal',
+        'nl' => 'Netherlands',
+        'nc' => 'New-Caledonia',
+        'nz' => 'New-Zealand',
+        'ni' => 'Nicaragua',
+        'ne' => 'Niger',
+        'ng' => 'Nigeria',
+        'nu' => 'Niue',
+        'nf' => 'Norfolk-Island',
+        'mp' => 'Northern-Mariana-Islands',
+        'no' => 'Norway',
+        'om' => 'Oman',
+        'pk' => 'Pakistan',
+        'pw' => 'Palau',
+        'ps' => 'Palestine',
+        'pa' => 'Panama',
+        'pg' => 'Papua-New-Guinea',
+        'py' => 'Paraguay',
+        'pe' => 'Peru',
+        'ph' => 'Philippines',
+        'pn' => 'Pitcairn-Islands',
+        'pl' => 'Poland',
+        'pt' => 'Portugal',
+        'pr' => 'Puerto Rico',
+        'qa' => 'Qatar',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/R%C3%A9union.
+        're' => 'France',
+        'ro' => 'Romania',
+        'ru' => 'Russia',
+        'rw' => 'Rwanda',
+        'bl' => 'Saint-Barthelemy',
+        'sh' => 'Saint-Helena',
+        'kn' => 'Saint-Kitts-and-Nevis',
+        'lc' => 'Saint-Lucia',
+        'mf' => 'Saint-Martin',
+        // Uses France's flag, see https://en.wikipedia.org/wiki/Saint_Pierre_and_Miquelon.
+        'pm' => 'France',
+        'vc' => 'Saint-Vincent-and-the-Grenadines',
+        'ws' => 'Samoa',
+        'sm' => 'San-Marino',
+        'st' => 'Sao-Tome-and-Principe',
+        'sa' => 'Saudi-Arabia',
+        'sn' => 'Senegal',
+        'rs' => 'Serbia',
+        'sc' => 'Seychelles',
+        'sl' => 'Sierra-Leone',
+        'sg' => 'Singapore',
+        'sx' => null,
+        'sk' => 'Slovakia',
+        'si' => 'Slovenia',
+        'sb' => 'Solomon-Islands',
+        'so' => 'Somalia',
+        'za' => 'South-Africa',
+        'gs' => 'South-Georgia-and-the-South-Sandwich-Islands',
+        'ss' => 'South-Sudan',
+        'es' => 'Spain',
+        'lk' => 'Sri-Lanka',
+        'sd' => 'Sudan',
+        'sr' => 'Suriname',
+        // Uses Norway's flag, see https://en.wikipedia.org/wiki/Svalbard_and_Jan_Mayen.
+        'sj' => 'Norway',
+        'sz' => 'Swaziland',
+        'se' => 'Sweden',
+        'ch' => 'Switzerland',
+        'sy' => 'Syria',
+        'tw' => 'Taiwan',
+        'tj' => 'Tajikistan',
+        'tz' => 'Tanzania',
+        'th' => 'Thailand',
+        'tl' => 'East-Timor',
+        'tg' => 'Togo',
+        'tk' => 'Tokelau',
+        'to' => 'Tonga',
+        'tt' => 'Trinidad-and-Tobago',
+        'tn' => 'Tunisia',
+        'tr' => 'Turkey',
+        'tm' => 'Turkmenistan',
+        'tc' => 'Turks-and-Caicos-Islands',
+        'tv' => 'Tuvalu',
+        'ug' => 'Uganda',
+        'ua' => 'Ukraine',
+        'ae' => 'United-Arab-Emirates',
+        'gb' => 'United-Kingdom',
+        'uk' => 'United-Kingdom',
+        'us' => 'United-States',
+        'um' => 'United-States',
+        'uy' => 'Uruguay',
+        'uz' => 'Uzbekistan',
+        'vu' => 'Vanuatu',
+        've' => 'Venezuela',
+        'vn' => 'Vietnam',
+        'vg' => 'British-Virgin-Islands',
+        'vi' => 'US-Virgin-Islands',
+        'wf' => 'Wallis-And-Futuna',
+        'eh' => 'Western-Sahara',
+        'ye' => 'Yemen',
+        'zm' => 'Zambia',
+        'zw' => 'Zimbabwe',
+    );
+
+    /**
+     * Parse_country_code_json_file_to_array.
+     *
+     * @param string $file_name The json file name where the supported country
+     * and languages are present.
+     *
+     * @return array An Array having two maps, country_code_language_map and country_code_name_map.
+     */
+    public static function parse_country_code_json_file_to_array( $file_name ) {
+        $json_file_contents = file_get_contents( $file_name );
+        $decoded_array      = json_decode( $json_file_contents, true );
+        // decoded array would be null if the json_decode parses
+        // invalid content.
+        if ( null === $decoded_array ) {
+            return array(
+                'country_code_name_map'     => array(),
+                'country_code_language_map' => array(),
+            );
+        }
+        $result = array();
+        // country_code => country_language map.
+        $country_code_language_map = array();
+        // country_code => country_name map.
+        $country_code_name_map = array();
+        foreach ( $decoded_array as $key => $value ) {
+            $country_code_language_map[ $key ] = $value['supportedLang'];
+            $country_code_name_map [ $key ]    = $value['defaultLoc']['loc_name'];
+        }
+        $result['country_code_language_map'] = $country_code_language_map;
+        $result['country_code_name_map']     = $country_code_name_map;
+
+        return $result;
+    }
+
+    /**
+     * Get the list of WordLift's supported country codes from json file mapping country_code => languages.
+     *
+     * @param string $file_name The json file where the supported country codes and language_codes are stored.
+     *
+     * @return array An Array having two maps, country_code_language_map and country_code_name_map.
+     * @since 3.22.5.1
+     *
+     */
+    public static function get_codes_from_json_file( $file_name ) {
+        if ( file_exists( $file_name ) ) {
+            return self::parse_country_code_json_file_to_array( $file_name );
+        }
+
+        return array(
+            'country_code_name_map'     => array(),
+            'country_code_language_map' => array(),
+        );
+    }
+
+    /**
+     * Returns the country language pairs.
+     *
+     * @return array The country language pairs.
+     * @since 3.18.0
+     *
+     */
+    public static function get_codes() {
+        return self::$codes;
+    }
+
+    /**
+     * Populate self::codes and self::country_codes if not done before.
+     *
+     * @param string $file_name The json file where the supported country codes and language_codes are stored.
+     *
+     * @return void
+     * @since 3.22.5.1
+     *
+     */
+    private static function lazy_populate_codes_and_country_codes_array( $file_name ) {
+        if ( null === $file_name ) {
+            $file_name = __DIR__ . '/supported-countries.json';
+        }
+        if ( 0 === count( self::$codes ) || 0 === count( self::$country_codes ) ) {
+            // populate the two arrays.
+            $result_array        = self::get_codes_from_json_file( $file_name );
+            self::$codes         = $result_array['country_code_language_map'];
+            self::$country_codes = $result_array['country_code_name_map'];
+        }
+
+    }
+
+    /**
+     * Reset codes_and_country_codes static variable, used for testing
+     *
+     * @return void
+     * @since 3.22.5.1
+     *
+     */
+    public static function reset_codes_and_country_codes() {
+        self::$codes         = array();
+        self::$country_codes = array();
+    }
+
+
+    /**
+     * Get the list of WordLift's supported countries in an array with country code => country name pairs.
+     *
+     * @param string|false $lang Optional. The language code we are looking for. Default `any`.
+     *
+     * @param string|null $file_name Optional. The json file containing country codes
+     *  and language data.
+     *
+     * @return array An array with country code => country name pairs.
+     * @since 3.18.0
+     *
+     */
+    public static function get_countries( $lang = false, $file_name = null ) {
+
+        // populate the codes and countries array if it is not done before.
+        self::lazy_populate_codes_and_country_codes_array( $file_name );
+
+        // Lazily load the countries.
 //		$lang_key = false === $lang ? 'any' : $lang;
-		$lang_key = 'any';
-		$lang     = '';
-
-		if ( isset( self::$countries[ $lang_key ] ) ) {
-			return self::$countries[ $lang_key ];
-		}
-
-		// Prepare the array.
-		self::$countries[ $lang ] = array();
-
-		// Get the country names from WP's own (multisite) function.
-		foreach ( self::$codes as $key => $languages ) {
-			if (
-				// Process all countries if there is no language specified.
-				empty( $lang ) ||
-
-				// Or if there are no language limitations for current country.
-				empty( self::$codes[ $key ] ) ||
-
-				// Or if the language code exists for current country.
-				! empty( $lang ) && in_array( $lang, self::$codes[ $key ] )
-			) {
-				self::$countries[ $lang_key ][ $key ] = self::format_country_code( $key );
-			}
-		}
-
-		// Sort by country name.
-		asort( self::$countries[ $lang_key ] );
-
-		// We don't sort here because `asort` returns bool instead of sorted array.
-		return self::$countries[ $lang_key ];
-	}
-
-	/**
-	 * Returns the country for a country code. This function is a clone of WP's function provided in `ms.php`.
-	 *
-	 * @param string $code Optional. The two-letter country code. Default empty.
-	 *
-	 * @return string The country corresponding to $code if it exists. If it does not exist,
-	 *                then the first two letters of $code is returned.
-	 * @since 3.18.0
-	 *
-	 */
-	private static function format_country_code( $code = '' ) {
-
-		$code = strtolower( substr( $code, 0, 2 ) );
-		/**
-		 * Filters the country codes.
-		 *
-		 * @param array $country_codes Key/value pair of country codes where key is the short version.
-		 * @param string $code A two-letter designation of the country.
-		 *
-		 * @since 3.18.0
-		 *
-		 */
-		$country_codes = apply_filters( 'country_code', self::$country_codes, $code );
-
-		return strtr( $code, $country_codes );
-	}
-
-	/**
-	 * Get a flag URL.
-	 *
-	 * @param string $country_code The country code.
-	 *
-	 * @return string|null The flag url or null if not available.
-	 * @since 3.20.0
-	 *
-	 */
-	public static function get_flag_url( $country_code ) {
-
-		// Bail out if we don't have the flag.
-		if ( ! isset( self::$country_flags[ $country_code ] )
-		     || is_null( self::$country_flags[ $country_code ] ) ) {
-			return null;
-		}
-
-		return plugin_dir_url( dirname( __FILE__ ) )
-		       . 'images/flags/16/'
-		       . self::$country_flags[ $country_code ]
-		       . '.png';
-	}
-
-	/**
-	 * Get a country name given a country code.
-	 *
-	 * @param string $country_code The 2-letters country code.
-	 *
-	 * @return null|string The country name (in English) or null if not found.
-	 * @since 3.20.0
-	 *
-	 */
-	public static function get_country_name( $country_code ) {
-
-		/**
-		 * @since 3.27.6
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/1188
-		 */
-		if ( ! isset( self::$country_codes[ $country_code ] ) ) {
-			return '';
-		}
-
-		return self::$country_codes[ $country_code ];
-	}
+        $lang_key = 'any';
+        $lang     = '';
+
+        if ( isset( self::$countries[ $lang_key ] ) ) {
+            return self::$countries[ $lang_key ];
+        }
+
+        // Prepare the array.
+        self::$countries[ $lang ] = array();
+
+        // Get the country names from WP's own (multisite) function.
+        foreach ( self::$codes as $key => $languages ) {
+            if (
+                // Process all countries if there is no language specified.
+                empty( $lang ) ||
+
+                // Or if there are no language limitations for current country.
+                empty( self::$codes[ $key ] ) ||
+
+                // Or if the language code exists for current country.
+                ! empty( $lang ) && in_array( $lang, self::$codes[ $key ] )
+            ) {
+                self::$countries[ $lang_key ][ $key ] = self::format_country_code( $key );
+            }
+        }
+
+        // Sort by country name.
+        asort( self::$countries[ $lang_key ] );
+
+        // We don't sort here because `asort` returns bool instead of sorted array.
+        return self::$countries[ $lang_key ];
+    }
+
+    /**
+     * Returns the country for a country code. This function is a clone of WP's function provided in `ms.php`.
+     *
+     * @param string $code Optional. The two-letter country code. Default empty.
+     *
+     * @return string The country corresponding to $code if it exists. If it does not exist,
+     *                then the first two letters of $code is returned.
+     * @since 3.18.0
+     *
+     */
+    private static function format_country_code( $code = '' ) {
+
+        $code = strtolower( substr( $code, 0, 2 ) );
+        /**
+         * Filters the country codes.
+         *
+         * @param array $country_codes Key/value pair of country codes where key is the short version.
+         * @param string $code A two-letter designation of the country.
+         *
+         * @since 3.18.0
+         *
+         */
+        $country_codes = apply_filters( 'country_code', self::$country_codes, $code );
+
+        return strtr( $code, $country_codes );
+    }
+
+    /**
+     * Get a flag URL.
+     *
+     * @param string $country_code The country code.
+     *
+     * @return string|null The flag url or null if not available.
+     * @since 3.20.0
+     *
+     */
+    public static function get_flag_url( $country_code ) {
+
+        // Bail out if we don't have the flag.
+        if ( ! isset( self::$country_flags[ $country_code ] )
+             || is_null( self::$country_flags[ $country_code ] ) ) {
+            return null;
+        }
+
+        return plugin_dir_url( dirname( __FILE__ ) )
+                . 'images/flags/16/'
+                . self::$country_flags[ $country_code ]
+                . '.png';
+    }
+
+    /**
+     * Get a country name given a country code.
+     *
+     * @param string $country_code The 2-letters country code.
+     *
+     * @return null|string The country name (in English) or null if not found.
+     * @since 3.20.0
+     *
+     */
+    public static function get_country_name( $country_code ) {
+
+        /**
+         * @since 3.27.6
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/1188
+         */
+        if ( ! isset( self::$country_codes[ $country_code ] ) ) {
+            return '';
+        }
+
+        return self::$country_codes[ $country_code ];
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -10,7 +10,7 @@ 
  * @since   3.18.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -329,12 +329,12 @@ 
 	 *
 	 * @return array An Array having two maps, country_code_language_map and country_code_name_map.
 	 */
-	public static function parse_country_code_json_file_to_array( $file_name ) {
-		$json_file_contents = file_get_contents( $file_name );
-		$decoded_array      = json_decode( $json_file_contents, true );
+	public static function parse_country_code_json_file_to_array($file_name) {
+		$json_file_contents = file_get_contents($file_name);
+		$decoded_array      = json_decode($json_file_contents, true);
 		// decoded array would be null if the json_decode parses
 		// invalid content.
-		if ( null === $decoded_array ) {
+		if (null === $decoded_array) {
 			return array(
 				'country_code_name_map'     => array(),
 				'country_code_language_map' => array(),
@@ -345,9 +345,9 @@ 
 		$country_code_language_map = array();
 		// country_code => country_name map.
 		$country_code_name_map = array();
-		foreach ( $decoded_array as $key => $value ) {
-			$country_code_language_map[ $key ] = $value['supportedLang'];
-			$country_code_name_map [ $key ]    = $value['defaultLoc']['loc_name'];
+		foreach ($decoded_array as $key => $value) {
+			$country_code_language_map[$key] = $value['supportedLang'];
+			$country_code_name_map [$key]    = $value['defaultLoc']['loc_name'];
 		}
 		$result['country_code_language_map'] = $country_code_language_map;
 		$result['country_code_name_map']     = $country_code_name_map;
@@ -364,9 +364,9 @@ 
 	 * @since 3.22.5.1
 	 *
 	 */
-	public static function get_codes_from_json_file( $file_name ) {
-		if ( file_exists( $file_name ) ) {
-			return self::parse_country_code_json_file_to_array( $file_name );
+	public static function get_codes_from_json_file($file_name) {
+		if (file_exists($file_name)) {
+			return self::parse_country_code_json_file_to_array($file_name);
 		}
 
 		return array(
@@ -395,13 +395,13 @@ 
 	 * @since 3.22.5.1
 	 *
 	 */
-	private static function lazy_populate_codes_and_country_codes_array( $file_name ) {
-		if ( null === $file_name ) {
-			$file_name = __DIR__ . '/supported-countries.json';
+	private static function lazy_populate_codes_and_country_codes_array($file_name) {
+		if (null === $file_name) {
+			$file_name = __DIR__.'/supported-countries.json';
 		}
-		if ( 0 === count( self::$codes ) || 0 === count( self::$country_codes ) ) {
+		if (0 === count(self::$codes) || 0 === count(self::$country_codes)) {
 			// populate the two arrays.
-			$result_array        = self::get_codes_from_json_file( $file_name );
+			$result_array        = self::get_codes_from_json_file($file_name);
 			self::$codes         = $result_array['country_code_language_map'];
 			self::$country_codes = $result_array['country_code_name_map'];
 		}
@@ -433,44 +433,44 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	public static function get_countries( $lang = false, $file_name = null ) {
+	public static function get_countries($lang = false, $file_name = null) {
 
 		// populate the codes and countries array if it is not done before.
-		self::lazy_populate_codes_and_country_codes_array( $file_name );
+		self::lazy_populate_codes_and_country_codes_array($file_name);
 
 		// Lazily load the countries.
 //		$lang_key = false === $lang ? 'any' : $lang;
 		$lang_key = 'any';
 		$lang     = '';
 
-		if ( isset( self::$countries[ $lang_key ] ) ) {
-			return self::$countries[ $lang_key ];
+		if (isset(self::$countries[$lang_key])) {
+			return self::$countries[$lang_key];
 		}
 
 		// Prepare the array.
-		self::$countries[ $lang ] = array();
+		self::$countries[$lang] = array();
 
 		// Get the country names from WP's own (multisite) function.
-		foreach ( self::$codes as $key => $languages ) {
+		foreach (self::$codes as $key => $languages) {
 			if (
 				// Process all countries if there is no language specified.
-				empty( $lang ) ||
+				empty($lang) ||
 
 				// Or if there are no language limitations for current country.
-				empty( self::$codes[ $key ] ) ||
+				empty(self::$codes[$key]) ||
 
 				// Or if the language code exists for current country.
-				! empty( $lang ) && in_array( $lang, self::$codes[ $key ] )
+				! empty($lang) && in_array($lang, self::$codes[$key])
 			) {
-				self::$countries[ $lang_key ][ $key ] = self::format_country_code( $key );
+				self::$countries[$lang_key][$key] = self::format_country_code($key);
 			}
 		}
 
 		// Sort by country name.
-		asort( self::$countries[ $lang_key ] );
+		asort(self::$countries[$lang_key]);
 
 		// We don't sort here because `asort` returns bool instead of sorted array.
-		return self::$countries[ $lang_key ];
+		return self::$countries[$lang_key];
 	}
 
 	/**
@@ -483,9 +483,9 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private static function format_country_code( $code = '' ) {
+	private static function format_country_code($code = '') {
 
-		$code = strtolower( substr( $code, 0, 2 ) );
+		$code = strtolower(substr($code, 0, 2));
 		/**
 		 * Filters the country codes.
 		 *
@@ -495,9 +495,9 @@ 
 		 * @since 3.18.0
 		 *
 		 */
-		$country_codes = apply_filters( 'country_code', self::$country_codes, $code );
+		$country_codes = apply_filters('country_code', self::$country_codes, $code);
 
-		return strtr( $code, $country_codes );
+		return strtr($code, $country_codes);
 	}
 
 	/**
@@ -509,17 +509,17 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public static function get_flag_url( $country_code ) {
+	public static function get_flag_url($country_code) {
 
 		// Bail out if we don't have the flag.
-		if ( ! isset( self::$country_flags[ $country_code ] )
-		     || is_null( self::$country_flags[ $country_code ] ) ) {
+		if ( ! isset(self::$country_flags[$country_code])
+		     || is_null(self::$country_flags[$country_code])) {
 			return null;
 		}
 
-		return plugin_dir_url( dirname( __FILE__ ) )
+		return plugin_dir_url(dirname(__FILE__))
 		       . 'images/flags/16/'
-		       . self::$country_flags[ $country_code ]
+		       . self::$country_flags[$country_code]
 		       . '.png';
 	}
 
@@ -532,18 +532,18 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public static function get_country_name( $country_code ) {
+	public static function get_country_name($country_code) {
 
 		/**
 		 * @since 3.27.6
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1188
 		 */
-		if ( ! isset( self::$country_codes[ $country_code ] ) ) {
+		if ( ! isset(self::$country_codes[$country_code])) {
 			return '';
 		}
 
-		return self::$country_codes[ $country_code ];
+		return self::$country_codes[$country_code];
 	}
 
 }

src/includes/class-wordlift.php

Indentation +1674 added lines, -1674 removed lines

@@ -82,1755 +82,1755 @@
  */
 class Wordlift {
 
-	//<editor-fold desc="## FIELDS">
-
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The {@link Wordlift_Tinymce_Adapter} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
-	 */
-	protected $tinymce_adapter;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	protected $schema_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since  3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The Entity Types Taxonomy service.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Taxonomy_Service The Entity Types Taxonomy service.
-	 */
-	private $entity_types_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since  3.1.7
-	 * @access protected
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	protected $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
-	 */
-	protected $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since  3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service
-	 */
-	private $entity_post_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service $entity_link_service The {@link Wordlift_Entity_Link_Service} instance.
-	 */
-	private $entity_link_service;
-
-	/**
-	 * A {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access protected
-	 * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
-	 */
-	protected $jsonld_service;
-
-	/**
-	 * A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Website_Jsonld_Converter $jsonld_website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 */
-	protected $jsonld_website_converter;
-
-	/**
-	 * A {@link Wordlift_Property_Factory} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Property_Factory $property_factory
-	 */
-	private $property_factory;
-
-	/**
-	 * The 'Download Your Data' page.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
-	 */
-	private $download_your_data_page;
-
-	/**
-	 * The 'WordLift Settings' page.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
-	 */
-	protected $settings_page;
-
-	/**
-	 * The install wizard page.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
-	 */
-	public $admin_setup;
-
-	/**
-	 * The Content Filter Service hooks up to the 'the_content' filter and provides
-	 * linking of entities to their pages.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
-	 */
-	private $content_filter_service;
-
-	/**
-	 * The Faq Content filter service
-	 * @since  3.26.0
-	 * @access private
-	 * @var Faq_Content_Filter $faq_content_filter_service A {@link Faq_Content_Filter} instance.
-	 */
-	private $faq_content_filter_service;
-
-	/**
-	 * A {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
-	 */
-	private $key_validation_service;
-
-	/**
-	 * A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	private $rating_service;
-
-	/**
-	 * A {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter A {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Install_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var \Wordlift_Install_Service $install_service A {@link Wordlift_Install_Service} instance.
-	 */
-	protected $install_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $entity_post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 */
-	protected $postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 */
-	protected $category_taxonomy_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Page_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Page_Service $entity_page_service The {@link Wordlift_Entity_Page_Service} instance.
-	 */
-	protected $entity_page_service;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $analytics_settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Analytics_Connect} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Analytics_Connect $analytics_connect The {@link Wordlift_Analytics_Connect} class.
-	 */
-	protected $analytics_connect;
-
-	/**
-	 * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 */
-	protected $publisher_ajax_adapter;
-
-	/**
-	 * The {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	protected $input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	protected $radio_input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	protected $language_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Country_Select_Element $country_select_element The {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 */
-	protected $country_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	protected $publisher_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 */
-	protected $select2_element;
-
-	/**
-	 * The controller for the entity type list admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
-	 */
-	private $entity_type_admin_page;
-
-	/**
-	 * The controller for the entity type settings admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
-	 */
-	private $entity_type_settings_admin_page;
-
-	/**
-	 * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 */
-	protected $related_entities_cloud_widget;
-
-	/**
-	 * The {@link Wordlift_Admin_Author_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Author_Element $author_element The {@link Wordlift_Admin_Author_Element} instance.
-	 */
-	protected $author_element;
-
-	/**
-	 * The {@link Wordlift_Sample_Data_Service} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
-	 */
-	protected $sample_data_service;
-
-	/**
-	 * The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Sample_Data_Ajax_Adapter $sample_data_ajax_adapter The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
-	 */
-	protected $sample_data_ajax_adapter;
-
-	/**
-	 * The {@link Wordlift_Google_Analytics_Export_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var \Wordlift_Google_Analytics_Export_Service $google_analytics_export_service The {@link Wordlift_Google_Analytics_Export_Service} instance.
-	 */
-	protected $google_analytics_export_service;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Adapter $entity_type_adapter The {@link Wordlift_Entity_Type_Adapter} instance.
-	 */
-	protected $entity_type_adapter;
-
-	/**
-	 * The {@link Wordlift_Storage_Factory} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Storage_Factory $storage_factory The {@link Wordlift_Storage_Factory} instance.
-	 */
-	protected $storage_factory;
-
-	/**
-	 * The {@link Wordlift_Autocomplete_Adapter} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Autocomplete_Adapter $autocomplete_adapter The {@link Wordlift_Autocomplete_Adapter} instance.
-	 */
-	private $autocomplete_adapter;
-
-	/**
-	 * The {@link Wordlift_Cached_Post_Converter} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var  \Wordlift_Cached_Post_Converter $cached_postid_to_jsonld_converter The {@link Wordlift_Cached_Post_Converter} instance.
-	 *
-	 */
-	protected $cached_postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access protected
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	protected $entity_uri_service;
-
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.19.0
-	 * @access protected
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	protected $publisher_service;
-
-	/**
-	 * The {@link Wordlift_Context_Cards_Service} instance.
-	 *
-	 * @var \Wordlift_Context_Cards_Service The {@link Wordlift_Context_Cards_Service} instance.
-	 */
-	protected $context_cards_service;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.11.2
-	 * @access private
-	 * @var Wordlift $instance {@link Wordlift}'s singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * A singleton instance of features registry.
-	 * @since 3.30.0
-	 * @var Features_Registry
-	 */
-	private $features_registry;
-
-	private $analytics_settings_page;
-	//</editor-fold>
-
-	// Experimental code added by Nishit for feature request 1496
-	private $webhook_loader;
-	// Experimental code ents here
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		self::$instance = $this;
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.34.0';
-		$this->load_dependencies();
-		$this->set_locale();
-
-		$that = $this;
-		add_action( 'plugins_loaded', function () use ( $that ) {
-			$that->define_admin_hooks( $that );
-			$that->define_public_hooks( $that );
-		}, 4 );
-
-		// If we're in `WP_CLI` load the related files.
-		if ( class_exists( 'WP_CLI' ) ) {
-			$this->load_cli_dependencies();
-		}
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return Wordlift The {@link Wordlift} singleton instance.
-	 * @since 3.11.2
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @throws Exception
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		// The class responsible for plugin uninstall.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * WordLift's supported languages.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
-
-		/**
-		 * WordLift's supported countries.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
-
-		/**
-		 * Load cache-related files.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/*
+    //<editor-fold desc="## FIELDS">
+
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The {@link Wordlift_Tinymce_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
+     */
+    protected $tinymce_adapter;
+
+    /**
+     * The Schema service.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    protected $schema_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since  3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The Entity Types Taxonomy service.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Taxonomy_Service The Entity Types Taxonomy service.
+     */
+    private $entity_types_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since  3.1.7
+     * @access protected
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    protected $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
+     */
+    protected $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since  3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service
+     */
+    private $entity_post_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service $entity_link_service The {@link Wordlift_Entity_Link_Service} instance.
+     */
+    private $entity_link_service;
+
+    /**
+     * A {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since  3.7.0
+     * @access protected
+     * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
+     */
+    protected $jsonld_service;
+
+    /**
+     * A {@link Wordlift_Website_Jsonld_Converter} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Website_Jsonld_Converter $jsonld_website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     */
+    protected $jsonld_website_converter;
+
+    /**
+     * A {@link Wordlift_Property_Factory} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Property_Factory $property_factory
+     */
+    private $property_factory;
+
+    /**
+     * The 'Download Your Data' page.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
+     */
+    private $download_your_data_page;
+
+    /**
+     * The 'WordLift Settings' page.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
+     */
+    protected $settings_page;
+
+    /**
+     * The install wizard page.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
+     */
+    public $admin_setup;
+
+    /**
+     * The Content Filter Service hooks up to the 'the_content' filter and provides
+     * linking of entities to their pages.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
+     */
+    private $content_filter_service;
+
+    /**
+     * The Faq Content filter service
+     * @since  3.26.0
+     * @access private
+     * @var Faq_Content_Filter $faq_content_filter_service A {@link Faq_Content_Filter} instance.
+     */
+    private $faq_content_filter_service;
+
+    /**
+     * A {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
+     */
+    private $key_validation_service;
+
+    /**
+     * A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    private $rating_service;
+
+    /**
+     * A {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter A {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     */
+    protected $post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Install_Service} instance.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var \Wordlift_Install_Service $install_service A {@link Wordlift_Install_Service} instance.
+     */
+    protected $install_service;
+
+    /**
+     * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     */
+    protected $entity_post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     */
+    protected $postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_Category_Taxonomy_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
+     */
+    protected $category_taxonomy_service;
+
+    /**
+     * The {@link Wordlift_Entity_Page_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Entity_Page_Service $entity_page_service The {@link Wordlift_Entity_Page_Service} instance.
+     */
+    protected $entity_page_service;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $analytics_settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Analytics_Connect} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Analytics_Connect $analytics_connect The {@link Wordlift_Analytics_Connect} class.
+     */
+    protected $analytics_connect;
+
+    /**
+     * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     */
+    protected $publisher_ajax_adapter;
+
+    /**
+     * The {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    protected $input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    protected $radio_input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    protected $language_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var \Wordlift_Admin_Country_Select_Element $country_select_element The {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     */
+    protected $country_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    protected $publisher_element;
+
+    /**
+     * The {@link Wordlift_Admin_Select2_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
+     */
+    protected $select2_element;
+
+    /**
+     * The controller for the entity type list admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
+     */
+    private $entity_type_admin_page;
+
+    /**
+     * The controller for the entity type settings admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
+     */
+    private $entity_type_settings_admin_page;
+
+    /**
+     * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     */
+    protected $related_entities_cloud_widget;
+
+    /**
+     * The {@link Wordlift_Admin_Author_Element} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Admin_Author_Element $author_element The {@link Wordlift_Admin_Author_Element} instance.
+     */
+    protected $author_element;
+
+    /**
+     * The {@link Wordlift_Sample_Data_Service} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
+     */
+    protected $sample_data_service;
+
+    /**
+     * The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Sample_Data_Ajax_Adapter $sample_data_ajax_adapter The {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
+     */
+    protected $sample_data_ajax_adapter;
+
+    /**
+     * The {@link Wordlift_Google_Analytics_Export_Service} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var \Wordlift_Google_Analytics_Export_Service $google_analytics_export_service The {@link Wordlift_Google_Analytics_Export_Service} instance.
+     */
+    protected $google_analytics_export_service;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Adapter $entity_type_adapter The {@link Wordlift_Entity_Type_Adapter} instance.
+     */
+    protected $entity_type_adapter;
+
+    /**
+     * The {@link Wordlift_Storage_Factory} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Storage_Factory $storage_factory The {@link Wordlift_Storage_Factory} instance.
+     */
+    protected $storage_factory;
+
+    /**
+     * The {@link Wordlift_Autocomplete_Adapter} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Autocomplete_Adapter $autocomplete_adapter The {@link Wordlift_Autocomplete_Adapter} instance.
+     */
+    private $autocomplete_adapter;
+
+    /**
+     * The {@link Wordlift_Cached_Post_Converter} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var  \Wordlift_Cached_Post_Converter $cached_postid_to_jsonld_converter The {@link Wordlift_Cached_Post_Converter} instance.
+     *
+     */
+    protected $cached_postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since  3.16.3
+     * @access protected
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    protected $entity_uri_service;
+
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.19.0
+     * @access protected
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    protected $publisher_service;
+
+    /**
+     * The {@link Wordlift_Context_Cards_Service} instance.
+     *
+     * @var \Wordlift_Context_Cards_Service The {@link Wordlift_Context_Cards_Service} instance.
+     */
+    protected $context_cards_service;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.11.2
+     * @access private
+     * @var Wordlift $instance {@link Wordlift}'s singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * A singleton instance of features registry.
+     * @since 3.30.0
+     * @var Features_Registry
+     */
+    private $features_registry;
+
+    private $analytics_settings_page;
+    //</editor-fold>
+
+    // Experimental code added by Nishit for feature request 1496
+    private $webhook_loader;
+    // Experimental code ents here
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        self::$instance = $this;
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.34.0';
+        $this->load_dependencies();
+        $this->set_locale();
+
+        $that = $this;
+        add_action( 'plugins_loaded', function () use ( $that ) {
+            $that->define_admin_hooks( $that );
+            $that->define_public_hooks( $that );
+        }, 4 );
+
+        // If we're in `WP_CLI` load the related files.
+        if ( class_exists( 'WP_CLI' ) ) {
+            $this->load_cli_dependencies();
+        }
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return Wordlift The {@link Wordlift} singleton instance.
+     * @since 3.11.2
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @throws Exception
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        // The class responsible for plugin uninstall.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * WordLift's supported languages.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+
+        /**
+         * WordLift's supported countries.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        // Add the entity rating service.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
+
+        /**
+         * Load cache-related files.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
-
-		/**
-		 * Load the JSON-LD service to publish entities using JSON-LD.s
-		 *
-		 * @since 3.8.0
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
-
-		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
-
-		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
-
-		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
-
-		/** Linked Data. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
-
-		/** Adapters. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
-
-		/** Autocomplete. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
-
-		/** Analytics */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/analytics/class-wordlift-analytics-connect.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		global $wp_version;
-		if ( version_compare( $wp_version, '5.3', '<' ) ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-		} else {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
-		}
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The admin 'Install wizard' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
-
-		/**
-		 * The WordLift entity type list admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
-
-		/**
-		 * The WordLift entity type settings admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
-
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
-
-		/**
-		 * The admin 'WordLift Settings' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
-
-		/** Admin Pages */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
-
-		/**
-		 * The Products Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-products-navigator-shortcode.php';
-
-		/**
-		 * The chord shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
-
-		/**
-		 * The geomap shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
-
-		/**
-		 * The entity cloud shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
-
-		/**
-		 * The entity glossary shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
-
-		/**
-		 * Faceted Search shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
-
-		/**
-		 * The SEO service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
-
-		/**
-		 * The AMP service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
-
-		/** Widgets */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.php';
-
-		/*
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
+
+        /**
+         * Load the JSON-LD service to publish entities using JSON-LD.s
+         *
+         * @since 3.8.0
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+
+        // The Publisher Service and the AJAX adapter.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
+
+        /**
+         * Load the WordLift key validation service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+
+        // Load the `Wordlift_Category_Taxonomy_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
+
+        // Load the `Wordlift_Entity_Page_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
+
+        /** Linked Data. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
+
+        /** Adapters. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
+
+        /** Autocomplete. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
+
+        /** Analytics */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/analytics/class-wordlift-analytics-connect.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        global $wp_version;
+        if ( version_compare( $wp_version, '5.3', '<' ) ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+        } else {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
+        }
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The admin 'Install wizard' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+
+        /**
+         * The WordLift entity type list admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+
+        /**
+         * The WordLift entity type settings admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
+
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+
+        /**
+         * The admin 'WordLift Settings' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
+
+        /** Admin Pages */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+
+        /**
+         * The Products Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-products-navigator-shortcode.php';
+
+        /**
+         * The chord shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+
+        /**
+         * The geomap shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+
+        /**
+         * The entity cloud shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+
+        /**
+         * The entity glossary shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
+
+        /**
+         * Faceted Search shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+
+        /**
+         * The SEO service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
+
+        /**
+         * The AMP service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
+
+        /** Widgets */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.php';
+
+        /*
 		 * Batch Operations. They're similar to Batch Actions but do not require working on post types.
 		 *
 		 * Eventually Batch Actions will become Batch Operations.
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
-		/*
+        /*
 		 * Schema.org Services.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
-			new Wordlift_Schemaorg_Sync_Service();
-			$schemaorg_property_service = Wordlift_Schemaorg_Property_Service::get_instance();
-			new Wordlift_Schemaorg_Class_Service();
-		} else {
-			$schemaorg_property_service = null;
-		}
-
-		$this->loader = new Wordlift_Loader();
-		/**
-		 * @since 3.30.0
-		 */
-		$this->features_registry = Features_Registry::get_instance();
-
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
-
-		// Load the `wl-api` end-point.
-		new Wordlift_Http_Api();
-
-		// Load the Install Service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-service.php';
-		$this->install_service = new Wordlift_Install_Service();
-		$this->notice_service  = new Wordlift_Notice_Service();
-		$this->user_service    = Wordlift_User_Service::get_instance();
-		// create an instance of the entity type list admin page controller.
-		$this->entity_type_admin_page        = new Wordlift_Admin_Entity_Taxonomy_List_Page();
-		$this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
-		$this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service(
-			Wordlift_Entity_Service::TYPE_NAME, Wordlift_Configuration_Service::get_instance()->get_entity_base_path() );
-		/* WordPress Admin. */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page();
-		// create an instance of the entity type setting admin page controller.
-		$this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
-
-
-		$that = $this;
-		add_action( 'plugins_loaded', function () use ( &$that, $schemaorg_property_service ) {
-
-			/** Services. */
-			// Create the configuration service.
-			$api_service = new Wordlift_Api_Service();
-
-			// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-			$that->entity_link_service = new Wordlift_Entity_Link_Service( $that->entity_post_type_service, Wordlift_Configuration_Service::get_instance()->get_entity_base_path() );
-
-			$schema_url_property_service = new Wordlift_Schema_Url_Property_Service();
-
-			$that->entity_uri_service = Wordlift_Entity_Uri_Service::get_instance();
-
-			// Create a new instance of the Redirect service.
-			$that->redirect_service = new Wordlift_Redirect_Service( $that->entity_uri_service );
-
-			// Create a new instance of the Timeline service and Timeline shortcode.
-			$that->timeline_service = new Wordlift_Timeline_Service();
-
-			$that->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
-
-			// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-			$that->sharethis_service = new Wordlift_ShareThis_Service();
-
-			// Create an instance of the PrimaShop adapter.
-			$that->primashop_adapter = new Wordlift_PrimaShop_Adapter();
-
-			$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
-
-			// Create the entity rating service.
-			$that->rating_service = new Wordlift_Rating_Service( Wordlift_Entity_Type_Service::get_instance(), $that->notice_service );
-
-			// 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 = new Wordlift_Rating_Service( Wordlift_Entity_Type_Service::get_instance(), $that->notice_service );
+
+            // 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/wordlift/videoobject/jsonld/class-jsonld.php

Indentation +173 added lines, -173 removed lines

@@ -12,179 +12,179 @@
 use Wordlift\Videoobject\Data\Video_Storage\Storage;
 
 class Jsonld {
-	/**
-	 * @var Storage
-	 */
-	private $video_storage;
-
-	/**
-	 * Jsonld constructor.
-	 *
-	 * @param $video_storage Storage
-	 */
-	public function __construct( $video_storage ) {
-		add_action( 'wl_post_jsonld', array( $this, 'wl_post_jsonld' ), 10, 3 );
-		add_action( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10, 3 );
-		$this->video_storage = $video_storage;
-	}
-
-
-	public function wl_after_get_jsonld( $jsonld, $post_id, $context ) {
-		if ( 0 === count( $jsonld ) ) {
-			return $jsonld;
-		}
-		$current_item = $jsonld[0];
-
-		if ( ! is_array( $current_item ) || ! array_key_exists( '@type', $current_item ) ) {
-			// Cant determine type return early.
-			return $jsonld;
-		}
-
-		$type = $current_item['@type'];
-		if ( is_string( $type ) ) {
-			$type = array( $type );
-		}
-		// If its a article or descendant of article, then dont add the
-		// videoobject in this hook, they will be already added to video property.
-		if ( array_intersect( Jsonld_Article_Wrapper::$article_types, $type ) ) {
-			return $jsonld;
-		}
-
-		$videos_jsonld = $this->get_videos_jsonld( $post_id );
-		if ( 0 === count( $videos_jsonld ) ) {
-			return $jsonld;
-		}
-
-		// check if we have @id in jsonld for first item.
-		$id = array_key_exists( '@id', $current_item ) ? $current_item['@id'] : '';
-
-		foreach ( $videos_jsonld as &$video_jsonld ) {
-			if ( ! $id ) {
-				continue;
-			}
-			if ( ! array_key_exists( 'mentions', $video_jsonld ) ) {
-				$video_jsonld['mentions'] = array( '@id' => $id );
-			} else {
-				$video_jsonld['mentions'] = array_merge( $video_jsonld['mentions'], array( '@id' => $id ) );
-			}
-		}
-
-		return array_merge( $jsonld, $videos_jsonld );
-	}
-
-	/**
-	 * @param $existing_video_data string | array associative or sequential array.
-	 * @param $new_video_data array Sequential array.
-	 *
-	 * @return array
-	 */
-	private function merge_video_data( $existing_video_data, $new_video_data ) {
-		if ( ! is_array( $existing_video_data ) ) {
-			$new_video_data[] = $existing_video_data;
-
-			return $new_video_data;
-		}
-
-		if ( $this->is_associative_array( $existing_video_data ) ) {
-			$new_video_data[] = $existing_video_data;
-
-			return $new_video_data;
-		}
-
-		return array_merge( $existing_video_data, $new_video_data );
-	}
-
-	public function wl_post_jsonld( $jsonld, $post_id, $references ) {
-
-		$video_jsonld = $this->get_videos_jsonld( $post_id );
-		if ( count( $video_jsonld ) === 0 ) {
-			return $jsonld;
-		}
-		// Before adding the video jsonld check if the key
-		// is present and additional data might be present,
-		// if not present just add the data and return early.
-		if ( ! array_key_exists( 'video', $jsonld ) ) {
-			$jsonld['video'] = $video_jsonld;
-
-			return $jsonld;
-		}
-
-		// since key exists, we need to merge the data based on type.
-		$previous_video_data = $jsonld['video'];
-		$jsonld['video']     = $this->merge_video_data( $previous_video_data, $video_jsonld );
-
-		return $jsonld;
-	}
-
-
-	/**
-	 * @param $post_id int Post id.
-	 *
-	 * @return array
-	 */
-	public function get_videos_jsonld( $post_id ) {
-
-		$videos = $this->video_storage->get_all_videos( $post_id );
-
-		$jsonld = array();
-
-		foreach ( $videos as $video ) {
-			/**
-			 * @var $video Video
-			 */
-			$description = $video->description;
-			if ( ! $video->description ) {
-				// If description is empty then use the video title as description
-				$description = $video->name;
-			}
-			$single_jsonld = array(
-				'@context'     => 'http://schema.org',
-				'@type'        => 'VideoObject',
-				'name'         => $video->name,
-				'description'  => $description,
-				'contentUrl'   => $video->content_url,
-				'uploadDate'   => $video->upload_date,
-				'thumbnailUrl' => $video->thumbnail_urls,
-				'duration'     => $video->duration,
-			);
-
-			if ( $video->embed_url ) {
-				$single_jsonld['embedUrl'] = $video->embed_url;
-			}
-
-			if ( $video->views ) {
-				$single_jsonld['interactionStatistic'] = array(
-					'@type'                => 'InteractionCounter',
-					'interactionType'      => array(
-						'@type' => 'http://schema.org/WatchAction'
-					),
-					'userInteractionCount' => $video->views
-				);
-			}
-
-			if ( $video->is_live_video ) {
-				$single_jsonld['publication'] = array(
-					'@type'           => 'BroadcastEvent',
-					'isLiveBroadcast' => true,
-					'startDate'       => $video->live_video_start_date,
-					'endDate'         => $video->live_video_end_date
-				);
-			}
-
-			$jsonld[] = $single_jsonld;
-		}
-
-		return $jsonld;
-	}
-
-
-	private function is_associative_array( $arr ) {
-		if ( array() === $arr ) {
-			return false;
-		}
-
-		return array_keys( $arr ) !== range( 0, count( $arr ) - 1 );
-	}
+    /**
+     * @var Storage
+     */
+    private $video_storage;
+
+    /**
+     * Jsonld constructor.
+     *
+     * @param $video_storage Storage
+     */
+    public function __construct( $video_storage ) {
+        add_action( 'wl_post_jsonld', array( $this, 'wl_post_jsonld' ), 10, 3 );
+        add_action( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10, 3 );
+        $this->video_storage = $video_storage;
+    }
+
+
+    public function wl_after_get_jsonld( $jsonld, $post_id, $context ) {
+        if ( 0 === count( $jsonld ) ) {
+            return $jsonld;
+        }
+        $current_item = $jsonld[0];
+
+        if ( ! is_array( $current_item ) || ! array_key_exists( '@type', $current_item ) ) {
+            // Cant determine type return early.
+            return $jsonld;
+        }
+
+        $type = $current_item['@type'];
+        if ( is_string( $type ) ) {
+            $type = array( $type );
+        }
+        // If its a article or descendant of article, then dont add the
+        // videoobject in this hook, they will be already added to video property.
+        if ( array_intersect( Jsonld_Article_Wrapper::$article_types, $type ) ) {
+            return $jsonld;
+        }
+
+        $videos_jsonld = $this->get_videos_jsonld( $post_id );
+        if ( 0 === count( $videos_jsonld ) ) {
+            return $jsonld;
+        }
+
+        // check if we have @id in jsonld for first item.
+        $id = array_key_exists( '@id', $current_item ) ? $current_item['@id'] : '';
+
+        foreach ( $videos_jsonld as &$video_jsonld ) {
+            if ( ! $id ) {
+                continue;
+            }
+            if ( ! array_key_exists( 'mentions', $video_jsonld ) ) {
+                $video_jsonld['mentions'] = array( '@id' => $id );
+            } else {
+                $video_jsonld['mentions'] = array_merge( $video_jsonld['mentions'], array( '@id' => $id ) );
+            }
+        }
+
+        return array_merge( $jsonld, $videos_jsonld );
+    }
+
+    /**
+     * @param $existing_video_data string | array associative or sequential array.
+     * @param $new_video_data array Sequential array.
+     *
+     * @return array
+     */
+    private function merge_video_data( $existing_video_data, $new_video_data ) {
+        if ( ! is_array( $existing_video_data ) ) {
+            $new_video_data[] = $existing_video_data;
+
+            return $new_video_data;
+        }
+
+        if ( $this->is_associative_array( $existing_video_data ) ) {
+            $new_video_data[] = $existing_video_data;
+
+            return $new_video_data;
+        }
+
+        return array_merge( $existing_video_data, $new_video_data );
+    }
+
+    public function wl_post_jsonld( $jsonld, $post_id, $references ) {
+
+        $video_jsonld = $this->get_videos_jsonld( $post_id );
+        if ( count( $video_jsonld ) === 0 ) {
+            return $jsonld;
+        }
+        // Before adding the video jsonld check if the key
+        // is present and additional data might be present,
+        // if not present just add the data and return early.
+        if ( ! array_key_exists( 'video', $jsonld ) ) {
+            $jsonld['video'] = $video_jsonld;
+
+            return $jsonld;
+        }
+
+        // since key exists, we need to merge the data based on type.
+        $previous_video_data = $jsonld['video'];
+        $jsonld['video']     = $this->merge_video_data( $previous_video_data, $video_jsonld );
+
+        return $jsonld;
+    }
+
+
+    /**
+     * @param $post_id int Post id.
+     *
+     * @return array
+     */
+    public function get_videos_jsonld( $post_id ) {
+
+        $videos = $this->video_storage->get_all_videos( $post_id );
+
+        $jsonld = array();
+
+        foreach ( $videos as $video ) {
+            /**
+             * @var $video Video
+             */
+            $description = $video->description;
+            if ( ! $video->description ) {
+                // If description is empty then use the video title as description
+                $description = $video->name;
+            }
+            $single_jsonld = array(
+                '@context'     => 'http://schema.org',
+                '@type'        => 'VideoObject',
+                'name'         => $video->name,
+                'description'  => $description,
+                'contentUrl'   => $video->content_url,
+                'uploadDate'   => $video->upload_date,
+                'thumbnailUrl' => $video->thumbnail_urls,
+                'duration'     => $video->duration,
+            );
+
+            if ( $video->embed_url ) {
+                $single_jsonld['embedUrl'] = $video->embed_url;
+            }
+
+            if ( $video->views ) {
+                $single_jsonld['interactionStatistic'] = array(
+                    '@type'                => 'InteractionCounter',
+                    'interactionType'      => array(
+                        '@type' => 'http://schema.org/WatchAction'
+                    ),
+                    'userInteractionCount' => $video->views
+                );
+            }
+
+            if ( $video->is_live_video ) {
+                $single_jsonld['publication'] = array(
+                    '@type'           => 'BroadcastEvent',
+                    'isLiveBroadcast' => true,
+                    'startDate'       => $video->live_video_start_date,
+                    'endDate'         => $video->live_video_end_date
+                );
+            }
+
+            $jsonld[] = $single_jsonld;
+        }
+
+        return $jsonld;
+    }
+
+
+    private function is_associative_array( $arr ) {
+        if ( array() === $arr ) {
+            return false;
+        }
+
+        return array_keys( $arr ) !== range( 0, count( $arr ) - 1 );
+    }
 
 
 }

Spacing +37 added lines, -37 removed lines

@@ -22,54 +22,54 @@ 
 	 *
 	 * @param $video_storage Storage
 	 */
-	public function __construct( $video_storage ) {
-		add_action( 'wl_post_jsonld', array( $this, 'wl_post_jsonld' ), 10, 3 );
-		add_action( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10, 3 );
+	public function __construct($video_storage) {
+		add_action('wl_post_jsonld', array($this, 'wl_post_jsonld'), 10, 3);
+		add_action('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 10, 3);
 		$this->video_storage = $video_storage;
 	}
 
 
-	public function wl_after_get_jsonld( $jsonld, $post_id, $context ) {
-		if ( 0 === count( $jsonld ) ) {
+	public function wl_after_get_jsonld($jsonld, $post_id, $context) {
+		if (0 === count($jsonld)) {
 			return $jsonld;
 		}
 		$current_item = $jsonld[0];
 
-		if ( ! is_array( $current_item ) || ! array_key_exists( '@type', $current_item ) ) {
+		if ( ! is_array($current_item) || ! array_key_exists('@type', $current_item)) {
 			// Cant determine type return early.
 			return $jsonld;
 		}
 
 		$type = $current_item['@type'];
-		if ( is_string( $type ) ) {
-			$type = array( $type );
+		if (is_string($type)) {
+			$type = array($type);
 		}
 		// If its a article or descendant of article, then dont add the
 		// videoobject in this hook, they will be already added to video property.
-		if ( array_intersect( Jsonld_Article_Wrapper::$article_types, $type ) ) {
+		if (array_intersect(Jsonld_Article_Wrapper::$article_types, $type)) {
 			return $jsonld;
 		}
 
-		$videos_jsonld = $this->get_videos_jsonld( $post_id );
-		if ( 0 === count( $videos_jsonld ) ) {
+		$videos_jsonld = $this->get_videos_jsonld($post_id);
+		if (0 === count($videos_jsonld)) {
 			return $jsonld;
 		}
 
 		// check if we have @id in jsonld for first item.
-		$id = array_key_exists( '@id', $current_item ) ? $current_item['@id'] : '';
+		$id = array_key_exists('@id', $current_item) ? $current_item['@id'] : '';
 
-		foreach ( $videos_jsonld as &$video_jsonld ) {
-			if ( ! $id ) {
+		foreach ($videos_jsonld as &$video_jsonld) {
+			if ( ! $id) {
 				continue;
 			}
-			if ( ! array_key_exists( 'mentions', $video_jsonld ) ) {
-				$video_jsonld['mentions'] = array( '@id' => $id );
+			if ( ! array_key_exists('mentions', $video_jsonld)) {
+				$video_jsonld['mentions'] = array('@id' => $id);
 			} else {
-				$video_jsonld['mentions'] = array_merge( $video_jsonld['mentions'], array( '@id' => $id ) );
+				$video_jsonld['mentions'] = array_merge($video_jsonld['mentions'], array('@id' => $id));
 			}
 		}
 
-		return array_merge( $jsonld, $videos_jsonld );
+		return array_merge($jsonld, $videos_jsonld);
 	}
 
 	/**
@@ -78,32 +78,32 @@ 
 	 *
 	 * @return array
 	 */
-	private function merge_video_data( $existing_video_data, $new_video_data ) {
-		if ( ! is_array( $existing_video_data ) ) {
+	private function merge_video_data($existing_video_data, $new_video_data) {
+		if ( ! is_array($existing_video_data)) {
 			$new_video_data[] = $existing_video_data;
 
 			return $new_video_data;
 		}
 
-		if ( $this->is_associative_array( $existing_video_data ) ) {
+		if ($this->is_associative_array($existing_video_data)) {
 			$new_video_data[] = $existing_video_data;
 
 			return $new_video_data;
 		}
 
-		return array_merge( $existing_video_data, $new_video_data );
+		return array_merge($existing_video_data, $new_video_data);
 	}
 
-	public function wl_post_jsonld( $jsonld, $post_id, $references ) {
+	public function wl_post_jsonld($jsonld, $post_id, $references) {
 
-		$video_jsonld = $this->get_videos_jsonld( $post_id );
-		if ( count( $video_jsonld ) === 0 ) {
+		$video_jsonld = $this->get_videos_jsonld($post_id);
+		if (count($video_jsonld) === 0) {
 			return $jsonld;
 		}
 		// Before adding the video jsonld check if the key
 		// is present and additional data might be present,
 		// if not present just add the data and return early.
-		if ( ! array_key_exists( 'video', $jsonld ) ) {
+		if ( ! array_key_exists('video', $jsonld)) {
 			$jsonld['video'] = $video_jsonld;
 
 			return $jsonld;
@@ -111,7 +111,7 @@ 
 
 		// since key exists, we need to merge the data based on type.
 		$previous_video_data = $jsonld['video'];
-		$jsonld['video']     = $this->merge_video_data( $previous_video_data, $video_jsonld );
+		$jsonld['video']     = $this->merge_video_data($previous_video_data, $video_jsonld);
 
 		return $jsonld;
 	}
@@ -122,18 +122,18 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_videos_jsonld( $post_id ) {
+	public function get_videos_jsonld($post_id) {
 
-		$videos = $this->video_storage->get_all_videos( $post_id );
+		$videos = $this->video_storage->get_all_videos($post_id);
 
 		$jsonld = array();
 
-		foreach ( $videos as $video ) {
+		foreach ($videos as $video) {
 			/**
 			 * @var $video Video
 			 */
 			$description = $video->description;
-			if ( ! $video->description ) {
+			if ( ! $video->description) {
 				// If description is empty then use the video title as description
 				$description = $video->name;
 			}
@@ -148,11 +148,11 @@ 
 				'duration'     => $video->duration,
 			);
 
-			if ( $video->embed_url ) {
+			if ($video->embed_url) {
 				$single_jsonld['embedUrl'] = $video->embed_url;
 			}
 
-			if ( $video->views ) {
+			if ($video->views) {
 				$single_jsonld['interactionStatistic'] = array(
 					'@type'                => 'InteractionCounter',
 					'interactionType'      => array(
@@ -162,7 +162,7 @@ 
 				);
 			}
 
-			if ( $video->is_live_video ) {
+			if ($video->is_live_video) {
 				$single_jsonld['publication'] = array(
 					'@type'           => 'BroadcastEvent',
 					'isLiveBroadcast' => true,
@@ -178,12 +178,12 @@ 
 	}
 
 
-	private function is_associative_array( $arr ) {
-		if ( array() === $arr ) {
+	private function is_associative_array($arr) {
+		if (array() === $arr) {
 			return false;
 		}
 
-		return array_keys( $arr ) !== range( 0, count( $arr ) - 1 );
+		return array_keys($arr) !== range(0, count($arr) - 1);
 	}
 
 

src/admin/partials/admin-setup/step-4.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
 <!-- Pane 4 content -->
 <script type="text/html" id="page-3">
     <h2 class="page-title">
-		<?php esc_html_e( 'Vocabulary', 'wordlift' ); ?>
+		<?php esc_html_e('Vocabulary', 'wordlift'); ?>
     </h2>
 
     <p class="page-txt">
-		<?php esc_html_e( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift' ); ?>
+		<?php esc_html_e('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift'); ?>
     </p>
 
     <input
@@ -19,8 +19,8 @@ 
     >
 
     <p class="page-det">
-		<?php esc_html_e( 'Leave it empty to place your entities in the root folder of your website', 'wordlift' ); ?>
-		<?php esc_html_e( ' (requires the permalink settings to be set to Post name)', 'wordlift' ); ?>
+		<?php esc_html_e('Leave it empty to place your entities in the root folder of your website', 'wordlift'); ?>
+		<?php esc_html_e(' (requires the permalink settings to be set to Post name)', 'wordlift'); ?>
     </p>
 
     <div class="btn-wrapper">
@@ -28,7 +28,7 @@ 
                 type="button"
                 data-wl-next="wl-next"
                 class="wl-default-action"
-                value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+                value="<?php esc_attr_e('Next', 'wordlift'); ?>"
         >
     </div>
 </script>

src/admin/partials/admin-setup/step-3.php

Indentation +15 added lines, -15 removed lines

@@ -6,22 +6,22 @@
 
 	<p class="page-txt">
 		<?php
-		$grab_a_key_link_html = sprintf(
-			'<a target="_blank" href="%s">%s</a>',
-			esc_attr__( 'https://wordlift.io/pricing/?utm_campaign=wl_activation_grab_the_key', 'wordlift' ),
-			esc_html__( 'grab a key', 'wordlift' )
-		);
+        $grab_a_key_link_html = sprintf(
+            '<a target="_blank" href="%s">%s</a>',
+            esc_attr__( 'https://wordlift.io/pricing/?utm_campaign=wl_activation_grab_the_key', 'wordlift' ),
+            esc_html__( 'grab a key', 'wordlift' )
+        );
 
-		echo sprintf(
-			esc_html__(
-				'If you already purchased a plan, check your email, get the'
-				. ' activation key from your inbox and insert it in the'
-				. ' field below. Otherwise %s!',
-				'wordlift'
-			),
-			 $grab_a_key_link_html
-		);
-		?>
+        echo sprintf(
+            esc_html__(
+                'If you already purchased a plan, check your email, get the'
+                . ' activation key from your inbox and insert it in the'
+                . ' field below. Otherwise %s!',
+                'wordlift'
+            ),
+                $grab_a_key_link_html
+        );
+        ?>
 	</p>
 	<input
 		type="text"

Spacing +6 added lines, -6 removed lines

@@ -1,15 +1,15 @@ 
 <!-- Pane 3 content -->
 <script type="text/html" id="page-2">
 	<h2 class="page-title">
-		<?php esc_html_e( 'License Key', 'wordlift' ); ?>
+		<?php esc_html_e('License Key', 'wordlift'); ?>
 	</h2>
 
 	<p class="page-txt">
 		<?php
 		$grab_a_key_link_html = sprintf(
 			'<a target="_blank" href="%s">%s</a>',
-			esc_attr__( 'https://wordlift.io/pricing/?utm_campaign=wl_activation_grab_the_key', 'wordlift' ),
-			esc_html__( 'grab a key', 'wordlift' )
+			esc_attr__('https://wordlift.io/pricing/?utm_campaign=wl_activation_grab_the_key', 'wordlift'),
+			esc_html__('grab a key', 'wordlift')
 		);
 
 		echo sprintf(
@@ -31,7 +31,7 @@ 
 		name="key"
 		value=""
 		autocomplete="off"
-		placeholder="<?php echo esc_attr_x( 'License Key', 'Input text placeholder', 'wordlift' ); ?>"
+		placeholder="<?php echo esc_attr_x('License Key', 'Input text placeholder', 'wordlift'); ?>"
 	>
 	<div>
         <p class="wl-val-key-error">
@@ -44,7 +44,7 @@ 
 			target="_tab"
 			class="button wl-default-action"
 		>
-			<?php esc_html_e( 'Grab a Key!', 'wordlift' ); ?>
+			<?php esc_html_e('Grab a Key!', 'wordlift'); ?>
 		</a>
 
 		<input
@@ -52,7 +52,7 @@ 
 			type="button"
 			data-wl-next="wl-next"
 			class="button"
-			value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/admin-setup/step-1.php

Spacing +10 added lines, -10 removed lines

@@ -1,42 +1,42 @@ 
 <!-- Pane 1 content -->
 <script type="text/html" id="page-0">
     <h2 class="page-title">
-		<?php esc_html_e( 'Welcome', 'wordlift' ); ?>
+		<?php esc_html_e('Welcome', 'wordlift'); ?>
     </h2>
 
     <p class="page-txt">
-		<?php esc_html_e( 'Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift' ); ?>
+		<?php esc_html_e('Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift'); ?>
     </p>
 
     <ul class="page-list">
         <li>
             <span class="fa fa-university"></span>
-			<?php esc_html_e( 'Trustworthiness', 'wordlift' ); ?>
+			<?php esc_html_e('Trustworthiness', 'wordlift'); ?>
         </li>
 
         <li>
             <span class="fa fa-map-marker"></span>
-			<?php esc_html_e( 'Enrichment', 'wordlift' ); ?>
+			<?php esc_html_e('Enrichment', 'wordlift'); ?>
         </li>
 
         <li>
             <span class="fa fa-heart"></span>
-			<?php esc_html_e( 'Engagement', 'wordlift' ); ?>
+			<?php esc_html_e('Engagement', 'wordlift'); ?>
         </li>
 
         <li>
             <span class="fa fa-hand-o-right"></span>
-			<?php esc_html_e( 'Smart Navigation', 'wordlift' ); ?>
+			<?php esc_html_e('Smart Navigation', 'wordlift'); ?>
         </li>
 
         <li>
             <span class="fa fa-google"></span>
-			<?php esc_html_e( 'SEO Optimization', 'wordlift' ); ?>
+			<?php esc_html_e('SEO Optimization', 'wordlift'); ?>
         </li>
 
         <li>
             <span class="fa fa-group"></span>
-			<?php esc_html_e( 'Content Marketing', 'wordlift' ); ?>
+			<?php esc_html_e('Content Marketing', 'wordlift'); ?>
         </li>
     </ul>
 
@@ -46,13 +46,13 @@ 
                 target="_tab"
                 class="button"
         >
-			<?php esc_html_e( 'Learn More', 'wordlift' ); ?>
+			<?php esc_html_e('Learn More', 'wordlift'); ?>
         </a>
         <input
                 type="button"
                 data-wl-next="wl-next"
                 class="wl-default-action"
-                value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+                value="<?php esc_attr_e('Next', 'wordlift'); ?>"
         >
     </div>
 </script>
\ No newline at end of file