insideout10 / wordlift-plugin

src/ext/dependencies/deliciousbrains/wp-background-processing/classes/wp-background-process.php

Doc Comments +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	/**
 	 * Push to queue
 	 *
-	 * @param mixed $data Data.
+	 * @param string|null $data Data.
 	 *
 	 * @return $this
 	 */

Indentation +476 added lines, -476 removed lines

@@ -13,264 +13,264 @@ 
  */
 abstract class Wordlift_Plugin_WP_Background_Process extends Wordlift_Plugin_WP_Async_Request {
 
-	/**
-	 * Action
-	 *
-	 * (default value: 'background_process')
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $action = 'background_process';
-
-	/**
-	 * Start time of current process.
-	 *
-	 * (default value: 0)
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $start_time = 0;
-
-	/**
-	 * Cron_hook_identifier
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $cron_hook_identifier;
-
-	/**
-	 * Cron_interval_identifier
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $cron_interval_identifier;
-
-	/**
-	 * Initiate new background process
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		$this->cron_hook_identifier     = $this->identifier . '_cron';
-		$this->cron_interval_identifier = $this->identifier . '_cron_interval';
-
-		add_action( $this->cron_hook_identifier, array( $this, 'handle_cron_healthcheck' ) );
-		add_filter( 'cron_schedules', array( $this, 'schedule_cron_healthcheck' ) );
-	}
-
-	/**
-	 * Dispatch
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function dispatch() {
-		// Schedule the cron healthcheck.
-		$this->schedule_event();
-
-		// Perform remote post.
-		return parent::dispatch();
-	}
-
-	/**
-	 * Push to queue
-	 *
-	 * @param mixed $data Data.
-	 *
-	 * @return $this
-	 */
-	public function push_to_queue( $data ) {
-		$this->data[] = $data;
-
-		return $this;
-	}
-
-	/**
-	 * Save queue
-	 *
-	 * @return $this
-	 */
-	public function save() {
-		$key = $this->generate_key();
-
-		if ( ! empty( $this->data ) ) {
-			update_site_option( $key, $this->data );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Update queue
-	 *
-	 * @param string $key  Key.
-	 * @param array  $data Data.
-	 *
-	 * @return $this
-	 */
-	public function update( $key, $data ) {
-		if ( ! empty( $data ) ) {
-			update_site_option( $key, $data );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Delete queue
-	 *
-	 * @param string $key Key.
-	 *
-	 * @return $this
-	 */
-	public function delete( $key ) {
-		delete_site_option( $key );
-
-		return $this;
-	}
-
-	/**
-	 * Generate key
-	 *
-	 * Generates a unique key based on microtime. Queue items are
-	 * given a unique key so that they can be merged upon save.
-	 *
-	 * @param int $length Length.
-	 *
-	 * @return string
-	 */
-	protected function generate_key( $length = 64 ) {
-		$unique  = md5( microtime() . rand() );
-		$prepend = $this->identifier . '_batch_';
-
-		return substr( $prepend . $unique, 0, $length );
-	}
-
-	/**
-	 * Maybe process queue
-	 *
-	 * Checks whether data exists within the queue and that
-	 * the process is not already running.
-	 */
-	public function maybe_handle() {
-		// Don't lock up other requests while processing
-		session_write_close();
-
-		if ( $this->is_process_running() ) {
-			// Background process already running.
-			wp_die();
-		}
-
-		if ( $this->is_queue_empty() ) {
-			// No data to process.
-			wp_die();
-		}
-
-		check_ajax_referer( $this->identifier, 'nonce' );
-
-		$this->handle();
-
-		wp_die();
-	}
-
-	/**
-	 * Is queue empty
-	 *
-	 * @return bool
-	 */
-	protected function is_queue_empty() {
-		global $wpdb;
-
-		$table  = $wpdb->options;
-		$column = 'option_name';
-
-		if ( is_multisite() ) {
-			$table  = $wpdb->sitemeta;
-			$column = 'meta_key';
-		}
-
-		$key = $wpdb->esc_like( $this->identifier . '_batch_' ) . '%';
-
-		$count = $wpdb->get_var( $wpdb->prepare( "
+    /**
+     * Action
+     *
+     * (default value: 'background_process')
+     *
+     * @var string
+     * @access protected
+     */
+    protected $action = 'background_process';
+
+    /**
+     * Start time of current process.
+     *
+     * (default value: 0)
+     *
+     * @var int
+     * @access protected
+     */
+    protected $start_time = 0;
+
+    /**
+     * Cron_hook_identifier
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $cron_hook_identifier;
+
+    /**
+     * Cron_interval_identifier
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $cron_interval_identifier;
+
+    /**
+     * Initiate new background process
+     */
+    public function __construct() {
+        parent::__construct();
+
+        $this->cron_hook_identifier     = $this->identifier . '_cron';
+        $this->cron_interval_identifier = $this->identifier . '_cron_interval';
+
+        add_action( $this->cron_hook_identifier, array( $this, 'handle_cron_healthcheck' ) );
+        add_filter( 'cron_schedules', array( $this, 'schedule_cron_healthcheck' ) );
+    }
+
+    /**
+     * Dispatch
+     *
+     * @access public
+     * @return void
+     */
+    public function dispatch() {
+        // Schedule the cron healthcheck.
+        $this->schedule_event();
+
+        // Perform remote post.
+        return parent::dispatch();
+    }
+
+    /**
+     * Push to queue
+     *
+     * @param mixed $data Data.
+     *
+     * @return $this
+     */
+    public function push_to_queue( $data ) {
+        $this->data[] = $data;
+
+        return $this;
+    }
+
+    /**
+     * Save queue
+     *
+     * @return $this
+     */
+    public function save() {
+        $key = $this->generate_key();
+
+        if ( ! empty( $this->data ) ) {
+            update_site_option( $key, $this->data );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Update queue
+     *
+     * @param string $key  Key.
+     * @param array  $data Data.
+     *
+     * @return $this
+     */
+    public function update( $key, $data ) {
+        if ( ! empty( $data ) ) {
+            update_site_option( $key, $data );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Delete queue
+     *
+     * @param string $key Key.
+     *
+     * @return $this
+     */
+    public function delete( $key ) {
+        delete_site_option( $key );
+
+        return $this;
+    }
+
+    /**
+     * Generate key
+     *
+     * Generates a unique key based on microtime. Queue items are
+     * given a unique key so that they can be merged upon save.
+     *
+     * @param int $length Length.
+     *
+     * @return string
+     */
+    protected function generate_key( $length = 64 ) {
+        $unique  = md5( microtime() . rand() );
+        $prepend = $this->identifier . '_batch_';
+
+        return substr( $prepend . $unique, 0, $length );
+    }
+
+    /**
+     * Maybe process queue
+     *
+     * Checks whether data exists within the queue and that
+     * the process is not already running.
+     */
+    public function maybe_handle() {
+        // Don't lock up other requests while processing
+        session_write_close();
+
+        if ( $this->is_process_running() ) {
+            // Background process already running.
+            wp_die();
+        }
+
+        if ( $this->is_queue_empty() ) {
+            // No data to process.
+            wp_die();
+        }
+
+        check_ajax_referer( $this->identifier, 'nonce' );
+
+        $this->handle();
+
+        wp_die();
+    }
+
+    /**
+     * Is queue empty
+     *
+     * @return bool
+     */
+    protected function is_queue_empty() {
+        global $wpdb;
+
+        $table  = $wpdb->options;
+        $column = 'option_name';
+
+        if ( is_multisite() ) {
+            $table  = $wpdb->sitemeta;
+            $column = 'meta_key';
+        }
+
+        $key = $wpdb->esc_like( $this->identifier . '_batch_' ) . '%';
+
+        $count = $wpdb->get_var( $wpdb->prepare( "
 			SELECT COUNT(*)
 			FROM {$table}
 			WHERE {$column} LIKE %s
 		", $key ) );
 
-		return ( $count > 0 ) ? false : true;
-	}
-
-	/**
-	 * Is process running
-	 *
-	 * Check whether the current process is already running
-	 * in a background process.
-	 */
-	protected function is_process_running() {
-		if ( get_site_transient( $this->identifier . '_process_lock' ) ) {
-			// Process already running.
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Lock process
-	 *
-	 * Lock the process so that multiple instances can't run simultaneously.
-	 * Override if applicable, but the duration should be greater than that
-	 * defined in the time_exceeded() method.
-	 */
-	protected function lock_process() {
-		$this->start_time = time(); // Set start time of current process.
-
-		$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
-		$lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
-
-		set_site_transient( $this->identifier . '_process_lock', microtime(), $lock_duration );
-	}
-
-	/**
-	 * Unlock process
-	 *
-	 * Unlock the process so that other instances can spawn.
-	 *
-	 * @return $this
-	 */
-	protected function unlock_process() {
-		delete_site_transient( $this->identifier . '_process_lock' );
-
-		return $this;
-	}
-
-	/**
-	 * Get batch
-	 *
-	 * @return stdClass Return the first batch from the queue
-	 */
-	protected function get_batch() {
-		global $wpdb;
-
-		$table        = $wpdb->options;
-		$column       = 'option_name';
-		$key_column   = 'option_id';
-		$value_column = 'option_value';
-
-		if ( is_multisite() ) {
-			$table        = $wpdb->sitemeta;
-			$column       = 'meta_key';
-			$key_column   = 'meta_id';
-			$value_column = 'meta_value';
-		}
-
-		$key = $wpdb->esc_like( $this->identifier . '_batch_' ) . '%';
-
-		$query = $wpdb->get_row( $wpdb->prepare( "
+        return ( $count > 0 ) ? false : true;
+    }
+
+    /**
+     * Is process running
+     *
+     * Check whether the current process is already running
+     * in a background process.
+     */
+    protected function is_process_running() {
+        if ( get_site_transient( $this->identifier . '_process_lock' ) ) {
+            // Process already running.
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Lock process
+     *
+     * Lock the process so that multiple instances can't run simultaneously.
+     * Override if applicable, but the duration should be greater than that
+     * defined in the time_exceeded() method.
+     */
+    protected function lock_process() {
+        $this->start_time = time(); // Set start time of current process.
+
+        $lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
+        $lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
+
+        set_site_transient( $this->identifier . '_process_lock', microtime(), $lock_duration );
+    }
+
+    /**
+     * Unlock process
+     *
+     * Unlock the process so that other instances can spawn.
+     *
+     * @return $this
+     */
+    protected function unlock_process() {
+        delete_site_transient( $this->identifier . '_process_lock' );
+
+        return $this;
+    }
+
+    /**
+     * Get batch
+     *
+     * @return stdClass Return the first batch from the queue
+     */
+    protected function get_batch() {
+        global $wpdb;
+
+        $table        = $wpdb->options;
+        $column       = 'option_name';
+        $key_column   = 'option_id';
+        $value_column = 'option_value';
+
+        if ( is_multisite() ) {
+            $table        = $wpdb->sitemeta;
+            $column       = 'meta_key';
+            $key_column   = 'meta_id';
+            $value_column = 'meta_value';
+        }
+
+        $key = $wpdb->esc_like( $this->identifier . '_batch_' ) . '%';
+
+        $query = $wpdb->get_row( $wpdb->prepare( "
 			SELECT *
 			FROM {$table}
 			WHERE {$column} LIKE %s
@@ -278,228 +278,228 @@ 
 			LIMIT 1
 		", $key ) );
 
-		$batch       = new stdClass();
-		$batch->key  = $query->$column;
-		$batch->data = maybe_unserialize( $query->$value_column );
-
-		return $batch;
-	}
-
-	/**
-	 * Handle
-	 *
-	 * Pass each queue item to the task handler, while remaining
-	 * within server memory and time limit constraints.
-	 */
-	protected function handle() {
-		$this->lock_process();
-
-		do {
-			$batch = $this->get_batch();
-
-			foreach ( $batch->data as $key => $value ) {
-				$task = $this->task( $value );
-
-				if ( false !== $task ) {
-					$batch->data[ $key ] = $task;
-				} else {
-					unset( $batch->data[ $key ] );
-				}
-
-				if ( $this->time_exceeded() || $this->memory_exceeded() ) {
-					// Batch limits reached.
-					break;
-				}
-			}
-
-			// Update or delete current batch.
-			if ( ! empty( $batch->data ) ) {
-				$this->update( $batch->key, $batch->data );
-			} else {
-				$this->delete( $batch->key );
-			}
-		} while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty() );
-
-		$this->unlock_process();
-
-		// Start next batch or complete process.
-		if ( ! $this->is_queue_empty() ) {
-			$this->dispatch();
-		} else {
-			$this->complete();
-		}
-
-		wp_die();
-	}
-
-	/**
-	 * Memory exceeded
-	 *
-	 * Ensures the batch process never exceeds 90%
-	 * of the maximum WordPress memory.
-	 *
-	 * @return bool
-	 */
-	protected function memory_exceeded() {
-		$memory_limit   = $this->get_memory_limit() * 0.9; // 90% of max memory
-		$current_memory = memory_get_usage( true );
-		$return         = false;
-
-		if ( $current_memory >= $memory_limit ) {
-			$return = true;
-		}
-
-		return apply_filters( $this->identifier . '_memory_exceeded', $return );
-	}
-
-	/**
-	 * Get memory limit
-	 *
-	 * @return int
-	 */
-	protected function get_memory_limit() {
-		if ( function_exists( 'ini_get' ) ) {
-			$memory_limit = ini_get( 'memory_limit' );
-		} else {
-			// Sensible default.
-			$memory_limit = '128M';
-		}
-
-		if ( ! $memory_limit || - 1 === intval( $memory_limit ) ) {
-			// Unlimited, set to 32GB.
-			$memory_limit = '32000M';
-		}
-
-		return wp_convert_hr_to_bytes( $memory_limit );
-	}
-
-	/**
-	 * Time exceeded.
-	 *
-	 * Ensures the batch never exceeds a sensible time limit.
-	 * A timeout limit of 30s is common on shared hosting.
-	 *
-	 * @return bool
-	 */
-	protected function time_exceeded() {
-		$finish = $this->start_time + apply_filters( $this->identifier . '_default_time_limit', 20 ); // 20 seconds
-		$return = false;
-
-		if ( time() >= $finish ) {
-			$return = true;
-		}
-
-		return apply_filters( $this->identifier . '_time_exceeded', $return );
-	}
-
-	/**
-	 * Complete.
-	 *
-	 * Override if applicable, but ensure that the below actions are
-	 * performed, or, call parent::complete().
-	 */
-	protected function complete() {
-		// Unschedule the cron healthcheck.
-		$this->clear_scheduled_event();
-	}
-
-	/**
-	 * Schedule cron healthcheck
-	 *
-	 * @access public
-	 *
-	 * @param mixed $schedules Schedules.
-	 *
-	 * @return mixed
-	 */
-	public function schedule_cron_healthcheck( $schedules ) {
-		$interval = apply_filters( $this->identifier . '_cron_interval', 5 );
-
-		if ( property_exists( $this, 'cron_interval' ) ) {
-			$interval = apply_filters( $this->identifier . '_cron_interval', $this->cron_interval );
-		}
-
-		// Adds every 5 minutes to the existing schedules.
-		$schedules[ $this->identifier . '_cron_interval' ] = array(
-			'interval' => MINUTE_IN_SECONDS * $interval,
-			'display'  => sprintf( __( 'Every %d Minutes' ), $interval ),
-		);
-
-		return $schedules;
-	}
-
-	/**
-	 * Handle cron healthcheck
-	 *
-	 * Restart the background process if not already running
-	 * and data exists in the queue.
-	 */
-	public function handle_cron_healthcheck() {
-		if ( $this->is_process_running() ) {
-			// Background process already running.
-			exit;
-		}
-
-		if ( $this->is_queue_empty() ) {
-			// No data to process.
-			$this->clear_scheduled_event();
-			exit;
-		}
-
-		$this->handle();
-
-		exit;
-	}
-
-	/**
-	 * Schedule event
-	 */
-	protected function schedule_event() {
-		if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
-			wp_schedule_event( time(), $this->cron_interval_identifier, $this->cron_hook_identifier );
-		}
-	}
-
-	/**
-	 * Clear scheduled event
-	 */
-	protected function clear_scheduled_event() {
-		$timestamp = wp_next_scheduled( $this->cron_hook_identifier );
-
-		if ( $timestamp ) {
-			wp_unschedule_event( $timestamp, $this->cron_hook_identifier );
-		}
-	}
-
-	/**
-	 * Cancel Process
-	 *
-	 * Stop processing queue items, clear cronjob and delete batch.
-	 *
-	 */
-	public function cancel_process() {
-		if ( ! $this->is_queue_empty() ) {
-			$batch = $this->get_batch();
-
-			$this->delete( $batch->key );
-
-			wp_clear_scheduled_hook( $this->cron_hook_identifier );
-		}
-
-	}
-
-	/**
-	 * Task
-	 *
-	 * Override this method to perform any actions required on each
-	 * queue item. Return the modified item for further processing
-	 * in the next pass through. Or, return false to remove the
-	 * item from the queue.
-	 *
-	 * @param mixed $item Queue item to iterate over.
-	 *
-	 * @return mixed
-	 */
-	abstract protected function task( $item );
+        $batch       = new stdClass();
+        $batch->key  = $query->$column;
+        $batch->data = maybe_unserialize( $query->$value_column );
+
+        return $batch;
+    }
+
+    /**
+     * Handle
+     *
+     * Pass each queue item to the task handler, while remaining
+     * within server memory and time limit constraints.
+     */
+    protected function handle() {
+        $this->lock_process();
+
+        do {
+            $batch = $this->get_batch();
+
+            foreach ( $batch->data as $key => $value ) {
+                $task = $this->task( $value );
+
+                if ( false !== $task ) {
+                    $batch->data[ $key ] = $task;
+                } else {
+                    unset( $batch->data[ $key ] );
+                }
+
+                if ( $this->time_exceeded() || $this->memory_exceeded() ) {
+                    // Batch limits reached.
+                    break;
+                }
+            }
+
+            // Update or delete current batch.
+            if ( ! empty( $batch->data ) ) {
+                $this->update( $batch->key, $batch->data );
+            } else {
+                $this->delete( $batch->key );
+            }
+        } while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty() );
+
+        $this->unlock_process();
+
+        // Start next batch or complete process.
+        if ( ! $this->is_queue_empty() ) {
+            $this->dispatch();
+        } else {
+            $this->complete();
+        }
+
+        wp_die();
+    }
+
+    /**
+     * Memory exceeded
+     *
+     * Ensures the batch process never exceeds 90%
+     * of the maximum WordPress memory.
+     *
+     * @return bool
+     */
+    protected function memory_exceeded() {
+        $memory_limit   = $this->get_memory_limit() * 0.9; // 90% of max memory
+        $current_memory = memory_get_usage( true );
+        $return         = false;
+
+        if ( $current_memory >= $memory_limit ) {
+            $return = true;
+        }
+
+        return apply_filters( $this->identifier . '_memory_exceeded', $return );
+    }
+
+    /**
+     * Get memory limit
+     *
+     * @return int
+     */
+    protected function get_memory_limit() {
+        if ( function_exists( 'ini_get' ) ) {
+            $memory_limit = ini_get( 'memory_limit' );
+        } else {
+            // Sensible default.
+            $memory_limit = '128M';
+        }
+
+        if ( ! $memory_limit || - 1 === intval( $memory_limit ) ) {
+            // Unlimited, set to 32GB.
+            $memory_limit = '32000M';
+        }
+
+        return wp_convert_hr_to_bytes( $memory_limit );
+    }
+
+    /**
+     * Time exceeded.
+     *
+     * Ensures the batch never exceeds a sensible time limit.
+     * A timeout limit of 30s is common on shared hosting.
+     *
+     * @return bool
+     */
+    protected function time_exceeded() {
+        $finish = $this->start_time + apply_filters( $this->identifier . '_default_time_limit', 20 ); // 20 seconds
+        $return = false;
+
+        if ( time() >= $finish ) {
+            $return = true;
+        }
+
+        return apply_filters( $this->identifier . '_time_exceeded', $return );
+    }
+
+    /**
+     * Complete.
+     *
+     * Override if applicable, but ensure that the below actions are
+     * performed, or, call parent::complete().
+     */
+    protected function complete() {
+        // Unschedule the cron healthcheck.
+        $this->clear_scheduled_event();
+    }
+
+    /**
+     * Schedule cron healthcheck
+     *
+     * @access public
+     *
+     * @param mixed $schedules Schedules.
+     *
+     * @return mixed
+     */
+    public function schedule_cron_healthcheck( $schedules ) {
+        $interval = apply_filters( $this->identifier . '_cron_interval', 5 );
+
+        if ( property_exists( $this, 'cron_interval' ) ) {
+            $interval = apply_filters( $this->identifier . '_cron_interval', $this->cron_interval );
+        }
+
+        // Adds every 5 minutes to the existing schedules.
+        $schedules[ $this->identifier . '_cron_interval' ] = array(
+            'interval' => MINUTE_IN_SECONDS * $interval,
+            'display'  => sprintf( __( 'Every %d Minutes' ), $interval ),
+        );
+
+        return $schedules;
+    }
+
+    /**
+     * Handle cron healthcheck
+     *
+     * Restart the background process if not already running
+     * and data exists in the queue.
+     */
+    public function handle_cron_healthcheck() {
+        if ( $this->is_process_running() ) {
+            // Background process already running.
+            exit;
+        }
+
+        if ( $this->is_queue_empty() ) {
+            // No data to process.
+            $this->clear_scheduled_event();
+            exit;
+        }
+
+        $this->handle();
+
+        exit;
+    }
+
+    /**
+     * Schedule event
+     */
+    protected function schedule_event() {
+        if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
+            wp_schedule_event( time(), $this->cron_interval_identifier, $this->cron_hook_identifier );
+        }
+    }
+
+    /**
+     * Clear scheduled event
+     */
+    protected function clear_scheduled_event() {
+        $timestamp = wp_next_scheduled( $this->cron_hook_identifier );
+
+        if ( $timestamp ) {
+            wp_unschedule_event( $timestamp, $this->cron_hook_identifier );
+        }
+    }
+
+    /**
+     * Cancel Process
+     *
+     * Stop processing queue items, clear cronjob and delete batch.
+     *
+     */
+    public function cancel_process() {
+        if ( ! $this->is_queue_empty() ) {
+            $batch = $this->get_batch();
+
+            $this->delete( $batch->key );
+
+            wp_clear_scheduled_hook( $this->cron_hook_identifier );
+        }
+
+    }
+
+    /**
+     * Task
+     *
+     * Override this method to perform any actions required on each
+     * queue item. Return the modified item for further processing
+     * in the next pass through. Or, return false to remove the
+     * item from the queue.
+     *
+     * @param mixed $item Queue item to iterate over.
+     *
+     * @return mixed
+     */
+    abstract protected function task( $item );
 
 }
\ No newline at end of file

Spacing +72 added lines, -72 removed lines

@@ -55,11 +55,11 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->cron_hook_identifier     = $this->identifier . '_cron';
-		$this->cron_interval_identifier = $this->identifier . '_cron_interval';
+		$this->cron_hook_identifier     = $this->identifier.'_cron';
+		$this->cron_interval_identifier = $this->identifier.'_cron_interval';
 
-		add_action( $this->cron_hook_identifier, array( $this, 'handle_cron_healthcheck' ) );
-		add_filter( 'cron_schedules', array( $this, 'schedule_cron_healthcheck' ) );
+		add_action($this->cron_hook_identifier, array($this, 'handle_cron_healthcheck'));
+		add_filter('cron_schedules', array($this, 'schedule_cron_healthcheck'));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function push_to_queue( $data ) {
+	public function push_to_queue($data) {
 		$this->data[] = $data;
 
 		return $this;
@@ -97,8 +97,8 @@ 
 	public function save() {
 		$key = $this->generate_key();
 
-		if ( ! empty( $this->data ) ) {
-			update_site_option( $key, $this->data );
+		if ( ! empty($this->data)) {
+			update_site_option($key, $this->data);
 		}
 
 		return $this;
@@ -112,9 +112,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function update( $key, $data ) {
-		if ( ! empty( $data ) ) {
-			update_site_option( $key, $data );
+	public function update($key, $data) {
+		if ( ! empty($data)) {
+			update_site_option($key, $data);
 		}
 
 		return $this;
@@ -127,8 +127,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function delete( $key ) {
-		delete_site_option( $key );
+	public function delete($key) {
+		delete_site_option($key);
 
 		return $this;
 	}
@@ -143,11 +143,11 @@ 
 	 *
 	 * @return string
 	 */
-	protected function generate_key( $length = 64 ) {
-		$unique  = md5( microtime() . rand() );
-		$prepend = $this->identifier . '_batch_';
+	protected function generate_key($length = 64) {
+		$unique  = md5(microtime().rand());
+		$prepend = $this->identifier.'_batch_';
 
-		return substr( $prepend . $unique, 0, $length );
+		return substr($prepend.$unique, 0, $length);
 	}
 
 	/**
@@ -160,17 +160,17 @@ 
 		// Don't lock up other requests while processing
 		session_write_close();
 
-		if ( $this->is_process_running() ) {
+		if ($this->is_process_running()) {
 			// Background process already running.
 			wp_die();
 		}
 
-		if ( $this->is_queue_empty() ) {
+		if ($this->is_queue_empty()) {
 			// No data to process.
 			wp_die();
 		}
 
-		check_ajax_referer( $this->identifier, 'nonce' );
+		check_ajax_referer($this->identifier, 'nonce');
 
 		$this->handle();
 
@@ -188,20 +188,20 @@ 
 		$table  = $wpdb->options;
 		$column = 'option_name';
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$table  = $wpdb->sitemeta;
 			$column = 'meta_key';
 		}
 
-		$key = $wpdb->esc_like( $this->identifier . '_batch_' ) . '%';
+		$key = $wpdb->esc_like($this->identifier.'_batch_').'%';
 
-		$count = $wpdb->get_var( $wpdb->prepare( "
+		$count = $wpdb->get_var($wpdb->prepare("
 			SELECT COUNT(*)
 			FROM {$table}
 			WHERE {$column} LIKE %s
-		", $key ) );
+		", $key));
 
-		return ( $count > 0 ) ? false : true;
+		return ($count > 0) ? false : true;
 	}
 
 	/**
@@ -211,7 +211,7 @@ 
 	 * in a background process.
 	 */
 	protected function is_process_running() {
-		if ( get_site_transient( $this->identifier . '_process_lock' ) ) {
+		if (get_site_transient($this->identifier.'_process_lock')) {
 			// Process already running.
 			return true;
 		}
@@ -229,10 +229,10 @@ 
 	protected function lock_process() {
 		$this->start_time = time(); // Set start time of current process.
 
-		$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
-		$lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
+		$lock_duration = (property_exists($this, 'queue_lock_time')) ? $this->queue_lock_time : 60; // 1 minute
+		$lock_duration = apply_filters($this->identifier.'_queue_lock_time', $lock_duration);
 
-		set_site_transient( $this->identifier . '_process_lock', microtime(), $lock_duration );
+		set_site_transient($this->identifier.'_process_lock', microtime(), $lock_duration);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @return $this
 	 */
 	protected function unlock_process() {
-		delete_site_transient( $this->identifier . '_process_lock' );
+		delete_site_transient($this->identifier.'_process_lock');
 
 		return $this;
 	}
@@ -261,26 +261,26 @@ 
 		$key_column   = 'option_id';
 		$value_column = 'option_value';
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$table        = $wpdb->sitemeta;
 			$column       = 'meta_key';
 			$key_column   = 'meta_id';
 			$value_column = 'meta_value';
 		}
 
-		$key = $wpdb->esc_like( $this->identifier . '_batch_' ) . '%';
+		$key = $wpdb->esc_like($this->identifier.'_batch_').'%';
 
-		$query = $wpdb->get_row( $wpdb->prepare( "
+		$query = $wpdb->get_row($wpdb->prepare("
 			SELECT *
 			FROM {$table}
 			WHERE {$column} LIKE %s
 			ORDER BY {$key_column} ASC
 			LIMIT 1
-		", $key ) );
+		", $key));
 
 		$batch       = new stdClass();
 		$batch->key  = $query->$column;
-		$batch->data = maybe_unserialize( $query->$value_column );
+		$batch->data = maybe_unserialize($query->$value_column);
 
 		return $batch;
 	}
@@ -297,33 +297,33 @@ 
 		do {
 			$batch = $this->get_batch();
 
-			foreach ( $batch->data as $key => $value ) {
-				$task = $this->task( $value );
+			foreach ($batch->data as $key => $value) {
+				$task = $this->task($value);
 
-				if ( false !== $task ) {
-					$batch->data[ $key ] = $task;
+				if (false !== $task) {
+					$batch->data[$key] = $task;
 				} else {
-					unset( $batch->data[ $key ] );
+					unset($batch->data[$key]);
 				}
 
-				if ( $this->time_exceeded() || $this->memory_exceeded() ) {
+				if ($this->time_exceeded() || $this->memory_exceeded()) {
 					// Batch limits reached.
 					break;
 				}
 			}
 
 			// Update or delete current batch.
-			if ( ! empty( $batch->data ) ) {
-				$this->update( $batch->key, $batch->data );
+			if ( ! empty($batch->data)) {
+				$this->update($batch->key, $batch->data);
 			} else {
-				$this->delete( $batch->key );
+				$this->delete($batch->key);
 			}
-		} while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty() );
+		} while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty());
 
 		$this->unlock_process();
 
 		// Start next batch or complete process.
-		if ( ! $this->is_queue_empty() ) {
+		if ( ! $this->is_queue_empty()) {
 			$this->dispatch();
 		} else {
 			$this->complete();
@@ -342,14 +342,14 @@ 
 	 */
 	protected function memory_exceeded() {
 		$memory_limit   = $this->get_memory_limit() * 0.9; // 90% of max memory
-		$current_memory = memory_get_usage( true );
+		$current_memory = memory_get_usage(true);
 		$return         = false;
 
-		if ( $current_memory >= $memory_limit ) {
+		if ($current_memory >= $memory_limit) {
 			$return = true;
 		}
 
-		return apply_filters( $this->identifier . '_memory_exceeded', $return );
+		return apply_filters($this->identifier.'_memory_exceeded', $return);
 	}
 
 	/**
@@ -358,19 +358,19 @@ 
 	 * @return int
 	 */
 	protected function get_memory_limit() {
-		if ( function_exists( 'ini_get' ) ) {
-			$memory_limit = ini_get( 'memory_limit' );
+		if (function_exists('ini_get')) {
+			$memory_limit = ini_get('memory_limit');
 		} else {
 			// Sensible default.
 			$memory_limit = '128M';
 		}
 
-		if ( ! $memory_limit || - 1 === intval( $memory_limit ) ) {
+		if ( ! $memory_limit || - 1 === intval($memory_limit)) {
 			// Unlimited, set to 32GB.
 			$memory_limit = '32000M';
 		}
 
-		return wp_convert_hr_to_bytes( $memory_limit );
+		return wp_convert_hr_to_bytes($memory_limit);
 	}
 
 	/**
@@ -382,14 +382,14 @@ 
 	 * @return bool
 	 */
 	protected function time_exceeded() {
-		$finish = $this->start_time + apply_filters( $this->identifier . '_default_time_limit', 20 ); // 20 seconds
+		$finish = $this->start_time + apply_filters($this->identifier.'_default_time_limit', 20); // 20 seconds
 		$return = false;
 
-		if ( time() >= $finish ) {
+		if (time() >= $finish) {
 			$return = true;
 		}
 
-		return apply_filters( $this->identifier . '_time_exceeded', $return );
+		return apply_filters($this->identifier.'_time_exceeded', $return);
 	}
 
 	/**
@@ -412,17 +412,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function schedule_cron_healthcheck( $schedules ) {
-		$interval = apply_filters( $this->identifier . '_cron_interval', 5 );
+	public function schedule_cron_healthcheck($schedules) {
+		$interval = apply_filters($this->identifier.'_cron_interval', 5);
 
-		if ( property_exists( $this, 'cron_interval' ) ) {
-			$interval = apply_filters( $this->identifier . '_cron_interval', $this->cron_interval );
+		if (property_exists($this, 'cron_interval')) {
+			$interval = apply_filters($this->identifier.'_cron_interval', $this->cron_interval);
 		}
 
 		// Adds every 5 minutes to the existing schedules.
-		$schedules[ $this->identifier . '_cron_interval' ] = array(
+		$schedules[$this->identifier.'_cron_interval'] = array(
 			'interval' => MINUTE_IN_SECONDS * $interval,
-			'display'  => sprintf( __( 'Every %d Minutes' ), $interval ),
+			'display'  => sprintf(__('Every %d Minutes'), $interval),
 		);
 
 		return $schedules;
@@ -435,12 +435,12 @@ 
 	 * and data exists in the queue.
 	 */
 	public function handle_cron_healthcheck() {
-		if ( $this->is_process_running() ) {
+		if ($this->is_process_running()) {
 			// Background process already running.
 			exit;
 		}
 
-		if ( $this->is_queue_empty() ) {
+		if ($this->is_queue_empty()) {
 			// No data to process.
 			$this->clear_scheduled_event();
 			exit;
@@ -455,8 +455,8 @@ 
 	 * Schedule event
 	 */
 	protected function schedule_event() {
-		if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
-			wp_schedule_event( time(), $this->cron_interval_identifier, $this->cron_hook_identifier );
+		if ( ! wp_next_scheduled($this->cron_hook_identifier)) {
+			wp_schedule_event(time(), $this->cron_interval_identifier, $this->cron_hook_identifier);
 		}
 	}
 
@@ -464,10 +464,10 @@ 
 	 * Clear scheduled event
 	 */
 	protected function clear_scheduled_event() {
-		$timestamp = wp_next_scheduled( $this->cron_hook_identifier );
+		$timestamp = wp_next_scheduled($this->cron_hook_identifier);
 
-		if ( $timestamp ) {
-			wp_unschedule_event( $timestamp, $this->cron_hook_identifier );
+		if ($timestamp) {
+			wp_unschedule_event($timestamp, $this->cron_hook_identifier);
 		}
 	}
 
@@ -478,12 +478,12 @@ 
 	 *
 	 */
 	public function cancel_process() {
-		if ( ! $this->is_queue_empty() ) {
+		if ( ! $this->is_queue_empty()) {
 			$batch = $this->get_batch();
 
-			$this->delete( $batch->key );
+			$this->delete($batch->key);
 
-			wp_clear_scheduled_hook( $this->cron_hook_identifier );
+			wp_clear_scheduled_hook($this->cron_hook_identifier);
 		}
 
 	}
@@ -500,6 +500,6 @@ 
 	 *
 	 * @return mixed
 	 */
-	abstract protected function task( $item );
+	abstract protected function task($item);
 
 }
\ No newline at end of file

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

Doc Comments +3 added lines

@@ -70,6 +70,9 @@
 		return self::$instance;
 	}
 
+	/**
+	 * @param string $method
+	 */
 	public function request( $method, $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
 
 		// Get the timeout for this request.

Indentation +109 added lines, -109 removed lines

@@ -7,114 +7,114 @@
 namespace Wordlift\Api;
 
 class Default_Api_Service implements Api_Service {
-	/**
-	 * @var Default_Api_Service
-	 */
-	private static $instance;
-
-	/**
-	 * @var string
-	 */
-	private $wordlift_key;
-	/**
-	 * @var int
-	 */
-	private $timeout;
-
-	/**
-	 * @var string
-	 */
-	private $user_agent;
-
-	/**
-	 * @var array
-	 */
-	private $headers;
-	/**
-	 * @var string
-	 */
-	private $base_url;
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * Default_Api_Service constructor.
-	 *
-	 * @param string $base_url
-	 * @param int $timeout
-	 * @param string $user_agent
-	 * @param string $wordlift_key
-	 */
-	public function __construct( $base_url, $timeout, $user_agent, $wordlift_key ) {
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->base_url     = $base_url;
-		$this->timeout      = $timeout;
-		$this->user_agent   = $user_agent;
-		$this->wordlift_key = $wordlift_key;
-
-		$this->headers = array(
-			'Content-Type'  => 'application/json',
-			'Authorization' => "Key $wordlift_key",
-			'Expect'        => '',
-		);
-
-		self::$instance = $this;
-	}
-
-	public static function get_instance() {
-		return self::$instance;
-	}
-
-	public function request( $method, $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
-
-		// Get the timeout for this request.
-		$request_timeout = isset( $timeout ) ? $timeout : $this->timeout;
-
-		// Set the time limit if lesser than our request timeout.
-		$max_execution_time = ini_get( 'max_execution_time' );
-		if ( $max_execution_time < $request_timeout ) {
-			@set_time_limit( $request_timeout );
-		}
-
-		$request_url = $this->base_url . $url;
-
-		// Create the request args in the following order:
-		//  1. use `$args` as base if provided.
-		//  2. set the custom timeout if provided.
-		//  3. set the custom user-agent if provided.
-		//  4. merge the API headers to the provided headers.
-		//  5. add the body.
-		//
-		// In this way the user can fully control the request if wanted (using `$args`) and we can add our defaults.
-		$request_args = $args + array(
-				'method'     => $method,
-				'timeout'    => $request_timeout,
-				'user-agent' => isset( $user_agent ) ? $user_agent : $this->user_agent,
-				'headers'    => $headers + $this->headers,
-				'body'       => $body,
-			);
-
-		$response = wp_remote_request( $request_url, $request_args );
-
-		if ( defined( 'WL_DEBUG' ) && WL_DEBUG ) {
-			$this->log->trace(
-				"=== REQUEST  ===========================\n"
-				. var_export( $request_args, true )
-				. "=== RESPONSE ===========================\n"
-				. var_export( $response, true ) );
-		}
-
-		return new Response( $response );
-	}
-
-	public function get( $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
-
-		return $this->request( 'GET', $url, $headers, $body, $timeout, $user_agent, $args );
-	}
+    /**
+     * @var Default_Api_Service
+     */
+    private static $instance;
+
+    /**
+     * @var string
+     */
+    private $wordlift_key;
+    /**
+     * @var int
+     */
+    private $timeout;
+
+    /**
+     * @var string
+     */
+    private $user_agent;
+
+    /**
+     * @var array
+     */
+    private $headers;
+    /**
+     * @var string
+     */
+    private $base_url;
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * Default_Api_Service constructor.
+     *
+     * @param string $base_url
+     * @param int $timeout
+     * @param string $user_agent
+     * @param string $wordlift_key
+     */
+    public function __construct( $base_url, $timeout, $user_agent, $wordlift_key ) {
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->base_url     = $base_url;
+        $this->timeout      = $timeout;
+        $this->user_agent   = $user_agent;
+        $this->wordlift_key = $wordlift_key;
+
+        $this->headers = array(
+            'Content-Type'  => 'application/json',
+            'Authorization' => "Key $wordlift_key",
+            'Expect'        => '',
+        );
+
+        self::$instance = $this;
+    }
+
+    public static function get_instance() {
+        return self::$instance;
+    }
+
+    public function request( $method, $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+
+        // Get the timeout for this request.
+        $request_timeout = isset( $timeout ) ? $timeout : $this->timeout;
+
+        // Set the time limit if lesser than our request timeout.
+        $max_execution_time = ini_get( 'max_execution_time' );
+        if ( $max_execution_time < $request_timeout ) {
+            @set_time_limit( $request_timeout );
+        }
+
+        $request_url = $this->base_url . $url;
+
+        // Create the request args in the following order:
+        //  1. use `$args` as base if provided.
+        //  2. set the custom timeout if provided.
+        //  3. set the custom user-agent if provided.
+        //  4. merge the API headers to the provided headers.
+        //  5. add the body.
+        //
+        // In this way the user can fully control the request if wanted (using `$args`) and we can add our defaults.
+        $request_args = $args + array(
+                'method'     => $method,
+                'timeout'    => $request_timeout,
+                'user-agent' => isset( $user_agent ) ? $user_agent : $this->user_agent,
+                'headers'    => $headers + $this->headers,
+                'body'       => $body,
+            );
+
+        $response = wp_remote_request( $request_url, $request_args );
+
+        if ( defined( 'WL_DEBUG' ) && WL_DEBUG ) {
+            $this->log->trace(
+                "=== REQUEST  ===========================\n"
+                . var_export( $request_args, true )
+                . "=== RESPONSE ===========================\n"
+                . var_export( $response, true ) );
+        }
+
+        return new Response( $response );
+    }
+
+    public function get( $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+
+        return $this->request( 'GET', $url, $headers, $body, $timeout, $user_agent, $args );
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -48,9 +48,9 @@ 
 	 * @param string $user_agent
 	 * @param string $wordlift_key
 	 */
-	public function __construct( $base_url, $timeout, $user_agent, $wordlift_key ) {
+	public function __construct($base_url, $timeout, $user_agent, $wordlift_key) {
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->base_url     = $base_url;
 		$this->timeout      = $timeout;
@@ -70,18 +70,18 @@ 
 		return self::$instance;
 	}
 
-	public function request( $method, $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+	public function request($method, $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array()) {
 
 		// Get the timeout for this request.
-		$request_timeout = isset( $timeout ) ? $timeout : $this->timeout;
+		$request_timeout = isset($timeout) ? $timeout : $this->timeout;
 
 		// Set the time limit if lesser than our request timeout.
-		$max_execution_time = ini_get( 'max_execution_time' );
-		if ( $max_execution_time < $request_timeout ) {
-			@set_time_limit( $request_timeout );
+		$max_execution_time = ini_get('max_execution_time');
+		if ($max_execution_time < $request_timeout) {
+			@set_time_limit($request_timeout);
 		}
 
-		$request_url = $this->base_url . $url;
+		$request_url = $this->base_url.$url;
 
 		// Create the request args in the following order:
 		//  1. use `$args` as base if provided.
@@ -94,27 +94,27 @@ 
 		$request_args = $args + array(
 				'method'     => $method,
 				'timeout'    => $request_timeout,
-				'user-agent' => isset( $user_agent ) ? $user_agent : $this->user_agent,
+				'user-agent' => isset($user_agent) ? $user_agent : $this->user_agent,
 				'headers'    => $headers + $this->headers,
 				'body'       => $body,
 			);
 
-		$response = wp_remote_request( $request_url, $request_args );
+		$response = wp_remote_request($request_url, $request_args);
 
-		if ( defined( 'WL_DEBUG' ) && WL_DEBUG ) {
+		if (defined('WL_DEBUG') && WL_DEBUG) {
 			$this->log->trace(
 				"=== REQUEST  ===========================\n"
-				. var_export( $request_args, true )
+				. var_export($request_args, true)
 				. "=== RESPONSE ===========================\n"
-				. var_export( $response, true ) );
+				. var_export($response, true) );
 		}
 
-		return new Response( $response );
+		return new Response($response);
 	}
 
-	public function get( $url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+	public function get($url, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array()) {
 
-		return $this->request( 'GET', $url, $headers, $body, $timeout, $user_agent, $args );
+		return $this->request('GET', $url, $headers, $body, $timeout, $user_agent, $args);
 	}
 
 }

src/wordlift/dataset/class-sync-background-process.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	/**
 	 * Sync_Background_Process constructor.
 	 *
-	 * @param $sync_service Sync_Service A {@link Sync_Service} instance providing the supporting functions to this background process.
+	 * @param Sync_Service $sync_service Sync_Service A {@link Sync_Service} instance providing the supporting functions to this background process.
 	 */
 	public function __construct( $sync_service ) {
 		parent::__construct();

Indentation +178 added lines, -178 removed lines

@@ -6,183 +6,183 @@
 
 class Sync_Background_Process extends \Wordlift_Plugin_WP_Background_Process {
 
-	protected $action = 'wl_dataset__sync';
-
-	/**
-	 * @var Sync_Service
-	 */
-	private $sync_service;
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * Sync_Background_Process constructor.
-	 *
-	 * @param $sync_service Sync_Service A {@link Sync_Service} instance providing the supporting functions to this background process.
-	 */
-	public function __construct( $sync_service ) {
-		parent::__construct();
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->sync_service = $sync_service;
-
-	}
-
-	/**
-	 * This function is called:
-	 *  - To start a new Synchronization, by passing a {@link Sync_Start_Message} instance.
-	 *  - To synchronize a post, by passing a numeric ID.
-	 *
-	 * This function returns the parameter for the next call or NULL if there are no more posts to process.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return int|false The next post ID or false if there are no more.
-	 */
-	protected function task( $post_id ) {
-
-		// Check if we must cancel.
-		if ( $this->must_cancel() ) {
-			$this->cancel();
-
-			return false;
-		}
-
-		$this->log->debug( "Synchronizing post $post_id..." );
-
-		// Sync the item.
-		return $this->sync_item( $post_id );
-	}
-
-	/**
-	 * Start the background processing.
-	 *
-	 * @return bool True if the process has been started, otherwise false.
-	 */
-	public function start() {
-
-		// Create a new Sync_Model state of `started`.
-		if ( ! $this->is_started( self::get_state() ) ) {
-			$this->log->debug( "Starting..." );
-
-			$sync_state = new Sync_State( time(), 0, $this->sync_service->count(), time(), 'started' );
-			update_option( '_wl_dataset_sync', $sync_state );
-
-			$next = $this->sync_service->next();
-			$this->push_to_queue( $next );
-			$this->save()->dispatch();
-
-			$this->log->debug( "Started with post ID $next." );
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set the transient to cancel the process. The next time the process runs, it'll check whether this transient is
-	 * set and will stop processing.
-	 */
-	public function request_cancel() {
-
-		set_transient( "{$this->action}__cancel", true );
-
-	}
-
-	/**
-	 * Get the sync state.
-	 *
-	 * @return Sync_State The {@link Sync_State}.
-	 */
-	public static function get_state() {
-
-		try {
-			return get_option( '_wl_dataset_sync', Sync_State::unknown() );
-		} catch ( Exception $e ) {
-			return Sync_State::unknown();
-		}
-
-	}
-
-	/**
-	 * Check whether the provided state is `started` or not.
-	 *
-	 * @param Sync_State $state The {@link Sync_State}.
-	 *
-	 * @return bool True if the state is started.
-	 */
-	private function is_started( $state ) {
-		return $state instanceof Sync_State && 'started' === $state->state && 30 > ( time() - $state->last_update );
-	}
-
-	/**
-	 * Check whether the process must cancel or not.
-	 *
-	 * @return bool Whether to cancel or not the process.
-	 */
-	private function must_cancel() {
-
-		return get_transient( "{$this->action}__cancel" );
-	}
-
-	/**
-	 * Cancels the current process.
-	 */
-	private function cancel() {
-
-		$this->log->debug( "Cancelling synchronization..." );
-
-		// Cleanup the process data.
-		$this->cancel_process();
-
-		// Set the state to cancelled.
-		$state = self::get_state();
-		$state->set_state( 'cancelled' );
-		update_option( '_wl_dataset_sync', $state );
-
-		// Finally delete the transient.
-		delete_transient( "{$this->action}__cancel" );
-
-	}
-
-	/**
-	 * Push the post with the provided ID to the remote platform.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return int|false The next post ID to process or false if processing is complete.
-	 */
-	private function sync_item( $post_id ) {
-
-		// Sync this item.
-		if ( $this->sync_service->sync_item( $post_id ) ) {
-
-			$next       = $this->sync_service->next();
-			$next_state = isset( $next ) ? 'started' : 'ended';
-
-			/**
-			 * Update the synchronization meta data, by increasing the current index.
-			 *
-			 * @var Sync_State $sync The {@link Sync_State}.
-			 */
-			$state = self::get_state()
-			             ->increment_index()
-			             ->set_state( $next_state );
-			update_option( '_wl_dataset_sync', $state );
-
-			// Return the next ID or false if there aren't.
-			return isset( $next ) ? (int) $next : false;
-		} else {
-			// Retry.
-			// @@todo: put a limit to the number of retries.
-			return $post_id;
-		}
-
-	}
+    protected $action = 'wl_dataset__sync';
+
+    /**
+     * @var Sync_Service
+     */
+    private $sync_service;
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * Sync_Background_Process constructor.
+     *
+     * @param $sync_service Sync_Service A {@link Sync_Service} instance providing the supporting functions to this background process.
+     */
+    public function __construct( $sync_service ) {
+        parent::__construct();
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->sync_service = $sync_service;
+
+    }
+
+    /**
+     * This function is called:
+     *  - To start a new Synchronization, by passing a {@link Sync_Start_Message} instance.
+     *  - To synchronize a post, by passing a numeric ID.
+     *
+     * This function returns the parameter for the next call or NULL if there are no more posts to process.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return int|false The next post ID or false if there are no more.
+     */
+    protected function task( $post_id ) {
+
+        // Check if we must cancel.
+        if ( $this->must_cancel() ) {
+            $this->cancel();
+
+            return false;
+        }
+
+        $this->log->debug( "Synchronizing post $post_id..." );
+
+        // Sync the item.
+        return $this->sync_item( $post_id );
+    }
+
+    /**
+     * Start the background processing.
+     *
+     * @return bool True if the process has been started, otherwise false.
+     */
+    public function start() {
+
+        // Create a new Sync_Model state of `started`.
+        if ( ! $this->is_started( self::get_state() ) ) {
+            $this->log->debug( "Starting..." );
+
+            $sync_state = new Sync_State( time(), 0, $this->sync_service->count(), time(), 'started' );
+            update_option( '_wl_dataset_sync', $sync_state );
+
+            $next = $this->sync_service->next();
+            $this->push_to_queue( $next );
+            $this->save()->dispatch();
+
+            $this->log->debug( "Started with post ID $next." );
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the transient to cancel the process. The next time the process runs, it'll check whether this transient is
+     * set and will stop processing.
+     */
+    public function request_cancel() {
+
+        set_transient( "{$this->action}__cancel", true );
+
+    }
+
+    /**
+     * Get the sync state.
+     *
+     * @return Sync_State The {@link Sync_State}.
+     */
+    public static function get_state() {
+
+        try {
+            return get_option( '_wl_dataset_sync', Sync_State::unknown() );
+        } catch ( Exception $e ) {
+            return Sync_State::unknown();
+        }
+
+    }
+
+    /**
+     * Check whether the provided state is `started` or not.
+     *
+     * @param Sync_State $state The {@link Sync_State}.
+     *
+     * @return bool True if the state is started.
+     */
+    private function is_started( $state ) {
+        return $state instanceof Sync_State && 'started' === $state->state && 30 > ( time() - $state->last_update );
+    }
+
+    /**
+     * Check whether the process must cancel or not.
+     *
+     * @return bool Whether to cancel or not the process.
+     */
+    private function must_cancel() {
+
+        return get_transient( "{$this->action}__cancel" );
+    }
+
+    /**
+     * Cancels the current process.
+     */
+    private function cancel() {
+
+        $this->log->debug( "Cancelling synchronization..." );
+
+        // Cleanup the process data.
+        $this->cancel_process();
+
+        // Set the state to cancelled.
+        $state = self::get_state();
+        $state->set_state( 'cancelled' );
+        update_option( '_wl_dataset_sync', $state );
+
+        // Finally delete the transient.
+        delete_transient( "{$this->action}__cancel" );
+
+    }
+
+    /**
+     * Push the post with the provided ID to the remote platform.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return int|false The next post ID to process or false if processing is complete.
+     */
+    private function sync_item( $post_id ) {
+
+        // Sync this item.
+        if ( $this->sync_service->sync_item( $post_id ) ) {
+
+            $next       = $this->sync_service->next();
+            $next_state = isset( $next ) ? 'started' : 'ended';
+
+            /**
+             * Update the synchronization meta data, by increasing the current index.
+             *
+             * @var Sync_State $sync The {@link Sync_State}.
+             */
+            $state = self::get_state()
+                            ->increment_index()
+                            ->set_state( $next_state );
+            update_option( '_wl_dataset_sync', $state );
+
+            // Return the next ID or false if there aren't.
+            return isset( $next ) ? (int) $next : false;
+        } else {
+            // Retry.
+            // @@todo: put a limit to the number of retries.
+            return $post_id;
+        }
+
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -23,10 +23,10 @@ 
 	 *
 	 * @param $sync_service Sync_Service A {@link Sync_Service} instance providing the supporting functions to this background process.
 	 */
-	public function __construct( $sync_service ) {
+	public function __construct($sync_service) {
 		parent::__construct();
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->sync_service = $sync_service;
 
@@ -43,19 +43,19 @@ 
 	 *
 	 * @return int|false The next post ID or false if there are no more.
 	 */
-	protected function task( $post_id ) {
+	protected function task($post_id) {
 
 		// Check if we must cancel.
-		if ( $this->must_cancel() ) {
+		if ($this->must_cancel()) {
 			$this->cancel();
 
 			return false;
 		}
 
-		$this->log->debug( "Synchronizing post $post_id..." );
+		$this->log->debug("Synchronizing post $post_id...");
 
 		// Sync the item.
-		return $this->sync_item( $post_id );
+		return $this->sync_item($post_id);
 	}
 
 	/**
@@ -66,17 +66,17 @@ 
 	public function start() {
 
 		// Create a new Sync_Model state of `started`.
-		if ( ! $this->is_started( self::get_state() ) ) {
-			$this->log->debug( "Starting..." );
+		if ( ! $this->is_started(self::get_state())) {
+			$this->log->debug("Starting...");
 
-			$sync_state = new Sync_State( time(), 0, $this->sync_service->count(), time(), 'started' );
-			update_option( '_wl_dataset_sync', $sync_state );
+			$sync_state = new Sync_State(time(), 0, $this->sync_service->count(), time(), 'started');
+			update_option('_wl_dataset_sync', $sync_state);
 
 			$next = $this->sync_service->next();
-			$this->push_to_queue( $next );
+			$this->push_to_queue($next);
 			$this->save()->dispatch();
 
-			$this->log->debug( "Started with post ID $next." );
+			$this->log->debug("Started with post ID $next.");
 
 			return true;
 		}
@@ -90,7 +90,7 @@ 
 	 */
 	public function request_cancel() {
 
-		set_transient( "{$this->action}__cancel", true );
+		set_transient("{$this->action}__cancel", true);
 
 	}
 
@@ -102,8 +102,8 @@ 
 	public static function get_state() {
 
 		try {
-			return get_option( '_wl_dataset_sync', Sync_State::unknown() );
-		} catch ( Exception $e ) {
+			return get_option('_wl_dataset_sync', Sync_State::unknown());
+		} catch (Exception $e) {
 			return Sync_State::unknown();
 		}
 
@@ -116,8 +116,8 @@ 
 	 *
 	 * @return bool True if the state is started.
 	 */
-	private function is_started( $state ) {
-		return $state instanceof Sync_State && 'started' === $state->state && 30 > ( time() - $state->last_update );
+	private function is_started($state) {
+		return $state instanceof Sync_State && 'started' === $state->state && 30 > (time() - $state->last_update);
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	private function must_cancel() {
 
-		return get_transient( "{$this->action}__cancel" );
+		return get_transient("{$this->action}__cancel");
 	}
 
 	/**
@@ -135,18 +135,18 @@ 
 	 */
 	private function cancel() {
 
-		$this->log->debug( "Cancelling synchronization..." );
+		$this->log->debug("Cancelling synchronization...");
 
 		// Cleanup the process data.
 		$this->cancel_process();
 
 		// Set the state to cancelled.
 		$state = self::get_state();
-		$state->set_state( 'cancelled' );
-		update_option( '_wl_dataset_sync', $state );
+		$state->set_state('cancelled');
+		update_option('_wl_dataset_sync', $state);
 
 		// Finally delete the transient.
-		delete_transient( "{$this->action}__cancel" );
+		delete_transient("{$this->action}__cancel");
 
 	}
 
@@ -157,13 +157,13 @@ 
 	 *
 	 * @return int|false The next post ID to process or false if processing is complete.
 	 */
-	private function sync_item( $post_id ) {
+	private function sync_item($post_id) {
 
 		// Sync this item.
-		if ( $this->sync_service->sync_item( $post_id ) ) {
+		if ($this->sync_service->sync_item($post_id)) {
 
 			$next       = $this->sync_service->next();
-			$next_state = isset( $next ) ? 'started' : 'ended';
+			$next_state = isset($next) ? 'started' : 'ended';
 
 			/**
 			 * Update the synchronization meta data, by increasing the current index.
@@ -172,11 +172,11 @@ 
 			 */
 			$state = self::get_state()
 			             ->increment_index()
-			             ->set_state( $next_state );
-			update_option( '_wl_dataset_sync', $state );
+			             ->set_state($next_state);
+			update_option('_wl_dataset_sync', $state);
 
 			// Return the next ID or false if there aren't.
-			return isset( $next ) ? (int) $next : false;
+			return isset($next) ? (int) $next : false;
 		} else {
 			// Retry.
 			// @@todo: put a limit to the number of retries.

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

Indentation +158 added lines, -158 removed lines

@@ -20,132 +20,132 @@ 
  */
 class Wordlift_Rebuild_Service extends Wordlift_Listable {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * The {@link Wordlift_Uri_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Uri_Service $uri_service The {@link Wordlift_Uri_Service} instance.
-	 */
-	private $uri_service;
-
-	/**
-	 * Create an instance of Wordlift_Rebuild_Service.
-	 *
-	 * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
-	 * @param \Wordlift_Uri_Service $uri_service
-	 *
-	 * @since 3.6.0
-	 *
-	 */
-	public function __construct( $sparql_service, $uri_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
-
-		$this->sparql_service = $sparql_service;
-		$this->uri_service    = $uri_service;
-	}
-
-	/**
-	 * Rebuild the Linked Data remote dataset by clearing it out and repopulating
-	 * it with local data.
-	 *
-	 * @since 3.6.0
-	 */
-	public function rebuild() {
-
-		ob_clean();
-
-		// Give ourselves some time to process the data.
-		set_time_limit( 21600 ); // 6 hours
-
-		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
-
-		// We start at 0 by default and get to max.
-		$offset = $_GET['offset'] ?: 0;
-		$limit  = $_GET['limit'] ?: 1;
-		$max    = $offset + $limit;
-
-		// Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
-		$asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
-
-		// If we're starting at offset 0, then delete existing URIs and data from
-		// the remote dataset.
-		if ( 0 === $offset ) {
-
-			// Clear out all generated URIs, since the dataset URI might have changed
-			// in the process.
-			$this->uri_service->delete_all();
-
-			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
-
-		}
-
-		// Go through the list of published entities and posts and call the (legacy)
-		// `wl_linked_data_save_post` function for each one. We're using the `process`
-		// function which is provided by the parent `Wordlift_Listable` abstract class
-		// and will cycle through all the posts w/ a very small memory footprint
-		// in order to avoid memory errors.
-
-		$count = 0;
-		$log   = $this->log;
-		$this->process( function ( $post ) use ( &$count, $log ) {
-			$count ++;
-			$log->trace( "Going to save post $count, ID $post->ID..." );
-			if ( function_exists( 'wl_linked_data_save_post' ) ) {
-				wl_linked_data_save_post( $post->ID );
-			}
-		}, array(
-			'post_status' => 'publish',
-		), $offset, $max );
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
-		}
-
-		// Flush the cache.
-		Wordlift_File_Cache_Service::flush_all();
-
-		// Rebuild also the references.
-		$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
-	}
-
-	/**
-	 * Redirect using a client-side meta to avoid browsers' redirect restrictions.
-	 *
-	 * @param string $url The URL to redirect to.
-	 *
-	 * @since 3.9.8
-	 *
-	 */
-	public function redirect( $url ) {
-
-		ob_clean();
-
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-		?>
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * The {@link Wordlift_Uri_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Uri_Service $uri_service The {@link Wordlift_Uri_Service} instance.
+     */
+    private $uri_service;
+
+    /**
+     * Create an instance of Wordlift_Rebuild_Service.
+     *
+     * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
+     * @param \Wordlift_Uri_Service $uri_service
+     *
+     * @since 3.6.0
+     *
+     */
+    public function __construct( $sparql_service, $uri_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+
+        $this->sparql_service = $sparql_service;
+        $this->uri_service    = $uri_service;
+    }
+
+    /**
+     * Rebuild the Linked Data remote dataset by clearing it out and repopulating
+     * it with local data.
+     *
+     * @since 3.6.0
+     */
+    public function rebuild() {
+
+        ob_clean();
+
+        // Give ourselves some time to process the data.
+        set_time_limit( 21600 ); // 6 hours
+
+        // Send textual output.
+        header( 'Content-type: text/plain; charset=utf-8' );
+
+        // We start at 0 by default and get to max.
+        $offset = $_GET['offset'] ?: 0;
+        $limit  = $_GET['limit'] ?: 1;
+        $max    = $offset + $limit;
+
+        // Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
+        $asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
+
+        // If we're starting at offset 0, then delete existing URIs and data from
+        // the remote dataset.
+        if ( 0 === $offset ) {
+
+            // Clear out all generated URIs, since the dataset URI might have changed
+            // in the process.
+            $this->uri_service->delete_all();
+
+            // Delete all the triples in the remote dataset.
+            $this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+
+        }
+
+        // Go through the list of published entities and posts and call the (legacy)
+        // `wl_linked_data_save_post` function for each one. We're using the `process`
+        // function which is provided by the parent `Wordlift_Listable` abstract class
+        // and will cycle through all the posts w/ a very small memory footprint
+        // in order to avoid memory errors.
+
+        $count = 0;
+        $log   = $this->log;
+        $this->process( function ( $post ) use ( &$count, $log ) {
+            $count ++;
+            $log->trace( "Going to save post $count, ID $post->ID..." );
+            if ( function_exists( 'wl_linked_data_save_post' ) ) {
+                wl_linked_data_save_post( $post->ID );
+            }
+        }, array(
+            'post_status' => 'publish',
+        ), $offset, $max );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
+            $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
+        }
+
+        // Flush the cache.
+        Wordlift_File_Cache_Service::flush_all();
+
+        // Rebuild also the references.
+        $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
+    }
+
+    /**
+     * Redirect using a client-side meta to avoid browsers' redirect restrictions.
+     *
+     * @param string $url The URL to redirect to.
+     *
+     * @since 3.9.8
+     *
+     */
+    public function redirect( $url ) {
+
+        ob_clean();
+
+        @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+        ?>
         <html>
         <head>
             <meta http-equiv="refresh"
@@ -157,37 +157,37 @@ 
         </html>
 		<?php
 
-		exit;
-
-	}
-
-	/**
-	 * List the items starting at the specified offset and up to the specified limit.
-	 *
-	 * @param int $offset The start offset.
-	 * @param int $limit The maximum number of items to return.
-	 * @param array $args Additional arguments.
-	 *
-	 * @return array A array of items (or an empty array if no items are found).
-	 * @since 3.19.5 remove Polylang hooks.
-	 * @since 3.6.0
-	 *
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-
-		$actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
-			'offset'        => $offset,
-			'numberposts'   => $limit,
-			'fields'        => 'all',
-			'orderby'       => 'ID',
-			'order'         => 'ASC',
-			'post_status'   => 'any',
-			'cache_results' => false,
-		) ) );
-
-		$this->log->trace( 'Using ' . var_export( $actual_args, true ) );
-
-		return get_posts( $actual_args );
-	}
+        exit;
+
+    }
+
+    /**
+     * List the items starting at the specified offset and up to the specified limit.
+     *
+     * @param int $offset The start offset.
+     * @param int $limit The maximum number of items to return.
+     * @param array $args Additional arguments.
+     *
+     * @return array A array of items (or an empty array if no items are found).
+     * @since 3.19.5 remove Polylang hooks.
+     * @since 3.6.0
+     *
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+
+        $actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
+            'offset'        => $offset,
+            'numberposts'   => $limit,
+            'fields'        => 'all',
+            'orderby'       => 'ID',
+            'order'         => 'ASC',
+            'post_status'   => 'any',
+            'cache_results' => false,
+        ) ) );
+
+        $this->log->trace( 'Using ' . var_export( $actual_args, true ) );
+
+        return get_posts( $actual_args );
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -56,9 +56,9 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	public function __construct( $sparql_service, $uri_service ) {
+	public function __construct($sparql_service, $uri_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Rebuild_Service');
 
 		$this->sparql_service = $sparql_service;
 		$this->uri_service    = $uri_service;
@@ -75,10 +75,10 @@ 
 		ob_clean();
 
 		// Give ourselves some time to process the data.
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
 		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
+		header('Content-type: text/plain; charset=utf-8');
 
 		// We start at 0 by default and get to max.
 		$offset = $_GET['offset'] ?: 0;
@@ -86,18 +86,18 @@ 
 		$max    = $offset + $limit;
 
 		// Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
-		$asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
+		$asynchronous = isset($_GET['wl-async']) && 'true' === $_GET['wl-async'];
 
 		// If we're starting at offset 0, then delete existing URIs and data from
 		// the remote dataset.
-		if ( 0 === $offset ) {
+		if (0 === $offset) {
 
 			// Clear out all generated URIs, since the dataset URI might have changed
 			// in the process.
 			$this->uri_service->delete_all();
 
 			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+			$this->sparql_service->execute('DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };');
 
 		}
 
@@ -109,27 +109,27 @@ 
 
 		$count = 0;
 		$log   = $this->log;
-		$this->process( function ( $post ) use ( &$count, $log ) {
-			$count ++;
-			$log->trace( "Going to save post $count, ID $post->ID..." );
-			if ( function_exists( 'wl_linked_data_save_post' ) ) {
-				wl_linked_data_save_post( $post->ID );
+		$this->process(function($post) use (&$count, $log) {
+			$count++;
+			$log->trace("Going to save post $count, ID $post->ID...");
+			if (function_exists('wl_linked_data_save_post')) {
+				wl_linked_data_save_post($post->ID);
 			}
 		}, array(
 			'post_status' => 'publish',
-		), $offset, $max );
+		), $offset, $max);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
+		if ($count == $limit) {
+			$log->trace('Redirecting to post #'.($offset + 1).'...');
+			$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild&offset='.($offset + $limit).'&limit='.$limit.'&wl-async='.($asynchronous ? 'true' : 'false')));
 		}
 
 		// Flush the cache.
 		Wordlift_File_Cache_Service::flush_all();
 
 		// Rebuild also the references.
-		$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
+		$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild_references'));
 	}
 
 	/**
@@ -140,16 +140,16 @@ 
 	 * @since 3.9.8
 	 *
 	 */
-	public function redirect( $url ) {
+	public function redirect($url) {
 
 		ob_clean();
 
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: text/html; charset='.get_option('blog_charset'));
 		?>
         <html>
         <head>
             <meta http-equiv="refresh"
-                  content="0; <?php echo esc_attr( $url ); ?>">
+                  content="0; <?php echo esc_attr($url); ?>">
         </head>
         <body>
         Rebuilding, please wait...
@@ -173,9 +173,9 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 
-		$actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
+		$actual_args = wp_parse_args($args, Wordlift_Entity_Service::add_criterias(array(
 			'offset'        => $offset,
 			'numberposts'   => $limit,
 			'fields'        => 'all',
@@ -183,11 +183,11 @@ 
 			'order'         => 'ASC',
 			'post_status'   => 'any',
 			'cache_results' => false,
-		) ) );
+		)));
 
-		$this->log->trace( 'Using ' . var_export( $actual_args, true ) );
+		$this->log->trace('Using '.var_export($actual_args, true));
 
-		return get_posts( $actual_args );
+		return get_posts($actual_args);
 	}
 
 }

src/includes/rebuild/class-wordlift-reference-rebuild-service.php

Indentation +100 added lines, -100 removed lines

@@ -2,110 +2,110 @@
 
 class Wordlift_Reference_Rebuild_Service extends Wordlift_Rebuild_Service {
 
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-
-	/**
-	 * Wordlift_Reference_Rebuild_Service constructor.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
-
-		$this->entity_service = $entity_service;
-	}
-
-	public function rebuild() {
-		set_time_limit( 21600 ); // 6 hours
-
-		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
-
-		// We start at 0 by default and get to max.
-		$offset = $_GET['offset'] ?: 0;
-		$limit  = $_GET['limit'] ?: 1;
-		$max    = $offset + $limit;
-
-		$this->log->debug( 'Processing references...' );
-
-		// Go through the list of published entities and posts and call the (legacy)
-		// `wl_linked_data_save_post` function for each one. We're using the `process`
-		// function which is provided by the parent `Wordlift_Listable` abstract class
-		// and will cycle through all the posts w/ a very small memory footprint
-		// in order to avoid memory errors.
-
-		$count          = 0;
-		$log            = $this->log;
-		$entity_service = $this->entity_service;
-
-		$this->process(
-			function ( $post_id ) use ( &$count, $log, $entity_service ) {
-				$count ++;
-
-				if ( $entity_service->is_entity( $post_id ) ) {
-					$log->trace( "Post $post_id is an entity, skipping..." );
-
-					return;
-				}
-
-				$log->trace( "Going to save post $count, ID $post_id..." );
-				do_action( 'wl_legacy_linked_data__push', $post_id );
-			},
-			array(),
-			$offset,
-			$max
-		);
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
-			$this->redirect( $url );
-		}
-
-		$this->log->info( "Rebuild complete" );
-		echo( "Rebuild complete" );
-
-		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
-			wp_die();
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-		global $wpdb;
-
-		return $wpdb->get_col( $wpdb->prepare(
-			"
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+
+    /**
+     * Wordlift_Reference_Rebuild_Service constructor.
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    public function __construct( $entity_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
+
+        $this->entity_service = $entity_service;
+    }
+
+    public function rebuild() {
+        set_time_limit( 21600 ); // 6 hours
+
+        // Send textual output.
+        header( 'Content-type: text/plain; charset=utf-8' );
+
+        // We start at 0 by default and get to max.
+        $offset = $_GET['offset'] ?: 0;
+        $limit  = $_GET['limit'] ?: 1;
+        $max    = $offset + $limit;
+
+        $this->log->debug( 'Processing references...' );
+
+        // Go through the list of published entities and posts and call the (legacy)
+        // `wl_linked_data_save_post` function for each one. We're using the `process`
+        // function which is provided by the parent `Wordlift_Listable` abstract class
+        // and will cycle through all the posts w/ a very small memory footprint
+        // in order to avoid memory errors.
+
+        $count          = 0;
+        $log            = $this->log;
+        $entity_service = $this->entity_service;
+
+        $this->process(
+            function ( $post_id ) use ( &$count, $log, $entity_service ) {
+                $count ++;
+
+                if ( $entity_service->is_entity( $post_id ) ) {
+                    $log->trace( "Post $post_id is an entity, skipping..." );
+
+                    return;
+                }
+
+                $log->trace( "Going to save post $count, ID $post_id..." );
+                do_action( 'wl_legacy_linked_data__push', $post_id );
+            },
+            array(),
+            $offset,
+            $max
+        );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
+            $url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
+            $this->redirect( $url );
+        }
+
+        $this->log->info( "Rebuild complete" );
+        echo( "Rebuild complete" );
+
+        // If we're being called as AJAX, die here.
+        if ( DOING_AJAX ) {
+            wp_die();
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+        global $wpdb;
+
+        return $wpdb->get_col( $wpdb->prepare(
+            "
 			SELECT DISTINCT subject_id AS id
 			FROM {$wpdb->prefix}wl_relation_instances
 			LIMIT %d OFFSET %d
 			",
-			$limit,
-			$offset
-		) );
+            $limit,
+            $offset
+        ) );
 
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -26,25 +26,25 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Reference_Rebuild_Service');
 
 		$this->entity_service = $entity_service;
 	}
 
 	public function rebuild() {
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
 		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
+		header('Content-type: text/plain; charset=utf-8');
 
 		// We start at 0 by default and get to max.
 		$offset = $_GET['offset'] ?: 0;
 		$limit  = $_GET['limit'] ?: 1;
 		$max    = $offset + $limit;
 
-		$this->log->debug( 'Processing references...' );
+		$this->log->debug('Processing references...');
 
 		// Go through the list of published entities and posts and call the (legacy)
 		// `wl_linked_data_save_post` function for each one. We're using the `process`
@@ -57,17 +57,17 @@ 
 		$entity_service = $this->entity_service;
 
 		$this->process(
-			function ( $post_id ) use ( &$count, $log, $entity_service ) {
-				$count ++;
+			function($post_id) use (&$count, $log, $entity_service) {
+				$count++;
 
-				if ( $entity_service->is_entity( $post_id ) ) {
-					$log->trace( "Post $post_id is an entity, skipping..." );
+				if ($entity_service->is_entity($post_id)) {
+					$log->trace("Post $post_id is an entity, skipping...");
 
 					return;
 				}
 
-				$log->trace( "Going to save post $count, ID $post_id..." );
-				do_action( 'wl_legacy_linked_data__push', $post_id );
+				$log->trace("Going to save post $count, ID $post_id...");
+				do_action('wl_legacy_linked_data__push', $post_id);
 			},
 			array(),
 			$offset,
@@ -75,17 +75,17 @@ 
 		);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
-			$this->redirect( $url );
+		if ($count == $limit) {
+			$log->trace('Redirecting to post #'.($offset + 1).'...');
+			$url = admin_url('admin-ajax.php?action=wl_rebuild_references&offset='.($offset + $limit).'&limit='.$limit);
+			$this->redirect($url);
 		}
 
-		$this->log->info( "Rebuild complete" );
-		echo( "Rebuild complete" );
+		$this->log->info("Rebuild complete");
+		echo("Rebuild complete");
 
 		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
+		if (DOING_AJAX) {
 			wp_die();
 		}
 	}
@@ -93,10 +93,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 		global $wpdb;
 
-		return $wpdb->get_col( $wpdb->prepare(
+		return $wpdb->get_col($wpdb->prepare(
 			"
 			SELECT DISTINCT subject_id AS id
 			FROM {$wpdb->prefix}wl_relation_instances
@@ -104,7 +104,7 @@ 
 			",
 			$limit,
 			$offset
-		) );
+		));
 
 	}
 

src/includes/class-wordlift.php

Indentation +1714 added lines, -1714 removed lines

@@ -65,1537 +65,1537 @@ 
  */
 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 {@link Faq_Tinymce_Adapter} instance
-	 * @since 3.26.0
-	 * @access protected
-	 * @var Faq_Tinymce_Adapter $faq_tinymce_adapter .
-	 */
-	//protected $faq_tinymce_adapter;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since  3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	protected $schema_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.1.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	protected $entity_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since  3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The Entity Types Taxonomy service.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Taxonomy_Service The Entity Types Taxonomy service.
-	 */
-	private $entity_types_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since  3.1.7
-	 * @access protected
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	protected $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since  3.3.0
-	 * @access protected
-	 * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
-	 */
-	protected $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since  3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The WordLift Dashboard adapter.
-	 *
-	 * @since  3.4.0
-	 * @access private
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
-	 */
-	private $dashboard_service;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service
-	 */
-	private $entity_post_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service $entity_link_service The {@link Wordlift_Entity_Link_Service} instance.
-	 */
-	private $entity_link_service;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since    3.6.0
-	 * @access   protected
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	protected $sparql_service;
-
-	/**
-	 * A {@link Wordlift_Import_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
-	 */
-	private $import_service;
-
-	/**
-	 * A {@link Wordlift_Rebuild_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
-	 */
-	private $rebuild_service;
-
-	/**
-	 * A {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access protected
-	 * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
-	 */
-	protected $jsonld_service;
-
-	/**
-	 * A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Website_Jsonld_Converter $jsonld_website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 */
-	protected $jsonld_website_converter;
-
-	/**
-	 * A {@link Wordlift_Property_Factory} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Property_Factory $property_factory
-	 */
-	private $property_factory;
-
-	/**
-	 * The 'Download Your Data' page.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
-	 */
-	private $download_your_data_page;
-
-	/**
-	 * The 'WordLift Settings' page.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
-	 */
-	protected $settings_page;
-
-	/**
-	 * The install wizard page.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
-	 */
-	private $admin_setup;
-
-	/**
-	 * The Content Filter Service hooks up to the 'the_content' filter and provides
-	 * linking of entities to their pages.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
-	 */
-	private $content_filter_service;
-
-	/**
-	 * 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_Configuration_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	protected $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Install_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var \Wordlift_Install_Service $install_service A {@link Wordlift_Install_Service} instance.
-	 */
-	protected $install_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	protected $entity_type_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $entity_post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 */
-	protected $postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_Admin_Status_Page} class.
-	 *
-	 * @since  3.9.8
-	 * @access private
-	 * @var \Wordlift_Admin_Status_Page $status_page The {@link Wordlift_Admin_Status_Page} class.
-	 */
-	private $status_page;
-
-	/**
-	 * The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 */
-	protected $category_taxonomy_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Page_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Page_Service $entity_page_service The {@link Wordlift_Entity_Page_Service} instance.
-	 */
-	protected $entity_page_service;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $analytics_settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Analytics_Connect} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Analytics_Connect $analytics_connect The {@link Wordlift_Analytics_Connect} class.
-	 */
-	protected $analytics_connect;
-
-	/**
-	 * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 */
-	protected $publisher_ajax_adapter;
-
-	/**
-	 * The {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	protected $input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	protected $radio_input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	protected $language_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Country_Select_Element $country_select_element The {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 */
-	protected $country_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	protected $publisher_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 */
-	protected $select2_element;
-
-	/**
-	 * The controller for the entity type list admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
-	 */
-	private $entity_type_admin_page;
-
-	/**
-	 * The controller for the entity type settings admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
-	 */
-	private $entity_type_settings_admin_page;
-
-	/**
-	 * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 */
-	protected $related_entities_cloud_widget;
-
-	/**
-	 * The {@link Wordlift_Admin_Author_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Author_Element $author_element The {@link Wordlift_Admin_Author_Element} instance.
-	 */
-	protected $author_element;
-
-	/**
-	 * The {@link Wordlift_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_Relation_Rebuild_Service} instance.
-	 *
-	 * @since  3.14.3
-	 * @access private
-	 * @var \Wordlift_Relation_Rebuild_Service $relation_rebuild_service The {@link Wordlift_Relation_Rebuild_Service} instance.
-	 */
-	private $relation_rebuild_service;
-
-	/**
-	 * The {@link Wordlift_Relation_Rebuild_Adapter} instance.
-	 *
-	 * @since  3.14.3
-	 * @access private
-	 * @var \Wordlift_Relation_Rebuild_Adapter $relation_rebuild_adapter The {@link Wordlift_Relation_Rebuild_Adapter} instance.
-	 */
-	private $relation_rebuild_adapter;
-
-	/**
-	 * The {@link Wordlift_Reference_Rebuild_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Reference_Rebuild_Service $reference_rebuild_service The {@link Wordlift_Reference_Rebuild_Service} instance.
-	 */
-	private $reference_rebuild_service;
-
-	/**
-	 * The {@link Wordlift_Google_Analytics_Export_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var \Wordlift_Google_Analytics_Export_Service $google_analytics_export_service The {@link Wordlift_Google_Analytics_Export_Service} instance.
-	 */
-	protected $google_analytics_export_service;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Adapter $entity_type_adapter The {@link Wordlift_Entity_Type_Adapter} instance.
-	 */
-	protected $entity_type_adapter;
-
-	/**
-	 * The {@link Wordlift_Storage_Factory} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Storage_Factory $storage_factory The {@link Wordlift_Storage_Factory} instance.
-	 */
-	protected $storage_factory;
-
-	/**
-	 * The {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Sparql_Tuple_Rendition_Factory $rendition_factory The {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
-	 */
-	protected $rendition_factory;
-
-	/**
-	 * The {@link Wordlift_Autocomplete_Adapter} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Autocomplete_Adapter $autocomplete_adapter The {@link Wordlift_Autocomplete_Adapter} instance.
-	 */
-	private $autocomplete_adapter;
-
-	/**
-	 * The {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	protected $relation_service;
-
-	/**
-	 * The {@link Wordlift_Cached_Post_Converter} instance.
-	 *
-	 * @since  3.16.0
-	 * @access protected
-	 * @var  \Wordlift_Cached_Post_Converter $cached_postid_to_jsonld_converter The {@link Wordlift_Cached_Post_Converter} instance.
-	 *
-	 */
-	protected $cached_postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_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;
-
-	//</editor-fold>
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		self::$instance = $this;
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.27.5';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-		// If we're in `WP_CLI` load the related files.
-		if ( class_exists( 'WP_CLI' ) ) {
-			$this->load_cli_dependencies();
-		}
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return Wordlift The {@link Wordlift} singleton instance.
-	 * @since 3.11.2
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @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-linked-data-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The SPARQL service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
-
-		/**
-		 * The WordLift import service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
-
-		/**
-		 * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-listable.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-reference-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
-
-		/**
-		 * Load cache-related files.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/*
+    //<editor-fold desc="## FIELDS">
+
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The {@link Wordlift_Tinymce_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
+     */
+    protected $tinymce_adapter;
+
+    /**
+     * The {@link Faq_Tinymce_Adapter} instance
+     * @since 3.26.0
+     * @access protected
+     * @var Faq_Tinymce_Adapter $faq_tinymce_adapter .
+     */
+    //protected $faq_tinymce_adapter;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since  3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    protected $schema_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.1.0
+     * @access protected
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    protected $entity_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since  3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The Entity Types Taxonomy service.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Taxonomy_Service The Entity Types Taxonomy service.
+     */
+    private $entity_types_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since  3.1.7
+     * @access protected
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    protected $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since  3.3.0
+     * @access protected
+     * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
+     */
+    protected $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since  3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The WordLift Dashboard adapter.
+     *
+     * @since  3.4.0
+     * @access private
+     * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
+     */
+    private $dashboard_service;
+
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service
+     */
+    private $entity_post_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service $entity_link_service The {@link Wordlift_Entity_Link_Service} instance.
+     */
+    private $entity_link_service;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since    3.6.0
+     * @access   protected
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    protected $sparql_service;
+
+    /**
+     * A {@link Wordlift_Import_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
+     */
+    private $import_service;
+
+    /**
+     * A {@link Wordlift_Rebuild_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
+     */
+    private $rebuild_service;
+
+    /**
+     * A {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since  3.7.0
+     * @access protected
+     * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
+     */
+    protected $jsonld_service;
+
+    /**
+     * A {@link Wordlift_Website_Jsonld_Converter} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Website_Jsonld_Converter $jsonld_website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     */
+    protected $jsonld_website_converter;
+
+    /**
+     * A {@link Wordlift_Property_Factory} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Property_Factory $property_factory
+     */
+    private $property_factory;
+
+    /**
+     * The 'Download Your Data' page.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
+     */
+    private $download_your_data_page;
+
+    /**
+     * The 'WordLift Settings' page.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
+     */
+    protected $settings_page;
+
+    /**
+     * The install wizard page.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
+     */
+    private $admin_setup;
+
+    /**
+     * The Content Filter Service hooks up to the 'the_content' filter and provides
+     * linking of entities to their pages.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
+     */
+    private $content_filter_service;
+
+    /**
+     * 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_Configuration_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    protected $configuration_service;
+
+    /**
+     * A {@link Wordlift_Install_Service} instance.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var \Wordlift_Install_Service $install_service A {@link Wordlift_Install_Service} instance.
+     */
+    protected $install_service;
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    protected $entity_type_service;
+
+    /**
+     * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     */
+    protected $entity_post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     */
+    protected $postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_Admin_Status_Page} class.
+     *
+     * @since  3.9.8
+     * @access private
+     * @var \Wordlift_Admin_Status_Page $status_page The {@link Wordlift_Admin_Status_Page} class.
+     */
+    private $status_page;
+
+    /**
+     * The {@link Wordlift_Category_Taxonomy_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
+     */
+    protected $category_taxonomy_service;
+
+    /**
+     * The {@link Wordlift_Entity_Page_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Entity_Page_Service $entity_page_service The {@link Wordlift_Entity_Page_Service} instance.
+     */
+    protected $entity_page_service;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $analytics_settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Analytics_Connect} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Analytics_Connect $analytics_connect The {@link Wordlift_Analytics_Connect} class.
+     */
+    protected $analytics_connect;
+
+    /**
+     * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     */
+    protected $publisher_ajax_adapter;
+
+    /**
+     * The {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    protected $input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    protected $radio_input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    protected $language_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var \Wordlift_Admin_Country_Select_Element $country_select_element The {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     */
+    protected $country_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    protected $publisher_element;
+
+    /**
+     * The {@link Wordlift_Admin_Select2_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
+     */
+    protected $select2_element;
+
+    /**
+     * The controller for the entity type list admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
+     */
+    private $entity_type_admin_page;
+
+    /**
+     * The controller for the entity type settings admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
+     */
+    private $entity_type_settings_admin_page;
+
+    /**
+     * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     */
+    protected $related_entities_cloud_widget;
+
+    /**
+     * The {@link Wordlift_Admin_Author_Element} instance.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var \Wordlift_Admin_Author_Element $author_element The {@link Wordlift_Admin_Author_Element} instance.
+     */
+    protected $author_element;
+
+    /**
+     * The {@link Wordlift_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_Relation_Rebuild_Service} instance.
+     *
+     * @since  3.14.3
+     * @access private
+     * @var \Wordlift_Relation_Rebuild_Service $relation_rebuild_service The {@link Wordlift_Relation_Rebuild_Service} instance.
+     */
+    private $relation_rebuild_service;
+
+    /**
+     * The {@link Wordlift_Relation_Rebuild_Adapter} instance.
+     *
+     * @since  3.14.3
+     * @access private
+     * @var \Wordlift_Relation_Rebuild_Adapter $relation_rebuild_adapter The {@link Wordlift_Relation_Rebuild_Adapter} instance.
+     */
+    private $relation_rebuild_adapter;
+
+    /**
+     * The {@link Wordlift_Reference_Rebuild_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Reference_Rebuild_Service $reference_rebuild_service The {@link Wordlift_Reference_Rebuild_Service} instance.
+     */
+    private $reference_rebuild_service;
+
+    /**
+     * The {@link Wordlift_Google_Analytics_Export_Service} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var \Wordlift_Google_Analytics_Export_Service $google_analytics_export_service The {@link Wordlift_Google_Analytics_Export_Service} instance.
+     */
+    protected $google_analytics_export_service;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Adapter $entity_type_adapter The {@link Wordlift_Entity_Type_Adapter} instance.
+     */
+    protected $entity_type_adapter;
+
+    /**
+     * The {@link Wordlift_Storage_Factory} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Storage_Factory $storage_factory The {@link Wordlift_Storage_Factory} instance.
+     */
+    protected $storage_factory;
+
+    /**
+     * The {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Sparql_Tuple_Rendition_Factory $rendition_factory The {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
+     */
+    protected $rendition_factory;
+
+    /**
+     * The {@link Wordlift_Autocomplete_Adapter} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Autocomplete_Adapter $autocomplete_adapter The {@link Wordlift_Autocomplete_Adapter} instance.
+     */
+    private $autocomplete_adapter;
+
+    /**
+     * The {@link Wordlift_Relation_Service} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    protected $relation_service;
+
+    /**
+     * The {@link Wordlift_Cached_Post_Converter} instance.
+     *
+     * @since  3.16.0
+     * @access protected
+     * @var  \Wordlift_Cached_Post_Converter $cached_postid_to_jsonld_converter The {@link Wordlift_Cached_Post_Converter} instance.
+     *
+     */
+    protected $cached_postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_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;
+
+    //</editor-fold>
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        self::$instance = $this;
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.27.5';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+        // If we're in `WP_CLI` load the related files.
+        if ( class_exists( 'WP_CLI' ) ) {
+            $this->load_cli_dependencies();
+        }
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return Wordlift The {@link Wordlift} singleton instance.
+     * @since 3.11.2
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @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-linked-data-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        // Add the entity rating service.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The SPARQL service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
+
+        /**
+         * The WordLift import service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
+
+        /**
+         * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-listable.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-rebuild-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-reference-rebuild-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-adapter.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
+
+        /**
+         * Load cache-related files.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
-
-		/**
-		 * Load the JSON-LD service to publish entities using JSON-LD.s
-		 *
-		 * @since 3.8.0
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
-
-		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
-
-		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
-
-		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
-
-		/** Linked Data. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
-
-		/** Linked Data Rendition. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/intf-wordlift-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-default-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-address-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php';
-
-		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
-
-		/** 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';
-
-		/** Async Tasks. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-push-references-async-task.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-admin-status-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
-
-		/**
-		 * The 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';
+
+        /** Linked Data Rendition. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/intf-wordlift-sparql-tuple-rendition.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-default-sparql-tuple-rendition.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-address-sparql-tuple-rendition.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php';
+
+        /** Services. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
+
+        /** 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';
+
+        /** Async Tasks. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-push-references-async-task.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-admin-status-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+
+        /**
+         * The 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';
+
+        /*
 		 * Schema.org Services.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
-			new Wordlift_Schemaorg_Sync_Service();
-			$schemaorg_property_service = new Wordlift_Schemaorg_Property_Service();
-			new Wordlift_Schemaorg_Class_Service();
-		} else {
-			$schemaorg_property_service = null;
-		}
+        if ( WL_ALL_ENTITY_TYPES ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
+            new Wordlift_Schemaorg_Sync_Service();
+            $schemaorg_property_service = new Wordlift_Schemaorg_Property_Service();
+            new Wordlift_Schemaorg_Class_Service();
+        } else {
+            $schemaorg_property_service = null;
+        }
 
-		$this->loader = new Wordlift_Loader();
+        $this->loader = new Wordlift_Loader();
 
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
 
-		// Load the `wl-api` end-point.
-		new Wordlift_Http_Api();
+        // Load the `wl-api` end-point.
+        new Wordlift_Http_Api();
 
-		// Load the Install Service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-service.php';
-		$this->install_service = new Wordlift_Install_Service();
+        // Load the Install Service.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-service.php';
+        $this->install_service = new Wordlift_Install_Service();
 
-		/** Services. */
-		// Create the configuration service.
-		$this->configuration_service = new Wordlift_Configuration_Service();
-		$api_service                 = new Wordlift_Api_Service( $this->configuration_service );
+        /** Services. */
+        // Create the configuration service.
+        $this->configuration_service = new Wordlift_Configuration_Service();
+        $api_service                 = new Wordlift_Api_Service( $this->configuration_service );
 
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path() );
+        // Create an entity type service instance. It'll be later bound to the init action.
+        $this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path() );
 
-		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
+        // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+        $this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
 
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
 
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
-		$this->sparql_service        = new Wordlift_Sparql_Service();
-		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
-		$this->notice_service        = new Wordlift_Notice_Service();
-		$this->relation_service      = new Wordlift_Relation_Service();
+        $this->sparql_service        = new Wordlift_Sparql_Service();
+        $schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
+        $this->notice_service        = new Wordlift_Notice_Service();
+        $this->relation_service      = new Wordlift_Relation_Service();
 
-		$entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
-		$this->entity_uri_service = new Wordlift_Cached_Entity_Uri_Service( $this->configuration_service, $entity_uri_cache_service );
-		$this->entity_service     = new Wordlift_Entity_Service( $this->ui_service, $this->relation_service, $this->entity_uri_service );
-		$this->user_service       = new Wordlift_User_Service( $this->sparql_service, $this->entity_service );
+        $entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
+        $this->entity_uri_service = new Wordlift_Cached_Entity_Uri_Service( $this->configuration_service, $entity_uri_cache_service );
+        $this->entity_service     = new Wordlift_Entity_Service( $this->ui_service, $this->relation_service, $this->entity_uri_service );
+        $this->user_service       = new Wordlift_User_Service( $this->sparql_service, $this->entity_service );
 
-		// Instantiate the JSON-LD service.
-		$property_getter = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+        // Instantiate the JSON-LD service.
+        $property_getter = Wordlift_Property_Getter_Factory::create( $this->entity_service );
 
-		/** Linked Data. */
-		$this->storage_factory   = new Wordlift_Storage_Factory( $this->entity_service, $this->user_service, $property_getter );
-		$this->rendition_factory = new Wordlift_Sparql_Tuple_Rendition_Factory( $this->entity_service );
+        /** Linked Data. */
+        $this->storage_factory   = new Wordlift_Storage_Factory( $this->entity_service, $this->user_service, $property_getter );
+        $this->rendition_factory = new Wordlift_Sparql_Tuple_Rendition_Factory( $this->entity_service );
 
-		$this->schema_service = new Wordlift_Schema_Service( $this->storage_factory, $this->rendition_factory, $this->configuration_service );
+        $this->schema_service = new Wordlift_Schema_Service( $this->storage_factory, $this->rendition_factory, $this->configuration_service );
 
-		// Create a new instance of the Redirect service.
-		$this->redirect_service    = new Wordlift_Redirect_Service( $this->entity_uri_service );
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
+        // Create a new instance of the Redirect service.
+        $this->redirect_service    = new Wordlift_Redirect_Service( $this->entity_uri_service );
+        $this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
 
-		if ( ! apply_filters( 'wl_features__enable__legacy_linked_data', true ) ) {
-			new Wordlift_Linked_Data_Service( $this->entity_service, $this->entity_type_service, $this->schema_service, $this->sparql_service );
-		}
+        if ( ! apply_filters( 'wl_features__enable__legacy_linked_data', true ) ) {
+            new Wordlift_Linked_Data_Service( $this->entity_service, $this->entity_type_service, $this->schema_service, $this->sparql_service );
+        }
 
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service, $this->entity_type_service );
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service, $this->entity_type_service );
 
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
-		$this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
-		$this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
+        $this->topic_taxonomy_service        = new Wordlift_Topic_Taxonomy_Service();
+        $this->entity_types_taxonomy_service = new Wordlift_Entity_Type_Taxonomy_Service();
 
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
 
-		// Create an instance of the PrimaShop adapter.
-		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+        // Create an instance of the PrimaShop adapter.
+        $this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
-		// Create an import service instance to hook later to WP's import function.
-		$this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
+        // Create an import service instance to hook later to WP's import function.
+        $this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
 
-		$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+        $uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
 
-		// Create the entity rating service.
-		$this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
+        // Create the entity rating service.
+        $this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
 
-		// Create entity list customization (wp-admin/edit.php).
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
+        // Create entity list customization (wp-admin/edit.php).
+        $this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
 
-		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service, $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service, $this->entity_service );
 
-		// Create an instance of the Publisher Service and the AJAX Adapter.
-		$this->publisher_service = new Wordlift_Publisher_Service( $this->configuration_service );
-		$this->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
-		$this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+        // Create an instance of the Publisher Service and the AJAX Adapter.
+        $this->publisher_service = new Wordlift_Publisher_Service( $this->configuration_service );
+        $this->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
+        $this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
 
-		$attachment_service = new Wordlift_Attachment_Service();
+        $attachment_service = new Wordlift_Attachment_Service();
 
-		// Instantiate the JSON-LD service.
-		$property_getter                       = Wordlift_Property_Getter_Factory::create( $this->entity_service );
-		$this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
-		$this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $this->post_to_jsonld_converter );
-		$this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
-		$this->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
+        // Instantiate the JSON-LD service.
+        $property_getter                       = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+        $this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
+        $this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $this->post_to_jsonld_converter );
+        $this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
+        $this->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
 
-		$jsonld_cache                            = new Ttl_Cache( 'jsonld', 86400 );
-		$this->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $this->postid_to_jsonld_converter, $this->configuration_service, $jsonld_cache );
-		$this->jsonld_service                    = new Wordlift_Jsonld_Service( $this->entity_service, $this->cached_postid_to_jsonld_converter, $this->jsonld_website_converter );
+        $jsonld_cache                            = new Ttl_Cache( 'jsonld', 86400 );
+        $this->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $this->postid_to_jsonld_converter, $this->configuration_service, $jsonld_cache );
+        $this->jsonld_service                    = new Wordlift_Jsonld_Service( $this->entity_service, $this->cached_postid_to_jsonld_converter, $this->jsonld_website_converter );
 
-		/*
+        /*
 		 * 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( $this->entity_uri_service, $this->jsonld_service );
-		$jsonld_service      = new Jsonld_Service( $this->jsonld_service, $term_jsonld_adapter );
-		new Jsonld_Endpoint( $jsonld_service, $this->entity_uri_service );
-
-		// Prints the JSON-LD in the head.
-		new Jsonld_Adapter( $this->jsonld_service );
-
-		new Jsonld_By_Id_Endpoint( $this->jsonld_service, $this->entity_uri_service );
-
-		$this->key_validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
-		$this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service, $this->entity_uri_service );
-		// Creating Faq Content filter service.
-		$this->faq_content_filter_service = new Faq_Content_Filter();
-		$this->relation_rebuild_service   = new Wordlift_Relation_Rebuild_Service( $this->content_filter_service, $this->entity_service );
-		$this->sample_data_service        = new Wordlift_Sample_Data_Service( $this->entity_type_service, $this->configuration_service, $this->user_service );
-		$this->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter( $this->sample_data_service );
-		$this->reference_rebuild_service  = new Wordlift_Reference_Rebuild_Service( $this->entity_service );
-
-		// Initialize the short-codes.
-		new Wordlift_Navigator_Shortcode();
-		new Wordlift_Products_Navigator_Shortcode();
-		new Wordlift_Chord_Shortcode();
-		new Wordlift_Geomap_Shortcode();
-		new Wordlift_Timeline_Shortcode();
-		new Wordlift_Related_Entities_Cloud_Shortcode( $this->relation_service );
-		new Wordlift_Vocabulary_Shortcode( $this->configuration_service );
-		new Wordlift_Faceted_Search_Shortcode();
-
-		// Initialize the Context Cards Service
-		$this->context_cards_service = new Wordlift_Context_Cards_Service();
-
-		// Initialize the SEO service.
-		new Wordlift_Seo_Service();
-
-		// Initialize the AMP service.
-		new Wordlift_AMP_Service( $this->jsonld_service );
-
-		/** Services. */
-		$this->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
-		new Wordlift_Image_Service();
-
-		/** Adapters. */
-		$this->entity_type_adapter    = new Wordlift_Entity_Type_Adapter( $this->entity_type_service );
-		$this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $this->publisher_service );
-		$this->tinymce_adapter        = new Wordlift_Tinymce_Adapter( $this );
-		//$this->faq_tinymce_adapter      = new Faq_Tinymce_Adapter();
-		$this->relation_rebuild_adapter = new Wordlift_Relation_Rebuild_Adapter( $this->relation_rebuild_service );
-
-		/*
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-term-jsonld-adapter.php';
+        $term_jsonld_adapter = new Wordlift_Term_JsonLd_Adapter( $this->entity_uri_service, $this->jsonld_service );
+        $jsonld_service      = new Jsonld_Service( $this->jsonld_service, $term_jsonld_adapter );
+        new Jsonld_Endpoint( $jsonld_service, $this->entity_uri_service );
+
+        // Prints the JSON-LD in the head.
+        new Jsonld_Adapter( $this->jsonld_service );
+
+        new Jsonld_By_Id_Endpoint( $this->jsonld_service, $this->entity_uri_service );
+
+        $this->key_validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
+        $this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service, $this->entity_uri_service );
+        // Creating Faq Content filter service.
+        $this->faq_content_filter_service = new Faq_Content_Filter();
+        $this->relation_rebuild_service   = new Wordlift_Relation_Rebuild_Service( $this->content_filter_service, $this->entity_service );
+        $this->sample_data_service        = new Wordlift_Sample_Data_Service( $this->entity_type_service, $this->configuration_service, $this->user_service );
+        $this->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter( $this->sample_data_service );
+        $this->reference_rebuild_service  = new Wordlift_Reference_Rebuild_Service( $this->entity_service );
+
+        // Initialize the short-codes.
+        new Wordlift_Navigator_Shortcode();
+        new Wordlift_Products_Navigator_Shortcode();
+        new Wordlift_Chord_Shortcode();
+        new Wordlift_Geomap_Shortcode();
+        new Wordlift_Timeline_Shortcode();
+        new Wordlift_Related_Entities_Cloud_Shortcode( $this->relation_service );
+        new Wordlift_Vocabulary_Shortcode( $this->configuration_service );
+        new Wordlift_Faceted_Search_Shortcode();
+
+        // Initialize the Context Cards Service
+        $this->context_cards_service = new Wordlift_Context_Cards_Service();
+
+        // Initialize the SEO service.
+        new Wordlift_Seo_Service();
+
+        // Initialize the AMP service.
+        new Wordlift_AMP_Service( $this->jsonld_service );
+
+        /** Services. */
+        $this->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
+        new Wordlift_Image_Service();
+
+        /** Adapters. */
+        $this->entity_type_adapter    = new Wordlift_Entity_Type_Adapter( $this->entity_type_service );
+        $this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $this->publisher_service );
+        $this->tinymce_adapter        = new Wordlift_Tinymce_Adapter( $this );
+        //$this->faq_tinymce_adapter      = new Faq_Tinymce_Adapter();
+        $this->relation_rebuild_adapter = new Wordlift_Relation_Rebuild_Adapter( $this->relation_rebuild_service );
+
+        /*
 		 * Exclude our public js from WP-Rocket.
 		 *
 		 * @since 3.19.4
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
 		 */
-		new Wordlift_WpRocket_Adapter();
-
-		// Create a Rebuild Service instance, which we'll later bound to an ajax call.
-		$this->rebuild_service = new Wordlift_Rebuild_Service(
-			$this->sparql_service,
-			$uri_service
-		);
-
-		/** Async Tasks. */
-		new Wordlift_Sparql_Query_Async_Task();
-		new Wordlift_Push_References_Async_Task();
-
-		/** WordPress Admin UI. */
-
-		// UI elements.
-		$this->input_element           = new Wordlift_Admin_Input_Element();
-		$this->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
-		$this->select2_element         = new Wordlift_Admin_Select2_Element();
-		$this->language_select_element = new Wordlift_Admin_Language_Select_Element();
-		$this->country_select_element  = new Wordlift_Admin_Country_Select_Element();
-		$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-		$this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $this->publisher_service, $tabs_element, $this->select2_element );
-		$this->author_element          = new Wordlift_Admin_Author_Element( $this->publisher_service, $this->select2_element );
-
-		$this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->country_select_element, $this->publisher_element, $this->radio_input_element );
-		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
-
-		$this->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $this->configuration_service, $this->input_element, $this->radio_input_element );
-		$this->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $this->analytics_settings_page );
-		$this->analytics_connect                   = new Wordlift_Analytics_Connect();
-
-		// Pages.
-		/*
+        new Wordlift_WpRocket_Adapter();
+
+        // Create a Rebuild Service instance, which we'll later bound to an ajax call.
+        $this->rebuild_service = new Wordlift_Rebuild_Service(
+            $this->sparql_service,
+            $uri_service
+        );
+
+        /** Async Tasks. */
+        new Wordlift_Sparql_Query_Async_Task();
+        new Wordlift_Push_References_Async_Task();
+
+        /** WordPress Admin UI. */
+
+        // UI elements.
+        $this->input_element           = new Wordlift_Admin_Input_Element();
+        $this->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
+        $this->select2_element         = new Wordlift_Admin_Select2_Element();
+        $this->language_select_element = new Wordlift_Admin_Language_Select_Element();
+        $this->country_select_element  = new Wordlift_Admin_Country_Select_Element();
+        $tabs_element                  = new Wordlift_Admin_Tabs_Element();
+        $this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $this->publisher_service, $tabs_element, $this->select2_element );
+        $this->author_element          = new Wordlift_Admin_Author_Element( $this->publisher_service, $this->select2_element );
+
+        $this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->country_select_element, $this->publisher_element, $this->radio_input_element );
+        $this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
+
+        $this->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $this->configuration_service, $this->input_element, $this->radio_input_element );
+        $this->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $this->analytics_settings_page );
+        $this->analytics_connect                   = new Wordlift_Analytics_Connect();
+
+        // Pages.
+        /*
 		 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 		 *
 		 * @since 3.20.3
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 		 */
-		if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
-			new Wordlift_Admin_Post_Edit_Page( $this );
-		}
-		new Wordlift_Entity_Type_Admin_Service();
+        if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
+            new Wordlift_Admin_Post_Edit_Page( $this );
+        }
+        new Wordlift_Entity_Type_Admin_Service();
 
-		// create an instance of the entity type list admin page controller.
-		$this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
+        // create an instance of the entity type list admin page controller.
+        $this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
 
-		// create an instance of the entity type setting admin page controller.
-		$this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
+        // create an instance of the entity type setting admin page controller.
+        $this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
 
-		/** Widgets */
-		$this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
+        /** Widgets */
+        $this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
-		/* WordPress Admin. */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
+        /* WordPress Admin. */
+        $this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
+        $this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
 
-		// Create an instance of the install wizard.
-		$this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service, $this->language_select_element, $this->country_select_element );
+        // Create an instance of the install wizard.
+        $this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service, $this->language_select_element, $this->country_select_element );
 
-		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
+        $this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
 
-		// User Profile.
-		new Wordlift_Admin_User_Profile_Page( $this->author_element, $this->user_service );
+        // User Profile.
+        new Wordlift_Admin_User_Profile_Page( $this->author_element, $this->user_service );
 
-		$this->entity_page_service = new Wordlift_Entity_Page_Service();
+        $this->entity_page_service = new Wordlift_Entity_Page_Service();
 
-		// Load the debug service if WP is in debug mode.
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
-			new Wordlift_Debug_Service( $this->entity_service, $uri_service );
-		}
+        // Load the debug service if WP is in debug mode.
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
+            new Wordlift_Debug_Service( $this->entity_service, $uri_service );
+        }
 
-		// Remote Image Service.
-		new Wordlift_Remote_Image_Service();
+        // Remote Image Service.
+        new Wordlift_Remote_Image_Service();
 
-		/*
+        /*
 		 * Provides mappings between post types and entity types.
 		 *
 		 * @since 3.20.0
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/852.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
 
-		// Create an instance of the Mapping Service and assign it to the Ajax Adapter.
-		new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
+        // Create an instance of the Mapping Service and assign it to the Ajax Adapter.
+        new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
 
-		/*
+        /*
 		 * Batch Operations. They're similar to Batch Actions but do not require working on post types.
 		 *
 		 * Eventually Batch Actions will become Batch Operations.
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
-		/*
+        /*
 		 * Add the Search Keywords taxonomy to manage the Search Keywords on WLS.
 		 *
 		 * @link https://github.com/insideout10/wordlift-plugin/issues/761
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/search-keywords/class-wordlift-search-keyword-taxonomy.php';
-		new Wordlift_Search_Keyword_Taxonomy( $api_service );
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/search-keywords/class-wordlift-search-keyword-taxonomy.php';
+        new Wordlift_Search_Keyword_Taxonomy( $api_service );
 
-		/*
+        /*
 		 * Load 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();
-		$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( $this->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();
+        $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( $this->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();
+        new Templates_Ajax_Endpoint();
+        // Call this static method to register FAQ routes to rest api - disabled
+        //Faq_Rest_Controller::register_routes();
 
-		/*
+        /*
 		 * Create a singleton for the Analysis_Response_Ops_Factory.
 		 */
-		$entity_helper = new Entity_Helper( $this->entity_uri_service, $this->entity_service );
-		new Analysis_Response_Ops_Factory(
-			$this->entity_uri_service,
-			$this->entity_service,
-			$this->entity_type_service,
-			$this->storage_factory->post_images(),
-			$entity_helper
-		);
-
-		/** WL Autocomplete. */
-		$autocomplete_service       = new All_Autocomplete_Service( array(
-			new Local_Autocomplete_Service(),
-			new Linked_Data_Autocomplete_Service( $this->configuration_service, $entity_helper, $this->entity_uri_service, $this->entity_service ),
-		) );
-		$this->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();
-	}
-
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
-
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
-
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
-
-		$plugin_admin = new Wordlift_Admin(
-			$this->get_plugin_name(),
-			$this->get_version(),
-			$this->configuration_service,
-			$this->notice_service,
-			$this->user_service
-		);
-
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
-
-		// Hook the init action to taxonomy services.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
-		$this->loader->add_action( 'init', $this->entity_types_taxonomy_service, 'init', 0 );
-
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
-
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
-
-		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
-
-		/*
+        $entity_helper = new Entity_Helper( $this->entity_uri_service, $this->entity_service );
+        new Analysis_Response_Ops_Factory(
+            $this->entity_uri_service,
+            $this->entity_service,
+            $this->entity_type_service,
+            $this->storage_factory->post_images(),
+            $entity_helper
+        );
+
+        /** WL Autocomplete. */
+        $autocomplete_service       = new All_Autocomplete_Service( array(
+            new Local_Autocomplete_Service(),
+            new Linked_Data_Autocomplete_Service( $this->configuration_service, $entity_helper, $this->entity_uri_service, $this->entity_service ),
+        ) );
+        $this->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();
+    }
+
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
+
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
+
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
+
+        $plugin_admin = new Wordlift_Admin(
+            $this->get_plugin_name(),
+            $this->get_version(),
+            $this->configuration_service,
+            $this->notice_service,
+            $this->user_service
+        );
+
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
+
+        // Hook the init action to taxonomy services.
+        $this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+        $this->loader->add_action( 'init', $this->entity_types_taxonomy_service, 'init', 0 );
+
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+
+        // Hook the updated_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Register custom allowed redirect hosts.
+        $this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+
+        /*
 		 * The old dashboard is replaced with dashboard v2.
 		 *
 		 * The old dashboard service is still loaded because its functions are used.
@@ -1604,326 +1604,326 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		// $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		// $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
-
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post', $this->rating_service, 'set_rating_for', 20, 1 );
-
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
-
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns.
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		// no explicit entity as it prevents handling of other post types.
-		$this->loader->add_filter( 'manage_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection.
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_list_service, 'pre_get_posts' );
-		$this->loader->add_action( 'load-edit.php', $this->entity_list_service, 'load_edit' );
-
-		/*
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        // $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        // $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_action( 'save_post', $this->rating_service, 'set_rating_for', 20, 1 );
+
+        $this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+        $this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
+
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns.
+        $this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+        // no explicit entity as it prevents handling of other post types.
+        $this->loader->add_filter( 'manage_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection.
+        $this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_list_service, 'pre_get_posts' );
+        $this->loader->add_action( 'load-edit.php', $this->entity_list_service, 'load_edit' );
+
+        /*
 		 * If `All Entity Types` is disable, use the radio button Walker.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( ! WL_ALL_ENTITY_TYPES ) {
-			$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-		}
+        if ( ! WL_ALL_ENTITY_TYPES ) {
+            $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+        }
 
-		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
-		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
 
-		// Filter imported post meta.
-		$this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
+        // Filter imported post meta.
+        $this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
 
-		// Notify the import service when an import starts and ends.
-		$this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
-		$this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
+        // Notify the import service when an import starts and ends.
+        $this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
+        $this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
 
-		// Hook the AJAX wl_rebuild action to the Rebuild Service.
-		$this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
-		$this->loader->add_action( 'wp_ajax_wl_rebuild_references', $this->reference_rebuild_service, 'rebuild' );
+        // Hook the AJAX wl_rebuild action to the Rebuild Service.
+        $this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
+        $this->loader->add_action( 'wp_ajax_wl_rebuild_references', $this->reference_rebuild_service, 'rebuild' );
 
-		// Hook the menu to the Download Your Data page.
-		$this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
+        // Hook the menu to the Download Your Data page.
+        $this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
+        $this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
+        $this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
 
-		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
+        // Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
+        $this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
 
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
-		$this->loader->add_action( 'admin_post_wl_jsonld', $this->jsonld_service, 'get' );
-		$this->loader->add_action( 'admin_post_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
+        $this->loader->add_action( 'admin_post_wl_jsonld', $this->jsonld_service, 'get' );
+        $this->loader->add_action( 'admin_post_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
 
-		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
+        // Hook the AJAX wl_validate_key action to the Key Validation service.
+        $this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
 
-		// Hook the AJAX wl_update_country_options action to the countries.
-		$this->loader->add_action( 'wp_ajax_wl_update_country_options', $this->country_select_element, 'get_options_html' );
+        // Hook the AJAX wl_update_country_options action to the countries.
+        $this->loader->add_action( 'wp_ajax_wl_update_country_options', $this->country_select_element, 'get_options_html' );
 
-		// Hook the `admin_init` function to the Admin Setup.
-		$this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
+        // Hook the `admin_init` function to the Admin Setup.
+        $this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
 
-		// Hook the admin_init to the settings page.
-		$this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
-		$this->loader->add_action( 'admin_init', $this->analytics_settings_page, 'admin_init' );
+        // Hook the admin_init to the settings page.
+        $this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
+        $this->loader->add_action( 'admin_init', $this->analytics_settings_page, 'admin_init' );
 
-		$this->loader->add_filter( 'admin_post_thumbnail_html', $this->publisher_service, 'add_featured_image_instruction' );
+        $this->loader->add_filter( 'admin_post_thumbnail_html', $this->publisher_service, 'add_featured_image_instruction' );
 
-		// Hook the menu creation on the general wordlift menu creation.
-		$this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
+        // Hook the menu creation on the general wordlift menu creation.
+        $this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
 
-		/*
+        /*
 		 * Display the `Wordlift_Admin_Search_Rankings_Page` page.
 		 *
 		 * @link https://github.com/insideout10/wordlift-plugin/issues/761
 		 *
 		 * @since 3.20.0
 		 */
-		if ( in_array( $this->configuration_service->get_package_type(), array( 'editorial', 'business' ) ) ) {
-			$admin_search_rankings_page = new Wordlift_Admin_Search_Rankings_Page();
-			$this->loader->add_action( 'wl_admin_menu', $admin_search_rankings_page, 'admin_menu' );
-		}
+        if ( in_array( $this->configuration_service->get_package_type(), array( 'editorial', 'business' ) ) ) {
+            $admin_search_rankings_page = new Wordlift_Admin_Search_Rankings_Page();
+            $this->loader->add_action( 'wl_admin_menu', $admin_search_rankings_page, 'admin_menu' );
+        }
 
-		// Hook key update.
-		$this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
-		$this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
+        // Hook key update.
+        $this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
+        $this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
 
-		// Add additional action links to the WordLift plugin in the plugins page.
-		$this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
+        // Add additional action links to the WordLift plugin in the plugins page.
+        $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
 
-		/*
+        /*
 		 * Remove the Analytics Settings link from the plugin page.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/932
 		 * @since 3.21.1
 		 */
-		// $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->analytics_settings_page_action_link, 'action_links', 10, 1 );
-
-		// Hook the AJAX `wl_publisher` action name.
-		$this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
-
-		// Hook row actions for the entity type list admin.
-		$this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
-
-		/** Ajax actions. */
-		$this->loader->add_action( 'wp_ajax_wl_google_analytics_export', $this->google_analytics_export_service, 'export' );
-
-		// Hook capabilities manipulation to allow access to entity type admin
-		// page  on WordPress versions before 4.7.
-		global $wp_version;
-		if ( version_compare( $wp_version, '4.7', '<' ) ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
-		}
-
-		$this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
-
-		/** Adapters. */
-		$this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
-		/**
-		 * Disabling Faq temporarily.
-		 * Load the tinymce editor button on the tool bar.
-		 * @since 3.26.0
-		 */
-		//$this->loader->add_filter( 'tiny_mce_before_init', $this->faq_tinymce_adapter, 'register_custom_tags' );
-		//$this->loader->add_filter( 'mce_buttons', $this->faq_tinymce_adapter, 'register_faq_toolbar_button', 10, 1 );
-		//$this->loader->add_filter( 'mce_external_plugins', $this->faq_tinymce_adapter, 'register_faq_tinymce_plugin', 10, 1 );
-
-
-		$this->loader->add_action( 'wp_ajax_wl_relation_rebuild_process_all', $this->relation_rebuild_adapter, 'process_all' );
-		$this->loader->add_action( 'wp_ajax_wl_sample_data_create', $this->sample_data_ajax_adapter, 'create' );
-		$this->loader->add_action( 'wp_ajax_wl_sample_data_delete', $this->sample_data_ajax_adapter, 'delete' );
-		/**
-		 * @since 3.26.0
-		 * Post excerpt meta box would be only loaded when the language is set
-		 * to english
-		 */
-		if ( $this->configuration_service->get_language_code() === 'en' ) {
-			$excerpt_adapter = new Post_Excerpt_Meta_Box_Adapter();
-			$this->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();
-		}
-
-		$this->loader->add_action( 'update_user_metadata', $this->user_service, 'update_user_metadata', 10, 5 );
-		$this->loader->add_action( 'delete_user_metadata', $this->user_service, 'delete_user_metadata', 10, 5 );
-
-		// Handle the autocomplete request.
-		add_action( 'wp_ajax_wl_autocomplete', array(
-			$this->autocomplete_adapter,
-			'wl_autocomplete',
-		) );
-		add_action( 'wp_ajax_nopriv_wl_autocomplete', array(
-			$this->autocomplete_adapter,
-			'wl_autocomplete',
-		) );
-
-		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
-		}
-
-		$deactivator_feedback = new Wordlift_Deactivator_Feedback( $this->configuration_service );
-
-		add_action( 'admin_footer', array( $deactivator_feedback, 'render_feedback_popup' ) );
-		add_action( 'admin_enqueue_scripts', array( $deactivator_feedback, 'enqueue_popup_scripts' ) );
-		add_action( 'wp_ajax_wl_deactivation_feedback', array( $deactivator_feedback, 'wl_deactivation_feedback' ) );
-
-		/**
-		 * Always allow the `wordlift/classification` block.
-		 *
-		 * @since 3.23.0
-		 */
-		add_filter( 'allowed_block_types', function ( $value ) {
-
-			if ( true === $value ) {
-				return $value;
-			}
-
-			return array_merge( (array) $value, array( 'wordlift/classification' ) );
-		}, PHP_INT_MAX );
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
-
-		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $this->context_cards_service, 'enqueue_scripts' );
-
-		// Registering Faq_Content_Filter service used for removing faq question and answer tags from the html.
-		$this->loader->add_filter( 'the_content', $this->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 ) {
-			$this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
-		}
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
-
-		// Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
-		// in order to tweak WP's `WP_Query` to include entities in queries related
-		// to categories.
-		$this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
-
-		/*
+        // $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->analytics_settings_page_action_link, 'action_links', 10, 1 );
+
+        // Hook the AJAX `wl_publisher` action name.
+        $this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
+
+        // Hook row actions for the entity type list admin.
+        $this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+
+        /** Ajax actions. */
+        $this->loader->add_action( 'wp_ajax_wl_google_analytics_export', $this->google_analytics_export_service, 'export' );
+
+        // Hook capabilities manipulation to allow access to entity type admin
+        // page  on WordPress versions before 4.7.
+        global $wp_version;
+        if ( version_compare( $wp_version, '4.7', '<' ) ) {
+            $this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
+        }
+
+        $this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+
+        /** Adapters. */
+        $this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+        /**
+         * Disabling Faq temporarily.
+         * Load the tinymce editor button on the tool bar.
+         * @since 3.26.0
+         */
+        //$this->loader->add_filter( 'tiny_mce_before_init', $this->faq_tinymce_adapter, 'register_custom_tags' );
+        //$this->loader->add_filter( 'mce_buttons', $this->faq_tinymce_adapter, 'register_faq_toolbar_button', 10, 1 );
+        //$this->loader->add_filter( 'mce_external_plugins', $this->faq_tinymce_adapter, 'register_faq_tinymce_plugin', 10, 1 );
+
+
+        $this->loader->add_action( 'wp_ajax_wl_relation_rebuild_process_all', $this->relation_rebuild_adapter, 'process_all' );
+        $this->loader->add_action( 'wp_ajax_wl_sample_data_create', $this->sample_data_ajax_adapter, 'create' );
+        $this->loader->add_action( 'wp_ajax_wl_sample_data_delete', $this->sample_data_ajax_adapter, 'delete' );
+        /**
+         * @since 3.26.0
+         * Post excerpt meta box would be only loaded when the language is set
+         * to english
+         */
+        if ( $this->configuration_service->get_language_code() === 'en' ) {
+            $excerpt_adapter = new Post_Excerpt_Meta_Box_Adapter();
+            $this->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();
+        }
+
+        $this->loader->add_action( 'update_user_metadata', $this->user_service, 'update_user_metadata', 10, 5 );
+        $this->loader->add_action( 'delete_user_metadata', $this->user_service, 'delete_user_metadata', 10, 5 );
+
+        // Handle the autocomplete request.
+        add_action( 'wp_ajax_wl_autocomplete', array(
+            $this->autocomplete_adapter,
+            'wl_autocomplete',
+        ) );
+        add_action( 'wp_ajax_nopriv_wl_autocomplete', array(
+            $this->autocomplete_adapter,
+            'wl_autocomplete',
+        ) );
+
+        // Hooks to restrict multisite super admin from manipulating entity types.
+        if ( is_multisite() ) {
+            $this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
+        }
+
+        $deactivator_feedback = new Wordlift_Deactivator_Feedback( $this->configuration_service );
+
+        add_action( 'admin_footer', array( $deactivator_feedback, 'render_feedback_popup' ) );
+        add_action( 'admin_enqueue_scripts', array( $deactivator_feedback, 'enqueue_popup_scripts' ) );
+        add_action( 'wp_ajax_wl_deactivation_feedback', array( $deactivator_feedback, 'wl_deactivation_feedback' ) );
+
+        /**
+         * Always allow the `wordlift/classification` block.
+         *
+         * @since 3.23.0
+         */
+        add_filter( 'allowed_block_types', function ( $value ) {
+
+            if ( true === $value ) {
+                return $value;
+            }
+
+            return array_merge( (array) $value, array( 'wordlift/classification' ) );
+        }, PHP_INT_MAX );
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        // Register the entity post type.
+        $this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
+
+        // Bind the link generation and handling hooks to the entity link service.
+        $this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $this->context_cards_service, 'enqueue_scripts' );
+
+        // Registering Faq_Content_Filter service used for removing faq question and answer tags from the html.
+        $this->loader->add_filter( 'the_content', $this->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 ) {
+            $this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
+        }
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+
+        // Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
+        // in order to tweak WP's `WP_Query` to include entities in queries related
+        // to categories.
+        $this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
+
+        /*
 		 * Hook the `pre_get_posts` action to the `Wordlift_Entity_Page_Service`
 		 * in order to tweak WP's `WP_Query` to show event related entities in reverse
 		 * order of start time.
 		 */
-		$this->loader->add_action( 'pre_get_posts', $this->entity_page_service, 'pre_get_posts', 10, 1 );
-
-		$this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
-
-		// This hook have to run before the rating service, as otherwise the post might not be a proper entity when rating is done.
-		$this->loader->add_action( 'save_post', $this->entity_type_adapter, 'save_post', 9, 3 );
-
-		// Analytics Script Frontend.
-		if ( $this->configuration_service->is_analytics_enable() ) {
-			$this->loader->add_action( 'wp_enqueue_scripts', $this->analytics_connect, 'enqueue_scripts', 10 );
-		}
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @return    string    The name of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @return    string    The version number of the plugin.
-	 * @since     1.0.0
-	 */
-	public function get_version() {
-		return $this->version;
-	}
-
-	/**
-	 * Load dependencies for WP-CLI.
-	 *
-	 * @throws Exception
-	 * @since 3.18.0
-	 */
-	private function load_cli_dependencies() {
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'cli/class-wordlift-push-reference-data-command.php';
-
-		$push_reference_data_command = new Wordlift_Push_Reference_Data_Command( $this->relation_service, $this->entity_service, $this->sparql_service, $this->configuration_service, $this->entity_type_service );
-
-		WP_CLI::add_command( 'wl references push', $push_reference_data_command );
-
-	}
-
-	/**
-	 * Get the {@link \Wordlift_Dashboard_Service} to allow others to use its functions.
-	 *
-	 * @return \Wordlift_Dashboard_Service The {@link \Wordlift_Dashboard_Service} instance.
-	 * @since 3.20.0
-	 */
-	public function get_dashboard_service() {
-
-		return $this->dashboard_service;
-	}
+        $this->loader->add_action( 'pre_get_posts', $this->entity_page_service, 'pre_get_posts', 10, 1 );
+
+        $this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+
+        // This hook have to run before the rating service, as otherwise the post might not be a proper entity when rating is done.
+        $this->loader->add_action( 'save_post', $this->entity_type_adapter, 'save_post', 9, 3 );
+
+        // Analytics Script Frontend.
+        if ( $this->configuration_service->is_analytics_enable() ) {
+            $this->loader->add_action( 'wp_enqueue_scripts', $this->analytics_connect, 'enqueue_scripts', 10 );
+        }
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @return    string    The name of the plugin.
+     * @since     1.0.0
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     * @since     1.0.0
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @return    string    The version number of the plugin.
+     * @since     1.0.0
+     */
+    public function get_version() {
+        return $this->version;
+    }
+
+    /**
+     * Load dependencies for WP-CLI.
+     *
+     * @throws Exception
+     * @since 3.18.0
+     */
+    private function load_cli_dependencies() {
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'cli/class-wordlift-push-reference-data-command.php';
+
+        $push_reference_data_command = new Wordlift_Push_Reference_Data_Command( $this->relation_service, $this->entity_service, $this->sparql_service, $this->configuration_service, $this->entity_type_service );
+
+        WP_CLI::add_command( 'wl references push', $push_reference_data_command );
+
+    }
+
+    /**
+     * Get the {@link \Wordlift_Dashboard_Service} to allow others to use its functions.
+     *
+     * @return \Wordlift_Dashboard_Service The {@link \Wordlift_Dashboard_Service} instance.
+     * @since 3.20.0
+     */
+    public function get_dashboard_service() {
+
+        return $this->dashboard_service;
+    }
 
 }

Spacing +333 added lines, -333 removed lines

@@ -755,7 +755,7 @@ 
 		$this->define_public_hooks();
 
 		// If we're in `WP_CLI` load the related files.
-		if ( class_exists( 'WP_CLI' ) ) {
+		if (class_exists('WP_CLI')) {
 			$this->load_cli_dependencies();
 		}
 
@@ -796,381 +796,381 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		// The class responsible for plugin uninstall.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-deactivator-feedback.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-deactivator-feedback.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * WordLift's supported languages.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-languages.php';
 
 		/**
 		 * WordLift's supported countries.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-countries.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-countries.php';
 
 		/**
 		 * Provide support functions to sanitize data.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sanitizer.php';
 
 		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-http-api.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-linked-data-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-relation-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-image-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-http-api.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-redirect-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-configuration-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-post-type-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-type-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-link-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-linked-data-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-relation-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-image-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The schema:url property service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-property-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-url-property-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-type-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-uri-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-rating-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The Topic Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-topic-taxonomy-service.php';
 
 		/**
 		 * The SPARQL service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sparql-service.php';
 
 		/**
 		 * The WordLift import service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-import-service.php';
 
 		/**
 		 * The WordLift URI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-uri-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-property-factory.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sample-data-service.php';
 
 		/**
 		 * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-listable.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-reference-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/rebuild/class-wordlift-relation-rebuild-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/rebuild/class-wordlift-listable.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/rebuild/class-wordlift-rebuild-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/rebuild/class-wordlift-reference-rebuild-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/rebuild/class-wordlift-relation-rebuild-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/rebuild/class-wordlift-relation-rebuild-adapter.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/properties/class-wordlift-property-getter-factory.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-attachment-service.php';
 
 		/**
 		 * Load the converters.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-website-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/intf-wordlift-post-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-postid-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-jsonld-website-converter.php';
 
 		/**
 		 * Load cache-related files.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cache/require.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/cache/require.php';
 
 		/**
 		 * Load the content filter.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-content-filter-service.php';
 
 		/*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-post-excerpt-helper.php';
 
 		/**
 		 * Load the JSON-LD service to publish entities using JSON-LD.s
 		 *
 		 * @since 3.8.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-jsonld-service.php';
 
 		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-publisher-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-publisher-ajax-adapter.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-post-adapter.php';
 
 		/**
 		 * Load the WordLift key validation service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-key-validation-service.php';
 
 		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-category-taxonomy-service.php';
 
 		// Load the `Wordlift_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-page-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-page-service.php';
 
 		/** Linked Data. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-author-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-image-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-post-related-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-url-property-storage.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/storage/class-wordlift-storage-factory.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-meta-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-property-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-taxonomy-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-schema-class-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-author-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-image-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-post-related-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-url-property-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/storage/class-wordlift-storage-factory.php';
 
 		/** Linked Data Rendition. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/intf-wordlift-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-default-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-address-sparql-tuple-rendition.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/rendition/intf-wordlift-sparql-tuple-rendition.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/rendition/class-wordlift-default-sparql-tuple-rendition.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/rendition/class-wordlift-address-sparql-tuple-rendition.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php';
 
 		/** Services. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-google-analytics-export-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-api-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-google-analytics-export-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-api-service.php';
 
 		/** Adapters. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sample-data-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-wprocket-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-tinymce-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-newrelic-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sample-data-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-type-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-wprocket-adapter.php';
 
 		/** Async Tasks. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-push-references-async-task.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/wp-async-task/class-wordlift-async-task.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/wp-async-task/class-wordlift-push-references-async-task.php';
 
 		/** Autocomplete. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-autocomplete-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-autocomplete-adapter.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-remote-image-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-remote-image-service.php';
 
 		/** Analytics */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/analytics/class-wordlift-analytics-connect.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/analytics/class-wordlift-analytics-connect.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The class to customize the entity list admin page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-entity-list.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
 		global $wp_version;
-		if ( version_compare( $wp_version, '5.3', '<' ) ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		if (version_compare($wp_version, '5.3', '<')) {
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 		} else {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker-5-3.php';
 		}
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The PrimaShop adapter.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-primashop-adapter.php';
 
 		/**
 		 * The WordLift Dashboard service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard.php';
 
 		/**
 		 * The admin 'Install wizard' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-setup.php';
 
 		/**
 		 * The WordLift entity type list admin page controller.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
 
 		/**
 		 * The WordLift entity type settings admin page controller.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-type-settings.php';
 
 		/**
 		 * The admin 'Download Your Data' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-download-your-data-page.php';
 
 		/**
 		 * The admin 'WordLift Settings' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-input-radio-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-country-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-author-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/elements/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/intf-wordlift-admin-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-input-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-input-radio-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-select-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-select2-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-language-select-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-country-select-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-tabs-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-author-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/elements/class-wordlift-admin-publisher-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-settings-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-settings-analytics-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-settings-page-action-link.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-settings-analytics-page-action-link.php';
 
 		/** Admin Pages */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-user-profile-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-status-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-admin-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-user-profile-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-status-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-type-admin-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The shortcode abstract class.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-shortcode.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The Navigator shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-navigator-shortcode.php';
 
 		/**
 		 * The Products Navigator shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-products-navigator-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-products-navigator-shortcode.php';
 
 		/**
 		 * The chord shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-chord-shortcode.php';
 
 		/**
 		 * The geomap shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-geomap-shortcode.php';
 
 		/**
 		 * The entity cloud shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-related-entities-cloud-shortcode.php';
 
 		/**
 		 * The entity glossary shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-alphabet-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-vocabulary-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-alphabet-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-vocabulary-shortcode.php';
 
 		/**
 		 * Faceted Search shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-faceted-search-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-faceted-search-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		/**
 		 * The SEO service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-seo-service.php';
 
 		/**
 		 * The AMP service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-amp-service.php';
 
 		/** Widgets */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-context-cards.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-widget.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-related-entities-cloud-widget.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-context-cards.php';
 
 		/*
 		 * Schema.org Services.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
+		if (WL_ALL_ENTITY_TYPES) {
+			require_once plugin_dir_path(dirname(__FILE__)).'includes/schemaorg/class-wordlift-schemaorg-sync-service.php';
+			require_once plugin_dir_path(dirname(__FILE__)).'includes/schemaorg/class-wordlift-schemaorg-property-service.php';
+			require_once plugin_dir_path(dirname(__FILE__)).'includes/schemaorg/class-wordlift-schemaorg-class-service.php';
 			new Wordlift_Schemaorg_Sync_Service();
 			$schemaorg_property_service = new Wordlift_Schemaorg_Property_Service();
 			new Wordlift_Schemaorg_Class_Service();
@@ -1182,25 +1182,25 @@ 
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Load the `wl-api` end-point.
 		new Wordlift_Http_Api();
 
 		// Load the Install Service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-service.php';
 		$this->install_service = new Wordlift_Install_Service();
 
 		/** Services. */
 		// Create the configuration service.
 		$this->configuration_service = new Wordlift_Configuration_Service();
-		$api_service                 = new Wordlift_Api_Service( $this->configuration_service );
+		$api_service                 = new Wordlift_Api_Service($this->configuration_service);
 
 		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path() );
+		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service(Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path());
 
 		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
+		$this->entity_link_service = new Wordlift_Entity_Link_Service($this->entity_post_type_service, $this->configuration_service->get_entity_base_path());
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -1209,34 +1209,34 @@ 
 		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
 		$this->sparql_service        = new Wordlift_Sparql_Service();
-		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
+		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service($this->sparql_service);
 		$this->notice_service        = new Wordlift_Notice_Service();
 		$this->relation_service      = new Wordlift_Relation_Service();
 
-		$entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
-		$this->entity_uri_service = new Wordlift_Cached_Entity_Uri_Service( $this->configuration_service, $entity_uri_cache_service );
-		$this->entity_service     = new Wordlift_Entity_Service( $this->ui_service, $this->relation_service, $this->entity_uri_service );
-		$this->user_service       = new Wordlift_User_Service( $this->sparql_service, $this->entity_service );
+		$entity_uri_cache_service = new Wordlift_File_Cache_Service(WL_TEMP_DIR.'entity_uri/');
+		$this->entity_uri_service = new Wordlift_Cached_Entity_Uri_Service($this->configuration_service, $entity_uri_cache_service);
+		$this->entity_service     = new Wordlift_Entity_Service($this->ui_service, $this->relation_service, $this->entity_uri_service);
+		$this->user_service       = new Wordlift_User_Service($this->sparql_service, $this->entity_service);
 
 		// Instantiate the JSON-LD service.
-		$property_getter = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+		$property_getter = Wordlift_Property_Getter_Factory::create($this->entity_service);
 
 		/** Linked Data. */
-		$this->storage_factory   = new Wordlift_Storage_Factory( $this->entity_service, $this->user_service, $property_getter );
-		$this->rendition_factory = new Wordlift_Sparql_Tuple_Rendition_Factory( $this->entity_service );
+		$this->storage_factory   = new Wordlift_Storage_Factory($this->entity_service, $this->user_service, $property_getter);
+		$this->rendition_factory = new Wordlift_Sparql_Tuple_Rendition_Factory($this->entity_service);
 
-		$this->schema_service = new Wordlift_Schema_Service( $this->storage_factory, $this->rendition_factory, $this->configuration_service );
+		$this->schema_service = new Wordlift_Schema_Service($this->storage_factory, $this->rendition_factory, $this->configuration_service);
 
 		// Create a new instance of the Redirect service.
-		$this->redirect_service    = new Wordlift_Redirect_Service( $this->entity_uri_service );
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
+		$this->redirect_service    = new Wordlift_Redirect_Service($this->entity_uri_service);
+		$this->entity_type_service = new Wordlift_Entity_Type_Service($this->schema_service);
 
-		if ( ! apply_filters( 'wl_features__enable__legacy_linked_data', true ) ) {
-			new Wordlift_Linked_Data_Service( $this->entity_service, $this->entity_type_service, $this->schema_service, $this->sparql_service );
+		if ( ! apply_filters('wl_features__enable__legacy_linked_data', true)) {
+			new Wordlift_Linked_Data_Service($this->entity_service, $this->entity_type_service, $this->schema_service, $this->sparql_service);
 		}
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service, $this->entity_type_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service, $this->entity_type_service);
 
 		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
@@ -1250,36 +1250,36 @@ 
 		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
 		// Create an import service instance to hook later to WP's import function.
-		$this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
+		$this->import_service = new Wordlift_Import_Service($this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri());
 
-		$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+		$uri_service = new Wordlift_Uri_Service($GLOBALS['wpdb']);
 
 		// Create the entity rating service.
-		$this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
+		$this->rating_service = new Wordlift_Rating_Service($this->entity_service, $this->entity_type_service, $this->notice_service);
 
 		// Create entity list customization (wp-admin/edit.php).
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
+		$this->entity_list_service = new Wordlift_Entity_List_Service($this->rating_service);
 
 		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service, $this->entity_service );
+		$this->dashboard_service = new Wordlift_Dashboard_Service($this->rating_service, $this->entity_service);
 
 		// Create an instance of the Publisher Service and the AJAX Adapter.
-		$this->publisher_service = new Wordlift_Publisher_Service( $this->configuration_service );
-		$this->property_factory  = new Wordlift_Property_Factory( $schema_url_property_service );
-		$this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+		$this->publisher_service = new Wordlift_Publisher_Service($this->configuration_service);
+		$this->property_factory  = new Wordlift_Property_Factory($schema_url_property_service);
+		$this->property_factory->register(Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service);
 
 		$attachment_service = new Wordlift_Attachment_Service();
 
 		// Instantiate the JSON-LD service.
-		$property_getter                       = Wordlift_Property_Getter_Factory::create( $this->entity_service );
-		$this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
-		$this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $this->post_to_jsonld_converter );
-		$this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
-		$this->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
+		$property_getter                       = Wordlift_Property_Getter_Factory::create($this->entity_service);
+		$this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter($this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service);
+		$this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter($this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter, $schemaorg_property_service, $this->post_to_jsonld_converter);
+		$this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter($this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter);
+		$this->jsonld_website_converter        = new Wordlift_Website_Jsonld_Converter($this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service);
 
-		$jsonld_cache                            = new Ttl_Cache( 'jsonld', 86400 );
-		$this->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter( $this->postid_to_jsonld_converter, $this->configuration_service, $jsonld_cache );
-		$this->jsonld_service                    = new Wordlift_Jsonld_Service( $this->entity_service, $this->cached_postid_to_jsonld_converter, $this->jsonld_website_converter );
+		$jsonld_cache                            = new Ttl_Cache('jsonld', 86400);
+		$this->cached_postid_to_jsonld_converter = new Wordlift_Cached_Post_Converter($this->postid_to_jsonld_converter, $this->configuration_service, $jsonld_cache);
+		$this->jsonld_service                    = new Wordlift_Jsonld_Service($this->entity_service, $this->cached_postid_to_jsonld_converter, $this->jsonld_website_converter);
 
 		/*
 		 * Load the `Wordlift_Term_JsonLd_Adapter`.
@@ -1288,24 +1288,24 @@ 
 		 *
 		 * @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( $this->entity_uri_service, $this->jsonld_service );
-		$jsonld_service      = new Jsonld_Service( $this->jsonld_service, $term_jsonld_adapter );
-		new Jsonld_Endpoint( $jsonld_service, $this->entity_uri_service );
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-term-jsonld-adapter.php';
+		$term_jsonld_adapter = new Wordlift_Term_JsonLd_Adapter($this->entity_uri_service, $this->jsonld_service);
+		$jsonld_service      = new Jsonld_Service($this->jsonld_service, $term_jsonld_adapter);
+		new Jsonld_Endpoint($jsonld_service, $this->entity_uri_service);
 
 		// Prints the JSON-LD in the head.
-		new Jsonld_Adapter( $this->jsonld_service );
+		new Jsonld_Adapter($this->jsonld_service);
 
-		new Jsonld_By_Id_Endpoint( $this->jsonld_service, $this->entity_uri_service );
+		new Jsonld_By_Id_Endpoint($this->jsonld_service, $this->entity_uri_service);
 
-		$this->key_validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
-		$this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service, $this->entity_uri_service );
+		$this->key_validation_service = new Wordlift_Key_Validation_Service($this->configuration_service);
+		$this->content_filter_service = new Wordlift_Content_Filter_Service($this->entity_service, $this->configuration_service, $this->entity_uri_service);
 		// Creating Faq Content filter service.
 		$this->faq_content_filter_service = new Faq_Content_Filter();
-		$this->relation_rebuild_service   = new Wordlift_Relation_Rebuild_Service( $this->content_filter_service, $this->entity_service );
-		$this->sample_data_service        = new Wordlift_Sample_Data_Service( $this->entity_type_service, $this->configuration_service, $this->user_service );
-		$this->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter( $this->sample_data_service );
-		$this->reference_rebuild_service  = new Wordlift_Reference_Rebuild_Service( $this->entity_service );
+		$this->relation_rebuild_service   = new Wordlift_Relation_Rebuild_Service($this->content_filter_service, $this->entity_service);
+		$this->sample_data_service        = new Wordlift_Sample_Data_Service($this->entity_type_service, $this->configuration_service, $this->user_service);
+		$this->sample_data_ajax_adapter   = new Wordlift_Sample_Data_Ajax_Adapter($this->sample_data_service);
+		$this->reference_rebuild_service  = new Wordlift_Reference_Rebuild_Service($this->entity_service);
 
 		// Initialize the short-codes.
 		new Wordlift_Navigator_Shortcode();
@@ -1313,8 +1313,8 @@ 
 		new Wordlift_Chord_Shortcode();
 		new Wordlift_Geomap_Shortcode();
 		new Wordlift_Timeline_Shortcode();
-		new Wordlift_Related_Entities_Cloud_Shortcode( $this->relation_service );
-		new Wordlift_Vocabulary_Shortcode( $this->configuration_service );
+		new Wordlift_Related_Entities_Cloud_Shortcode($this->relation_service);
+		new Wordlift_Vocabulary_Shortcode($this->configuration_service);
 		new Wordlift_Faceted_Search_Shortcode();
 
 		// Initialize the Context Cards Service
@@ -1324,18 +1324,18 @@ 
 		new Wordlift_Seo_Service();
 
 		// Initialize the AMP service.
-		new Wordlift_AMP_Service( $this->jsonld_service );
+		new Wordlift_AMP_Service($this->jsonld_service);
 
 		/** Services. */
 		$this->google_analytics_export_service = new Wordlift_Google_Analytics_Export_Service();
 		new Wordlift_Image_Service();
 
 		/** Adapters. */
-		$this->entity_type_adapter    = new Wordlift_Entity_Type_Adapter( $this->entity_type_service );
-		$this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $this->publisher_service );
-		$this->tinymce_adapter        = new Wordlift_Tinymce_Adapter( $this );
+		$this->entity_type_adapter    = new Wordlift_Entity_Type_Adapter($this->entity_type_service);
+		$this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter($this->publisher_service);
+		$this->tinymce_adapter        = new Wordlift_Tinymce_Adapter($this);
 		//$this->faq_tinymce_adapter      = new Faq_Tinymce_Adapter();
-		$this->relation_rebuild_adapter = new Wordlift_Relation_Rebuild_Adapter( $this->relation_rebuild_service );
+		$this->relation_rebuild_adapter = new Wordlift_Relation_Rebuild_Adapter($this->relation_rebuild_service);
 
 		/*
 		 * Exclude our public js from WP-Rocket.
@@ -1365,14 +1365,14 @@ 
 		$this->language_select_element = new Wordlift_Admin_Language_Select_Element();
 		$this->country_select_element  = new Wordlift_Admin_Country_Select_Element();
 		$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-		$this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $this->publisher_service, $tabs_element, $this->select2_element );
-		$this->author_element          = new Wordlift_Admin_Author_Element( $this->publisher_service, $this->select2_element );
+		$this->publisher_element       = new Wordlift_Admin_Publisher_Element($this->configuration_service, $this->publisher_service, $tabs_element, $this->select2_element);
+		$this->author_element          = new Wordlift_Admin_Author_Element($this->publisher_service, $this->select2_element);
 
-		$this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->country_select_element, $this->publisher_element, $this->radio_input_element );
-		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
+		$this->settings_page             = new Wordlift_Admin_Settings_Page($this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->country_select_element, $this->publisher_element, $this->radio_input_element);
+		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link($this->settings_page);
 
-		$this->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page( $this->configuration_service, $this->input_element, $this->radio_input_element );
-		$this->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link( $this->analytics_settings_page );
+		$this->analytics_settings_page             = new Wordlift_Admin_Settings_Analytics_Page($this->configuration_service, $this->input_element, $this->radio_input_element);
+		$this->analytics_settings_page_action_link = new Wordlift_Admin_Settings_Analytics_Page_Action_Link($this->analytics_settings_page);
 		$this->analytics_connect                   = new Wordlift_Analytics_Connect();
 
 		// Pages.
@@ -1383,9 +1383,9 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 		 */
-		if ( apply_filters( 'wl_can_see_classification_box', true ) ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
-			new Wordlift_Admin_Post_Edit_Page( $this );
+		if (apply_filters('wl_can_see_classification_box', true)) {
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-post-edit-page.php';
+			new Wordlift_Admin_Post_Edit_Page($this);
 		}
 		new Wordlift_Entity_Type_Admin_Service();
 
@@ -1399,23 +1399,23 @@ 
 		$this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
 		/* WordPress Admin. */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
+		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page($this->configuration_service);
+		$this->status_page             = new Wordlift_Admin_Status_Page($this->entity_service, $this->sparql_service);
 
 		// Create an instance of the install wizard.
-		$this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service, $this->language_select_element, $this->country_select_element );
+		$this->admin_setup = new Wordlift_Admin_Setup($this->configuration_service, $this->key_validation_service, $this->entity_service, $this->language_select_element, $this->country_select_element);
 
-		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
+		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service($this->entity_post_type_service);
 
 		// User Profile.
-		new Wordlift_Admin_User_Profile_Page( $this->author_element, $this->user_service );
+		new Wordlift_Admin_User_Profile_Page($this->author_element, $this->user_service);
 
 		$this->entity_page_service = new Wordlift_Entity_Page_Service();
 
 		// Load the debug service if WP is in debug mode.
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
-			new Wordlift_Debug_Service( $this->entity_service, $uri_service );
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-debug-service.php';
+			new Wordlift_Debug_Service($this->entity_service, $uri_service);
 		}
 
 		// Remote Image Service.
@@ -1428,12 +1428,12 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/852.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-batch-action.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-batch-action.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/mapping/class-wordlift-mapping-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/mapping/class-wordlift-mapping-ajax-adapter.php';
 
 		// Create an instance of the Mapping Service and assign it to the Ajax Adapter.
-		new Wordlift_Mapping_Ajax_Adapter( new Wordlift_Mapping_Service( Wordlift_Entity_Type_Service::get_instance() ) );
+		new Wordlift_Mapping_Ajax_Adapter(new Wordlift_Mapping_Service(Wordlift_Entity_Type_Service::get_instance()));
 
 		/*
 		 * Batch Operations. They're similar to Batch Actions but do not require working on post types.
@@ -1442,8 +1442,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/intf-wordlift-batch-operation.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/batch/intf-wordlift-batch-operation.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/batch/class-wordlift-batch-operation-ajax-adapter.php';
 
 		/*
 		 * Add the Search Keywords taxonomy to manage the Search Keywords on WLS.
@@ -1452,8 +1452,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/search-keywords/class-wordlift-search-keyword-taxonomy.php';
-		new Wordlift_Search_Keyword_Taxonomy( $api_service );
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/search-keywords/class-wordlift-search-keyword-taxonomy.php';
+		new Wordlift_Search_Keyword_Taxonomy($api_service);
 
 		/*
 		 * Load the Mappings JSON-LD post processing.
@@ -1466,11 +1466,11 @@ 
 		new Post_Type_Rule_Validator();
 		// Taxonomy term rule validator for validating rules for term pages.
 		new Taxonomy_Term_Rule_Validator();
-		$rule_validators_registry = new Rule_Validators_Registry( $default_rule_validator );
-		$rule_groups_validator    = new Rule_Groups_Validator( $rule_validators_registry );
-		$mappings_validator       = new Mappings_Validator( $mappings_dbo, $rule_groups_validator );
+		$rule_validators_registry = new Rule_Validators_Registry($default_rule_validator);
+		$rule_groups_validator    = new Rule_Groups_Validator($rule_validators_registry);
+		$mappings_validator       = new Mappings_Validator($mappings_dbo, $rule_groups_validator);
 
-		new Url_To_Entity_Transform_Function( $this->entity_uri_service );
+		new Url_To_Entity_Transform_Function($this->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();
@@ -1480,7 +1480,7 @@ 
 		 * Intiailize the acf group data formatter.
 		 */
 		new Acf_Group_Formatter();
-		new Jsonld_Converter( $mappings_validator, $mappings_transform_functions_registry );
+		new Jsonld_Converter($mappings_validator, $mappings_transform_functions_registry);
 
 		/**
 		 * @since 3.26.0
@@ -1501,7 +1501,7 @@ 
 		/*
 		 * Create a singleton for the Analysis_Response_Ops_Factory.
 		 */
-		$entity_helper = new Entity_Helper( $this->entity_uri_service, $this->entity_service );
+		$entity_helper = new Entity_Helper($this->entity_uri_service, $this->entity_service);
 		new Analysis_Response_Ops_Factory(
 			$this->entity_uri_service,
 			$this->entity_service,
@@ -1511,11 +1511,11 @@ 
 		);
 
 		/** WL Autocomplete. */
-		$autocomplete_service       = new All_Autocomplete_Service( array(
+		$autocomplete_service = new All_Autocomplete_Service(array(
 			new Local_Autocomplete_Service(),
-			new Linked_Data_Autocomplete_Service( $this->configuration_service, $entity_helper, $this->entity_uri_service, $this->entity_service ),
-		) );
-		$this->autocomplete_adapter = new Wordlift_Autocomplete_Adapter( $autocomplete_service );
+			new Linked_Data_Autocomplete_Service($this->configuration_service, $entity_helper, $this->entity_uri_service, $this->entity_service),
+		));
+		$this->autocomplete_adapter = new Wordlift_Autocomplete_Adapter($autocomplete_service);
 
 		/**
 		 * @since 3.27.2
@@ -1524,10 +1524,10 @@ 
 		 */
 		new Recipe_Maker_Post_Type_Hook();
 		$recipe_maker_validation_service = new Recipe_Maker_Validation_Service();
-		new Recipe_Maker_Jsonld_Hook( $attachment_service, $recipe_maker_validation_service );
-		new Recipe_Maker_After_Get_Jsonld_Hook( $recipe_maker_validation_service );
-		new Recipe_Maker_Warning( $recipe_maker_validation_service );
-		new Yoast_Jsonld( $recipe_maker_validation_service );
+		new Recipe_Maker_Jsonld_Hook($attachment_service, $recipe_maker_validation_service);
+		new Recipe_Maker_After_Get_Jsonld_Hook($recipe_maker_validation_service);
+		new Recipe_Maker_Warning($recipe_maker_validation_service);
+		new Yoast_Jsonld($recipe_maker_validation_service);
 
 		/**
 		 * @since 3.27.4
@@ -1548,9 +1548,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -1571,29 +1571,29 @@ 
 			$this->user_service
 		);
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11 );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts', 11);
 
 		// Hook the init action to taxonomy services.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
-		$this->loader->add_action( 'init', $this->entity_types_taxonomy_service, 'init', 0 );
+		$this->loader->add_action('init', $this->topic_taxonomy_service, 'init', 0);
+		$this->loader->add_action('init', $this->entity_types_taxonomy_service, 'init', 0);
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+		$this->loader->add_filter('allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+		$this->loader->add_action('wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect');
 
 		/*
 		 * The old dashboard is replaced with dashboard v2.
@@ -1611,77 +1611,77 @@ 
 
 		// Hook save_post to the entity service to update custom fields (such as alternate labels).
 		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post', $this->rating_service, 'set_rating_for', 20, 1 );
+		$this->loader->add_action('save_post', $this->entity_service, 'save_post', 9, 3);
+		$this->loader->add_action('save_post', $this->rating_service, 'set_rating_for', 20, 1);
 
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
+		$this->loader->add_action('edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1);
+		$this->loader->add_action('in_admin_header', $this->rating_service, 'in_admin_header');
 
 		// Entity listing customization (wp-admin/edit.php)
 		// Add custom columns.
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+		$this->loader->add_filter('manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns');
 		// no explicit entity as it prevents handling of other post types.
-		$this->loader->add_filter( 'manage_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+		$this->loader->add_filter('manage_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2);
 		// Add 4W selection.
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_list_service, 'pre_get_posts' );
-		$this->loader->add_action( 'load-edit.php', $this->entity_list_service, 'load_edit' );
+		$this->loader->add_action('restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope');
+		$this->loader->add_filter('posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope');
+		$this->loader->add_action('pre_get_posts', $this->entity_list_service, 'pre_get_posts');
+		$this->loader->add_action('load-edit.php', $this->entity_list_service, 'load_edit');
 
 		/*
 		 * If `All Entity Types` is disable, use the radio button Walker.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( ! WL_ALL_ENTITY_TYPES ) {
-			$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		if ( ! WL_ALL_ENTITY_TYPES) {
+			$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 		}
 
 		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
 		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+		$this->loader->add_filter('prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2);
 
 		// Filter imported post meta.
-		$this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
+		$this->loader->add_filter('wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3);
 
 		// Notify the import service when an import starts and ends.
-		$this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
-		$this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
+		$this->loader->add_action('import_start', $this->import_service, 'import_start', 10, 0);
+		$this->loader->add_action('import_end', $this->import_service, 'import_end', 10, 0);
 
 		// Hook the AJAX wl_rebuild action to the Rebuild Service.
-		$this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
-		$this->loader->add_action( 'wp_ajax_wl_rebuild_references', $this->reference_rebuild_service, 'rebuild' );
+		$this->loader->add_action('wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild');
+		$this->loader->add_action('wp_ajax_wl_rebuild_references', $this->reference_rebuild_service, 'rebuild');
 
 		// Hook the menu to the Download Your Data page.
-		$this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
+		$this->loader->add_action('admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0);
+		$this->loader->add_action('admin_menu', $this->status_page, 'admin_menu', 100, 0);
+		$this->loader->add_action('admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0);
 
 		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
+		$this->loader->add_action('wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10);
 
 		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
-		$this->loader->add_action( 'admin_post_wl_jsonld', $this->jsonld_service, 'get' );
-		$this->loader->add_action( 'admin_post_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+		$this->loader->add_action('wp_ajax_wl_jsonld', $this->jsonld_service, 'get');
+		$this->loader->add_action('admin_post_wl_jsonld', $this->jsonld_service, 'get');
+		$this->loader->add_action('admin_post_nopriv_wl_jsonld', $this->jsonld_service, 'get');
 
 		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
+		$this->loader->add_action('wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key');
 
 		// Hook the AJAX wl_update_country_options action to the countries.
-		$this->loader->add_action( 'wp_ajax_wl_update_country_options', $this->country_select_element, 'get_options_html' );
+		$this->loader->add_action('wp_ajax_wl_update_country_options', $this->country_select_element, 'get_options_html');
 
 		// Hook the `admin_init` function to the Admin Setup.
-		$this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
+		$this->loader->add_action('admin_init', $this->admin_setup, 'admin_init');
 
 		// Hook the admin_init to the settings page.
-		$this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
-		$this->loader->add_action( 'admin_init', $this->analytics_settings_page, 'admin_init' );
+		$this->loader->add_action('admin_init', $this->settings_page, 'admin_init');
+		$this->loader->add_action('admin_init', $this->analytics_settings_page, 'admin_init');
 
-		$this->loader->add_filter( 'admin_post_thumbnail_html', $this->publisher_service, 'add_featured_image_instruction' );
+		$this->loader->add_filter('admin_post_thumbnail_html', $this->publisher_service, 'add_featured_image_instruction');
 
 		// Hook the menu creation on the general wordlift menu creation.
-		$this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
+		$this->loader->add_action('wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2);
 
 		/*
 		 * Display the `Wordlift_Admin_Search_Rankings_Page` page.
@@ -1690,17 +1690,17 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		if ( in_array( $this->configuration_service->get_package_type(), array( 'editorial', 'business' ) ) ) {
+		if (in_array($this->configuration_service->get_package_type(), array('editorial', 'business'))) {
 			$admin_search_rankings_page = new Wordlift_Admin_Search_Rankings_Page();
-			$this->loader->add_action( 'wl_admin_menu', $admin_search_rankings_page, 'admin_menu' );
+			$this->loader->add_action('wl_admin_menu', $admin_search_rankings_page, 'admin_menu');
 		}
 
 		// Hook key update.
-		$this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
-		$this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
+		$this->loader->add_action('pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2);
+		$this->loader->add_action('update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2);
 
 		// Add additional action links to the WordLift plugin in the plugins page.
-		$this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
+		$this->loader->add_filter('plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1);
 
 		/*
 		 * Remove the Analytics Settings link from the plugin page.
@@ -1711,25 +1711,25 @@ 
 		// $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->analytics_settings_page_action_link, 'action_links', 10, 1 );
 
 		// Hook the AJAX `wl_publisher` action name.
-		$this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
+		$this->loader->add_action('wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher');
 
 		// Hook row actions for the entity type list admin.
-		$this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+		$this->loader->add_filter('wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2);
 
 		/** Ajax actions. */
-		$this->loader->add_action( 'wp_ajax_wl_google_analytics_export', $this->google_analytics_export_service, 'export' );
+		$this->loader->add_action('wp_ajax_wl_google_analytics_export', $this->google_analytics_export_service, 'export');
 
 		// Hook capabilities manipulation to allow access to entity type admin
 		// page  on WordPress versions before 4.7.
 		global $wp_version;
-		if ( version_compare( $wp_version, '4.7', '<' ) ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
+		if (version_compare($wp_version, '4.7', '<')) {
+			$this->loader->add_filter('map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4);
 		}
 
-		$this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+		$this->loader->add_action('wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1);
 
 		/** Adapters. */
-		$this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+		$this->loader->add_filter('mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1);
 		/**
 		 * Disabling Faq temporarily.
 		 * Load the tinymce editor button on the tool bar.
@@ -1740,58 +1740,58 @@ 
 		//$this->loader->add_filter( 'mce_external_plugins', $this->faq_tinymce_adapter, 'register_faq_tinymce_plugin', 10, 1 );
 
 
-		$this->loader->add_action( 'wp_ajax_wl_relation_rebuild_process_all', $this->relation_rebuild_adapter, 'process_all' );
-		$this->loader->add_action( 'wp_ajax_wl_sample_data_create', $this->sample_data_ajax_adapter, 'create' );
-		$this->loader->add_action( 'wp_ajax_wl_sample_data_delete', $this->sample_data_ajax_adapter, 'delete' );
+		$this->loader->add_action('wp_ajax_wl_relation_rebuild_process_all', $this->relation_rebuild_adapter, 'process_all');
+		$this->loader->add_action('wp_ajax_wl_sample_data_create', $this->sample_data_ajax_adapter, 'create');
+		$this->loader->add_action('wp_ajax_wl_sample_data_delete', $this->sample_data_ajax_adapter, 'delete');
 		/**
 		 * @since 3.26.0
 		 * Post excerpt meta box would be only loaded when the language is set
 		 * to english
 		 */
-		if ( $this->configuration_service->get_language_code() === 'en' ) {
+		if ($this->configuration_service->get_language_code() === 'en') {
 			$excerpt_adapter = new Post_Excerpt_Meta_Box_Adapter();
-			$this->loader->add_action( 'do_meta_boxes', $excerpt_adapter, 'replace_post_excerpt_meta_box' );
+			$this->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();
 		}
 
-		$this->loader->add_action( 'update_user_metadata', $this->user_service, 'update_user_metadata', 10, 5 );
-		$this->loader->add_action( 'delete_user_metadata', $this->user_service, 'delete_user_metadata', 10, 5 );
+		$this->loader->add_action('update_user_metadata', $this->user_service, 'update_user_metadata', 10, 5);
+		$this->loader->add_action('delete_user_metadata', $this->user_service, 'delete_user_metadata', 10, 5);
 
 		// Handle the autocomplete request.
-		add_action( 'wp_ajax_wl_autocomplete', array(
+		add_action('wp_ajax_wl_autocomplete', array(
 			$this->autocomplete_adapter,
 			'wl_autocomplete',
-		) );
-		add_action( 'wp_ajax_nopriv_wl_autocomplete', array(
+		));
+		add_action('wp_ajax_nopriv_wl_autocomplete', array(
 			$this->autocomplete_adapter,
 			'wl_autocomplete',
-		) );
+		));
 
 		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
+		if (is_multisite()) {
+			$this->loader->add_filter('map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4);
 		}
 
-		$deactivator_feedback = new Wordlift_Deactivator_Feedback( $this->configuration_service );
+		$deactivator_feedback = new Wordlift_Deactivator_Feedback($this->configuration_service);
 
-		add_action( 'admin_footer', array( $deactivator_feedback, 'render_feedback_popup' ) );
-		add_action( 'admin_enqueue_scripts', array( $deactivator_feedback, 'enqueue_popup_scripts' ) );
-		add_action( 'wp_ajax_wl_deactivation_feedback', array( $deactivator_feedback, 'wl_deactivation_feedback' ) );
+		add_action('admin_footer', array($deactivator_feedback, 'render_feedback_popup'));
+		add_action('admin_enqueue_scripts', array($deactivator_feedback, 'enqueue_popup_scripts'));
+		add_action('wp_ajax_wl_deactivation_feedback', array($deactivator_feedback, 'wl_deactivation_feedback'));
 
 		/**
 		 * Always allow the `wordlift/classification` block.
 		 *
 		 * @since 3.23.0
 		 */
-		add_filter( 'allowed_block_types', function ( $value ) {
+		add_filter('allowed_block_types', function($value) {
 
-			if ( true === $value ) {
+			if (true === $value) {
 				return $value;
 			}
 
-			return array_merge( (array) $value, array( 'wordlift/classification' ) );
-		}, PHP_INT_MAX );
+			return array_merge((array) $value, array('wordlift/classification'));
+		}, PHP_INT_MAX);
 	}
 
 	/**
@@ -1803,58 +1803,58 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
 		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
+		$this->loader->add_action('init', $this->entity_post_type_service, 'register');
 
 		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+		$this->loader->add_filter('post_type_link', $this->entity_link_service, 'post_type_link', 10, 4);
+		$this->loader->add_action('pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $this->context_cards_service, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
+		$this->loader->add_action('wp_enqueue_scripts', $this->context_cards_service, 'enqueue_scripts');
 
 		// Registering Faq_Content_Filter service used for removing faq question and answer tags from the html.
-		$this->loader->add_filter( 'the_content', $this->faq_content_filter_service, 'remove_all_faq_question_and_answer_tags' );
+		$this->loader->add_filter('the_content', $this->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 ) {
-			$this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
+		if ( ! defined('WL_DISABLE_CONTENT_FILTER') || ! WL_DISABLE_CONTENT_FILTER) {
+			$this->loader->add_filter('the_content', $this->content_filter_service, 'the_content');
 		}
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 
 		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get');
 
 		// Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
 		// in order to tweak WP's `WP_Query` to include entities in queries related
 		// to categories.
-		$this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
+		$this->loader->add_action('pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1);
 
 		/*
 		 * Hook the `pre_get_posts` action to the `Wordlift_Entity_Page_Service`
 		 * in order to tweak WP's `WP_Query` to show event related entities in reverse
 		 * order of start time.
 		 */
-		$this->loader->add_action( 'pre_get_posts', $this->entity_page_service, 'pre_get_posts', 10, 1 );
+		$this->loader->add_action('pre_get_posts', $this->entity_page_service, 'pre_get_posts', 10, 1);
 
-		$this->loader->add_action( 'wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+		$this->loader->add_action('wl_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1);
 
 		// This hook have to run before the rating service, as otherwise the post might not be a proper entity when rating is done.
-		$this->loader->add_action( 'save_post', $this->entity_type_adapter, 'save_post', 9, 3 );
+		$this->loader->add_action('save_post', $this->entity_type_adapter, 'save_post', 9, 3);
 
 		// Analytics Script Frontend.
-		if ( $this->configuration_service->is_analytics_enable() ) {
-			$this->loader->add_action( 'wp_enqueue_scripts', $this->analytics_connect, 'enqueue_scripts', 10 );
+		if ($this->configuration_service->is_analytics_enable()) {
+			$this->loader->add_action('wp_enqueue_scripts', $this->analytics_connect, 'enqueue_scripts', 10);
 		}
 
 	}
@@ -1907,11 +1907,11 @@ 
 	 */
 	private function load_cli_dependencies() {
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'cli/class-wordlift-push-reference-data-command.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'cli/class-wordlift-push-reference-data-command.php';
 
-		$push_reference_data_command = new Wordlift_Push_Reference_Data_Command( $this->relation_service, $this->entity_service, $this->sparql_service, $this->configuration_service, $this->entity_type_service );
+		$push_reference_data_command = new Wordlift_Push_Reference_Data_Command($this->relation_service, $this->entity_service, $this->sparql_service, $this->configuration_service, $this->entity_type_service);
 
-		WP_CLI::add_command( 'wl references push', $push_reference_data_command );
+		WP_CLI::add_command('wl references push', $push_reference_data_command);
 
 	}
 

src/includes/class-wordlift-linked-data-service.php

Indentation +327 added lines, -327 removed lines

@@ -18,336 +18,336 @@
  */
 class Wordlift_Linked_Data_Service {
 
-	//<editor-fold desc="## FIELDS">
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	private $schema_service;
-
-	/**
-	 * The {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * The {@link Wordlift_Linked_Data_Service} singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Linked_Data_Service $instance The {@link Wordlift_Linked_Data_Service} singleton instance.
-	 */
-	private static $instance;
-	//</editor-fold>
-
-	/**
-	 * Create a {@link Wordlift_Linked_Data_Service} instance.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	public function __construct( $entity_service, $entity_type_service, $schema_service, $sparql_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Linked_Data_Service' );
-
-		$this->entity_service      = $entity_service;
-		$this->entity_type_service = $entity_type_service;
-		$this->schema_service      = $schema_service;
-		$this->sparql_service      = $sparql_service;
-
-		/*
+    //<editor-fold desc="## FIELDS">
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    private $schema_service;
+
+    /**
+     * The {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * The {@link Wordlift_Linked_Data_Service} singleton instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Linked_Data_Service $instance The {@link Wordlift_Linked_Data_Service} singleton instance.
+     */
+    private static $instance;
+    //</editor-fold>
+
+    /**
+     * Create a {@link Wordlift_Linked_Data_Service} instance.
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since 3.15.0
+     *
+     */
+    public function __construct( $entity_service, $entity_type_service, $schema_service, $sparql_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Linked_Data_Service' );
+
+        $this->entity_service      = $entity_service;
+        $this->entity_type_service = $entity_type_service;
+        $this->schema_service      = $schema_service;
+        $this->sparql_service      = $sparql_service;
+
+        /*
 		 * Allow callers to call the `push` and `remove` methods using WordPress' hooks.
 		 *
 		 * @since 3.28.0
 		 */
-		add_action( 'wl_legacy_linked_data__push', array( $this, 'push' ) );
-		add_action( 'wl_legacy_linked_data__remove', array( $this, 'remove' ) );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of {@link Wordlift_Linked_Data_Service}.
-	 *
-	 * @return Wordlift_Linked_Data_Service The singleton instance of <a href='psi_element://Wordlift_Linked_Data_Service'>Wordlift_Linked_Data_Service</a>.
-	 * @since 3.15.0
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	//<editor-fold desc="## FUNCTIONS">
-
-	/**
-	 * Push a {@link WP_Post} to the Linked Data store.
-	 *
-	 * If the {@link WP_Post} is an entity and it's not of the `Article` type,
-	 * then it is pushed to the remote Linked Data store.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	public function push( $post_id ) {
-
-		$this->log->debug( "Pushing post $post_id..." );
-
-		// @since 3.18.0 we don't check anymore if the post is an entity, i.e.
-		// we removed the following:
-		//		if ( ! $this->entity_service->is_entity( $post_id ) ) {
-		//			$this->log->debug( "Post $post_id is not an entity." );
-		//
-		//			return;
-		//		}
-
-		// Get the post and push it to the Linked Data store.
-		$this->do_push( $post_id );
-
-		// Reindex the triple store if buffering is turned off.
-		if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
-			wordlift_reindex_triple_store();
-		}
-
-	}
-
-	/**
-	 * Push an entity to the Linked Data store.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	private function do_push( $post_id ) {
-		$this->log->debug( "Doing post $post_id push..." );
-
-		// Get the post.
-		$post = get_post( $post_id );
-
-		// Bail out if the post isn't found.
-		if ( null === $post ) {
-			$this->log->warn( "Post $post_id not found." );
-
-			return;
-		}
-
-		// Bail out if the post isn't published.
-		if ( 'publish' !== $post->post_status ) {
-			$this->log->info( "Post $post_id not published." );
-
-			return;
-		}
-
-		// Bail out if the URI isn't valid.
-		if ( ! $this->has_valid_uri( $post_id ) ) {
-			$this->log->warn( "Post $post_id URI invalid." );
-
-			return;
-		}
-
-		// First remove the post data.
-		$this->remove( $post_id );
-
-		// Then execute the insert query.
-		$this->insert( $post_id );
-	}
-
-	/**
-	 * Check if an entity's {@link WP_Post} has a valid URI.
-	 *
-	 * @param int $post_id The entity's {@link WP_Post}'s id.
-	 *
-	 * @return bool True if the URI is valid otherwise false.
-	 * @since 3.15.0
-	 *
-	 */
-	private function has_valid_uri( $post_id ) {
-
-		// Get the entity's URI.
-		$uri = $this->entity_service->get_uri( $post_id );
-
-		// If the URI isn't found, return false.
-		if ( null === $uri ) {
-			return false;
-		}
-
-		// If the URI ends with a trailing slash, return false.
-		if ( '/' === substr( $uri, - 1 ) ) {
-			return false;
-		}
-
-		// URI is valid.
-		return true;
-	}
-
-	/**
-	 * Remove the specified {@link WP_Post} from the Linked Data.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.18.0
-	 *
-	 */
-	public function remove( $post_id ) {
-		$delete_query = '';
-
-		// Get the delete statements.
-		$triples = $this->get_delete_triples( $post_id );
-
-		// Loop through all triples and add the statement to delete query.
-		foreach ( $triples as $item ) {
-			$delete_query .= "DELETE { $item } WHERE { $item }; \n";
-		}
-
-		$this->log->trace( "Delete Query generated [ $delete_query ]." );
-
-		$this->sparql_service->execute( $delete_query );
-	}
-
-	/**
-	 * Insert the specific {@link WP_Post} to Linked Data store.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.18.0
-	 *
-	 */
-	private function insert( $post_id ) {
-		// Get the insert statements.
-		$insert_triples = $this->get_insert_triples( $post_id );
-
-		// Convert all statements to single string.
-		$insert_query_body = implode( "\n", $insert_triples );
-
-		// Build the insert query.
-		$insert_query = "INSERT DATA { $insert_query_body };";
-
-		$this->log->trace( "Insert Query generated [ $insert_query ]." );
-
-		$this->sparql_service->execute( $insert_query );
-	}
-
-	/**
-	 * Get the delete statements.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array An array of delete statements.
-	 * @since 3.18.0
-	 *
-	 */
-	private function get_delete_triples( $post_id ) {
-		$delete_triples = array();
-
-		// Loop through all renditions and get the triples.
-		foreach ( $this->schema_service->get_renditions() as $rendition ) {
-			// Push the rendition delete triple to $delete_triples.
-			$delete_triples = array_merge(
-				$delete_triples,
-				(array) $rendition->get_delete_triples( $post_id )
-			);
-		}
-
-		/**
-		 * Filter: 'wl_delete_triples' - Allow third parties to hook and add additional delete triples.
-		 *
-		 * @param array $delete_triples Delete triples.
-		 * @param int $post_id The current post ID.
-		 *
-		 * @since 3.18.0
-		 *
-		 */
-		return apply_filters( 'wl_delete_triples', array_unique( $delete_triples ), $post_id );
-	}
-
-	/**
-	 * Get the SPARQL insert triples ( ?s ?p ?o ) for the specified {@link WP_Post}.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array An array of insert triples.
-	 * @since 3.15.0
-	 *
-	 */
-	private function get_insert_triples( $post_id ) {
-
-		// Get the entity type.
-		$type = $this->entity_type_service->get( $post_id );
-
-		// Get the `linked_data` parameter.
-		$properties = $type['linked_data'];
-
-		// Accumulate the triples.
-		$triples = array();
-
-		/** @var Wordlift_Default_Sparql_Tuple_Rendition $property A {@link Wordlift_Sparql_Tuple_Rendition} instance. */
-		foreach ( $properties as $property ) {
-			foreach ( $property->get_insert_triples( $post_id ) as $triple ) {
-				$triples[] = $triple;
-			}
-		}
-
-		$this->log->trace( count( $properties ) . ' properties and ' . count( $triples ) . " triples found for post $post_id." );
-
-		/**
-		 * Get the INSERT triples properties.
-		 *
-		 * The `wl_insert_triples` filter allows 3rd parties to extend
-		 * the list of triples for SPARQL INSERT statements.
-		 *
-		 * @param array $linked_data A {@link Wordlift_Sparql_Tuple_Rendition} instances.
-		 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-		 * @param int $post_id The {@link WP_Post}'s id.
-		 *
-		 * @since 3.18.0 The hook has been renamed from `wl_insert_tuples_properties` to `wl_insert_triples`.
-		 *
-		 * @since 3.17.0
-		 */
-		return apply_filters( 'wl_insert_triples', $triples, $this->entity_service, $post_id );
-	}
-	//</editor-fold>
+        add_action( 'wl_legacy_linked_data__push', array( $this, 'push' ) );
+        add_action( 'wl_legacy_linked_data__remove', array( $this, 'remove' ) );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of {@link Wordlift_Linked_Data_Service}.
+     *
+     * @return Wordlift_Linked_Data_Service The singleton instance of <a href='psi_element://Wordlift_Linked_Data_Service'>Wordlift_Linked_Data_Service</a>.
+     * @since 3.15.0
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    //<editor-fold desc="## FUNCTIONS">
+
+    /**
+     * Push a {@link WP_Post} to the Linked Data store.
+     *
+     * If the {@link WP_Post} is an entity and it's not of the `Article` type,
+     * then it is pushed to the remote Linked Data store.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.15.0
+     *
+     */
+    public function push( $post_id ) {
+
+        $this->log->debug( "Pushing post $post_id..." );
+
+        // @since 3.18.0 we don't check anymore if the post is an entity, i.e.
+        // we removed the following:
+        //		if ( ! $this->entity_service->is_entity( $post_id ) ) {
+        //			$this->log->debug( "Post $post_id is not an entity." );
+        //
+        //			return;
+        //		}
+
+        // Get the post and push it to the Linked Data store.
+        $this->do_push( $post_id );
+
+        // Reindex the triple store if buffering is turned off.
+        if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+            wordlift_reindex_triple_store();
+        }
+
+    }
+
+    /**
+     * Push an entity to the Linked Data store.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.15.0
+     *
+     */
+    private function do_push( $post_id ) {
+        $this->log->debug( "Doing post $post_id push..." );
+
+        // Get the post.
+        $post = get_post( $post_id );
+
+        // Bail out if the post isn't found.
+        if ( null === $post ) {
+            $this->log->warn( "Post $post_id not found." );
+
+            return;
+        }
+
+        // Bail out if the post isn't published.
+        if ( 'publish' !== $post->post_status ) {
+            $this->log->info( "Post $post_id not published." );
+
+            return;
+        }
+
+        // Bail out if the URI isn't valid.
+        if ( ! $this->has_valid_uri( $post_id ) ) {
+            $this->log->warn( "Post $post_id URI invalid." );
+
+            return;
+        }
+
+        // First remove the post data.
+        $this->remove( $post_id );
+
+        // Then execute the insert query.
+        $this->insert( $post_id );
+    }
+
+    /**
+     * Check if an entity's {@link WP_Post} has a valid URI.
+     *
+     * @param int $post_id The entity's {@link WP_Post}'s id.
+     *
+     * @return bool True if the URI is valid otherwise false.
+     * @since 3.15.0
+     *
+     */
+    private function has_valid_uri( $post_id ) {
+
+        // Get the entity's URI.
+        $uri = $this->entity_service->get_uri( $post_id );
+
+        // If the URI isn't found, return false.
+        if ( null === $uri ) {
+            return false;
+        }
+
+        // If the URI ends with a trailing slash, return false.
+        if ( '/' === substr( $uri, - 1 ) ) {
+            return false;
+        }
+
+        // URI is valid.
+        return true;
+    }
+
+    /**
+     * Remove the specified {@link WP_Post} from the Linked Data.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.18.0
+     *
+     */
+    public function remove( $post_id ) {
+        $delete_query = '';
+
+        // Get the delete statements.
+        $triples = $this->get_delete_triples( $post_id );
+
+        // Loop through all triples and add the statement to delete query.
+        foreach ( $triples as $item ) {
+            $delete_query .= "DELETE { $item } WHERE { $item }; \n";
+        }
+
+        $this->log->trace( "Delete Query generated [ $delete_query ]." );
+
+        $this->sparql_service->execute( $delete_query );
+    }
+
+    /**
+     * Insert the specific {@link WP_Post} to Linked Data store.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.18.0
+     *
+     */
+    private function insert( $post_id ) {
+        // Get the insert statements.
+        $insert_triples = $this->get_insert_triples( $post_id );
+
+        // Convert all statements to single string.
+        $insert_query_body = implode( "\n", $insert_triples );
+
+        // Build the insert query.
+        $insert_query = "INSERT DATA { $insert_query_body };";
+
+        $this->log->trace( "Insert Query generated [ $insert_query ]." );
+
+        $this->sparql_service->execute( $insert_query );
+    }
+
+    /**
+     * Get the delete statements.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array An array of delete statements.
+     * @since 3.18.0
+     *
+     */
+    private function get_delete_triples( $post_id ) {
+        $delete_triples = array();
+
+        // Loop through all renditions and get the triples.
+        foreach ( $this->schema_service->get_renditions() as $rendition ) {
+            // Push the rendition delete triple to $delete_triples.
+            $delete_triples = array_merge(
+                $delete_triples,
+                (array) $rendition->get_delete_triples( $post_id )
+            );
+        }
+
+        /**
+         * Filter: 'wl_delete_triples' - Allow third parties to hook and add additional delete triples.
+         *
+         * @param array $delete_triples Delete triples.
+         * @param int $post_id The current post ID.
+         *
+         * @since 3.18.0
+         *
+         */
+        return apply_filters( 'wl_delete_triples', array_unique( $delete_triples ), $post_id );
+    }
+
+    /**
+     * Get the SPARQL insert triples ( ?s ?p ?o ) for the specified {@link WP_Post}.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array An array of insert triples.
+     * @since 3.15.0
+     *
+     */
+    private function get_insert_triples( $post_id ) {
+
+        // Get the entity type.
+        $type = $this->entity_type_service->get( $post_id );
+
+        // Get the `linked_data` parameter.
+        $properties = $type['linked_data'];
+
+        // Accumulate the triples.
+        $triples = array();
+
+        /** @var Wordlift_Default_Sparql_Tuple_Rendition $property A {@link Wordlift_Sparql_Tuple_Rendition} instance. */
+        foreach ( $properties as $property ) {
+            foreach ( $property->get_insert_triples( $post_id ) as $triple ) {
+                $triples[] = $triple;
+            }
+        }
+
+        $this->log->trace( count( $properties ) . ' properties and ' . count( $triples ) . " triples found for post $post_id." );
+
+        /**
+         * Get the INSERT triples properties.
+         *
+         * The `wl_insert_triples` filter allows 3rd parties to extend
+         * the list of triples for SPARQL INSERT statements.
+         *
+         * @param array $linked_data A {@link Wordlift_Sparql_Tuple_Rendition} instances.
+         * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+         * @param int $post_id The {@link WP_Post}'s id.
+         *
+         * @since 3.18.0 The hook has been renamed from `wl_insert_tuples_properties` to `wl_insert_triples`.
+         *
+         * @since 3.17.0
+         */
+        return apply_filters( 'wl_insert_triples', $triples, $this->entity_service, $post_id );
+    }
+    //</editor-fold>
 
 }

Spacing +43 added lines, -43 removed lines

@@ -85,9 +85,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function __construct( $entity_service, $entity_type_service, $schema_service, $sparql_service ) {
+	public function __construct($entity_service, $entity_type_service, $schema_service, $sparql_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Linked_Data_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Linked_Data_Service');
 
 		$this->entity_service      = $entity_service;
 		$this->entity_type_service = $entity_type_service;
@@ -99,8 +99,8 @@ 
 		 *
 		 * @since 3.28.0
 		 */
-		add_action( 'wl_legacy_linked_data__push', array( $this, 'push' ) );
-		add_action( 'wl_legacy_linked_data__remove', array( $this, 'remove' ) );
+		add_action('wl_legacy_linked_data__push', array($this, 'push'));
+		add_action('wl_legacy_linked_data__remove', array($this, 'remove'));
 
 		self::$instance = $this;
 
@@ -131,9 +131,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function push( $post_id ) {
+	public function push($post_id) {
 
-		$this->log->debug( "Pushing post $post_id..." );
+		$this->log->debug("Pushing post $post_id...");
 
 		// @since 3.18.0 we don't check anymore if the post is an entity, i.e.
 		// we removed the following:
@@ -144,10 +144,10 @@ 
 		//		}
 
 		// Get the post and push it to the Linked Data store.
-		$this->do_push( $post_id );
+		$this->do_push($post_id);
 
 		// Reindex the triple store if buffering is turned off.
-		if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+		if (false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 			wordlift_reindex_triple_store();
 		}
 
@@ -161,38 +161,38 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function do_push( $post_id ) {
-		$this->log->debug( "Doing post $post_id push..." );
+	private function do_push($post_id) {
+		$this->log->debug("Doing post $post_id push...");
 
 		// Get the post.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Bail out if the post isn't found.
-		if ( null === $post ) {
-			$this->log->warn( "Post $post_id not found." );
+		if (null === $post) {
+			$this->log->warn("Post $post_id not found.");
 
 			return;
 		}
 
 		// Bail out if the post isn't published.
-		if ( 'publish' !== $post->post_status ) {
-			$this->log->info( "Post $post_id not published." );
+		if ('publish' !== $post->post_status) {
+			$this->log->info("Post $post_id not published.");
 
 			return;
 		}
 
 		// Bail out if the URI isn't valid.
-		if ( ! $this->has_valid_uri( $post_id ) ) {
-			$this->log->warn( "Post $post_id URI invalid." );
+		if ( ! $this->has_valid_uri($post_id)) {
+			$this->log->warn("Post $post_id URI invalid.");
 
 			return;
 		}
 
 		// First remove the post data.
-		$this->remove( $post_id );
+		$this->remove($post_id);
 
 		// Then execute the insert query.
-		$this->insert( $post_id );
+		$this->insert($post_id);
 	}
 
 	/**
@@ -204,18 +204,18 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function has_valid_uri( $post_id ) {
+	private function has_valid_uri($post_id) {
 
 		// Get the entity's URI.
-		$uri = $this->entity_service->get_uri( $post_id );
+		$uri = $this->entity_service->get_uri($post_id);
 
 		// If the URI isn't found, return false.
-		if ( null === $uri ) {
+		if (null === $uri) {
 			return false;
 		}
 
 		// If the URI ends with a trailing slash, return false.
-		if ( '/' === substr( $uri, - 1 ) ) {
+		if ('/' === substr($uri, - 1)) {
 			return false;
 		}
 
@@ -231,20 +231,20 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	public function remove( $post_id ) {
+	public function remove($post_id) {
 		$delete_query = '';
 
 		// Get the delete statements.
-		$triples = $this->get_delete_triples( $post_id );
+		$triples = $this->get_delete_triples($post_id);
 
 		// Loop through all triples and add the statement to delete query.
-		foreach ( $triples as $item ) {
+		foreach ($triples as $item) {
 			$delete_query .= "DELETE { $item } WHERE { $item }; \n";
 		}
 
-		$this->log->trace( "Delete Query generated [ $delete_query ]." );
+		$this->log->trace("Delete Query generated [ $delete_query ].");
 
-		$this->sparql_service->execute( $delete_query );
+		$this->sparql_service->execute($delete_query);
 	}
 
 	/**
@@ -255,19 +255,19 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private function insert( $post_id ) {
+	private function insert($post_id) {
 		// Get the insert statements.
-		$insert_triples = $this->get_insert_triples( $post_id );
+		$insert_triples = $this->get_insert_triples($post_id);
 
 		// Convert all statements to single string.
-		$insert_query_body = implode( "\n", $insert_triples );
+		$insert_query_body = implode("\n", $insert_triples);
 
 		// Build the insert query.
 		$insert_query = "INSERT DATA { $insert_query_body };";
 
-		$this->log->trace( "Insert Query generated [ $insert_query ]." );
+		$this->log->trace("Insert Query generated [ $insert_query ].");
 
-		$this->sparql_service->execute( $insert_query );
+		$this->sparql_service->execute($insert_query);
 	}
 
 	/**
@@ -279,15 +279,15 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private function get_delete_triples( $post_id ) {
+	private function get_delete_triples($post_id) {
 		$delete_triples = array();
 
 		// Loop through all renditions and get the triples.
-		foreach ( $this->schema_service->get_renditions() as $rendition ) {
+		foreach ($this->schema_service->get_renditions() as $rendition) {
 			// Push the rendition delete triple to $delete_triples.
 			$delete_triples = array_merge(
 				$delete_triples,
-				(array) $rendition->get_delete_triples( $post_id )
+				(array) $rendition->get_delete_triples($post_id)
 			);
 		}
 
@@ -300,7 +300,7 @@ 
 		 * @since 3.18.0
 		 *
 		 */
-		return apply_filters( 'wl_delete_triples', array_unique( $delete_triples ), $post_id );
+		return apply_filters('wl_delete_triples', array_unique($delete_triples), $post_id);
 	}
 
 	/**
@@ -312,10 +312,10 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function get_insert_triples( $post_id ) {
+	private function get_insert_triples($post_id) {
 
 		// Get the entity type.
-		$type = $this->entity_type_service->get( $post_id );
+		$type = $this->entity_type_service->get($post_id);
 
 		// Get the `linked_data` parameter.
 		$properties = $type['linked_data'];
@@ -324,13 +324,13 @@ 
 		$triples = array();
 
 		/** @var Wordlift_Default_Sparql_Tuple_Rendition $property A {@link Wordlift_Sparql_Tuple_Rendition} instance. */
-		foreach ( $properties as $property ) {
-			foreach ( $property->get_insert_triples( $post_id ) as $triple ) {
+		foreach ($properties as $property) {
+			foreach ($property->get_insert_triples($post_id) as $triple) {
 				$triples[] = $triple;
 			}
 		}
 
-		$this->log->trace( count( $properties ) . ' properties and ' . count( $triples ) . " triples found for post $post_id." );
+		$this->log->trace(count($properties).' properties and '.count($triples)." triples found for post $post_id.");
 
 		/**
 		 * Get the INSERT triples properties.
@@ -346,7 +346,7 @@ 
 		 *
 		 * @since 3.17.0
 		 */
-		return apply_filters( 'wl_insert_triples', $triples, $this->entity_service, $post_id );
+		return apply_filters('wl_insert_triples', $triples, $this->entity_service, $post_id);
 	}
 	//</editor-fold>
 

src/install/class-wordlift-install-3-18-0.php

Indentation +102 added lines, -102 removed lines

@@ -15,114 +15,114 @@
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_3_18_0 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '3.18.0';
-
-	/**
-	 * @inheritdoc
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		add_action( 'wl_async_wl_push_references', array(
-			$this,
-			'push_references',
-		) );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
-		$this->add_offer_entity_type();
-		$this->add_editors_read_wordlift_entity_capability();
-		do_action( 'wl_push_references' );
-	}
-
-	/**
-	 * Creates references for articles *referencing* entities
-	 *
-	 * @return void
-	 * @since 3.18.0
-	 *
-	 */
-	public function push_references() {
-		// Get relations.
-		$relations = Wordlift_Relation_Service::get_instance()->find_all_grouped_by_subject_id();
-
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		// Loop through all relations and push the references.
-		foreach ( $relations as $relation ) {
-
-			$post = get_post( $relation->subject_id );
-
-			// Bail out if it's an entity: we're only interested in articles
-			// *referencing* entities.
-			if ( $entity_service->is_entity( $post->ID ) ) {
-				continue;
-			}
-
-			// Push the references.
-			do_action( 'wl_legacy_linked_data__push', $post->ID );
-		}
-
-	}
-
-	/**
-	 * Adds the new `Offer` entity type.
-	 *
-	 * @return void
-	 * @since 3.18.0
-	 *
-	 */
-	public function add_offer_entity_type() {
-		// Check whether the `offer` term exists.
-		$offer = get_term_by(
-			'slug',
-			'offer',
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
-		);
-
-		// The `offer` term doesn't exists, so create it.
-		if ( empty( $offer ) ) {
-			wp_insert_term(
-				'Offer',
-				Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				array(
-					'slug'        => 'offer',
-					'description' => 'An Offer.',
-				)
-			);
-		}
-	}
-
-	/**
-	 * Add additional `read_wordlift_entity` capability to editors.
-	 *
-	 * @return void
-	 * @since 3.18.0
-	 *
-	 */
-	public function add_editors_read_wordlift_entity_capability() {
-		// Get the editor roles.
-		$admins = get_role( 'administrator' );
-		$admins->add_cap( 'read_wordlift_entity' );
-
-		/*
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '3.18.0';
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() {
+        parent::__construct();
+
+        add_action( 'wl_async_wl_push_references', array(
+            $this,
+            'push_references',
+        ) );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function install() {
+        $this->add_offer_entity_type();
+        $this->add_editors_read_wordlift_entity_capability();
+        do_action( 'wl_push_references' );
+    }
+
+    /**
+     * Creates references for articles *referencing* entities
+     *
+     * @return void
+     * @since 3.18.0
+     *
+     */
+    public function push_references() {
+        // Get relations.
+        $relations = Wordlift_Relation_Service::get_instance()->find_all_grouped_by_subject_id();
+
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        // Loop through all relations and push the references.
+        foreach ( $relations as $relation ) {
+
+            $post = get_post( $relation->subject_id );
+
+            // Bail out if it's an entity: we're only interested in articles
+            // *referencing* entities.
+            if ( $entity_service->is_entity( $post->ID ) ) {
+                continue;
+            }
+
+            // Push the references.
+            do_action( 'wl_legacy_linked_data__push', $post->ID );
+        }
+
+    }
+
+    /**
+     * Adds the new `Offer` entity type.
+     *
+     * @return void
+     * @since 3.18.0
+     *
+     */
+    public function add_offer_entity_type() {
+        // Check whether the `offer` term exists.
+        $offer = get_term_by(
+            'slug',
+            'offer',
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
+        );
+
+        // The `offer` term doesn't exists, so create it.
+        if ( empty( $offer ) ) {
+            wp_insert_term(
+                'Offer',
+                Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                array(
+                    'slug'        => 'offer',
+                    'description' => 'An Offer.',
+                )
+            );
+        }
+    }
+
+    /**
+     * Add additional `read_wordlift_entity` capability to editors.
+     *
+     * @return void
+     * @since 3.18.0
+     *
+     */
+    public function add_editors_read_wordlift_entity_capability() {
+        // Get the editor roles.
+        $admins = get_role( 'administrator' );
+        $admins->add_cap( 'read_wordlift_entity' );
+
+        /*
 		 * Check that the `editor` role exists before using it.
 		 *
 		 * @since 3.19.6
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/886
 		 */
-		$editors = get_role( 'editor' );
-		if ( isset( $editors ) ) {
-			$editors->add_cap( 'read_wordlift_entity' );
-		}
+        $editors = get_role( 'editor' );
+        if ( isset( $editors ) ) {
+            $editors->add_cap( 'read_wordlift_entity' );
+        }
 
-	}
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -26,10 +26,10 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		add_action( 'wl_async_wl_push_references', array(
+		add_action('wl_async_wl_push_references', array(
 			$this,
 			'push_references',
-		) );
+		));
 	}
 
 	/**
@@ -38,7 +38,7 @@ 
 	public function install() {
 		$this->add_offer_entity_type();
 		$this->add_editors_read_wordlift_entity_capability();
-		do_action( 'wl_push_references' );
+		do_action('wl_push_references');
 	}
 
 	/**
@@ -55,18 +55,18 @@ 
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
 		// Loop through all relations and push the references.
-		foreach ( $relations as $relation ) {
+		foreach ($relations as $relation) {
 
-			$post = get_post( $relation->subject_id );
+			$post = get_post($relation->subject_id);
 
 			// Bail out if it's an entity: we're only interested in articles
 			// *referencing* entities.
-			if ( $entity_service->is_entity( $post->ID ) ) {
+			if ($entity_service->is_entity($post->ID)) {
 				continue;
 			}
 
 			// Push the references.
-			do_action( 'wl_legacy_linked_data__push', $post->ID );
+			do_action('wl_legacy_linked_data__push', $post->ID);
 		}
 
 	}
@@ -87,7 +87,7 @@ 
 		);
 
 		// The `offer` term doesn't exists, so create it.
-		if ( empty( $offer ) ) {
+		if (empty($offer)) {
 			wp_insert_term(
 				'Offer',
 				Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
@@ -108,8 +108,8 @@ 
 	 */
 	public function add_editors_read_wordlift_entity_capability() {
 		// Get the editor roles.
-		$admins = get_role( 'administrator' );
-		$admins->add_cap( 'read_wordlift_entity' );
+		$admins = get_role('administrator');
+		$admins->add_cap('read_wordlift_entity');
 
 		/*
 		 * Check that the `editor` role exists before using it.
@@ -118,9 +118,9 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/886
 		 */
-		$editors = get_role( 'editor' );
-		if ( isset( $editors ) ) {
-			$editors->add_cap( 'read_wordlift_entity' );
+		$editors = get_role('editor');
+		if (isset($editors)) {
+			$editors->add_cap('read_wordlift_entity');
 		}
 
 	}

src/admin/partials/wordlift-admin-status-page.php

Indentation +3 added lines, -3 removed lines

@@ -14,9 +14,9 @@
 
 if ( 0 < count( $not_found_uris ) ) {
 
-	$first_id = key( $not_found_uris );
-	// Re-push the entity to the Linked Data Cloud.
-	do_action( 'wl_legacy_linked_data__push', $first_id );
+    $first_id = key( $not_found_uris );
+    // Re-push the entity to the Linked Data Cloud.
+    do_action( 'wl_legacy_linked_data__push', $first_id );
 
 }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -10,30 +10,30 @@
 
 $remote_uris = $this->get_linked_data_uris();
 
-$not_found_uris = array_diff( $local_uris, $remote_uris );
+$not_found_uris = array_diff($local_uris, $remote_uris);
 
-if ( 0 < count( $not_found_uris ) ) {
+if (0 < count($not_found_uris)) {
 
-	$first_id = key( $not_found_uris );
+	$first_id = key($not_found_uris);
 	// Re-push the entity to the Linked Data Cloud.
-	do_action( 'wl_legacy_linked_data__push', $first_id );
+	do_action('wl_legacy_linked_data__push', $first_id);
 
 }
 ?>
 
 <div class="wrap">
-    <h1><?php esc_html_e( 'Status Report', 'wordlift' ); ?></h1>
+    <h1><?php esc_html_e('Status Report', 'wordlift'); ?></h1>
 
-    <p><?php echo esc_html( sprintf( __( '%d not found URIs; %d local entity URIs; %d remote URIs (including posts and authors).', 'wordlift' ), count( $not_found_uris ), count( $local_uris ), count( $remote_uris ) ) ); ?></p>
+    <p><?php echo esc_html(sprintf(__('%d not found URIs; %d local entity URIs; %d remote URIs (including posts and authors).', 'wordlift'), count($not_found_uris), count($local_uris), count($remote_uris))); ?></p>
 
     <table class="wp-list-table widefat fixed striped posts">
         <thead>
-        <th scope="col"><?php esc_html_e( 'URL', 'wordlift' ); ?></th>
+        <th scope="col"><?php esc_html_e('URL', 'wordlift'); ?></th>
         </thead>
         <tbody>
-		<?php foreach ( $not_found_uris as $id => $uri ) { ?>
+		<?php foreach ($not_found_uris as $id => $uri) { ?>
             <tr>
-                <td><?php echo esc_html( $uri ); ?></td>
+                <td><?php echo esc_html($uri); ?></td>
             </tr>
 		<?php } ?>
         </tbody>