insideout10 / wordlift-plugin

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

Indentation +24 added lines, -24 removed lines

@@ -4,29 +4,29 @@
 
 abstract class Abstract_Sync_Background_Process_State implements Sync_Background_Process_State {
 
-	private $state;
-
-	function __construct( $state ) {
-		$this->state = $state;
-	}
-
-	function get_info() {
-		$started     = get_option( '_wl_sync_background_process_started' );
-		$offset      = get_option( '_wl_sync_background_process_offset' );
-		$stage       = get_option( '_wl_sync_background_process_stage' );
-		$counts      = get_option( '_wl_sync_background_process_count', array( 0 ) );
-		$last_update = get_option( '_wl_sync_background_process_updated' );
-
-		// Calculate the overall index by adding the count of completed stages.
-		$index = $offset + 1;
-		for ( $i = 0; $i < $stage; $i ++ ) {
-			$index += $counts[ $i ];
-		}
-
-		// Get the total count.
-		$total_count = array_sum( $counts );
-
-		return new Sync_Background_Process_Info( $this->state, $started, $index, $total_count, $last_update );
-	}
+    private $state;
+
+    function __construct( $state ) {
+        $this->state = $state;
+    }
+
+    function get_info() {
+        $started     = get_option( '_wl_sync_background_process_started' );
+        $offset      = get_option( '_wl_sync_background_process_offset' );
+        $stage       = get_option( '_wl_sync_background_process_stage' );
+        $counts      = get_option( '_wl_sync_background_process_count', array( 0 ) );
+        $last_update = get_option( '_wl_sync_background_process_updated' );
+
+        // Calculate the overall index by adding the count of completed stages.
+        $index = $offset + 1;
+        for ( $i = 0; $i < $stage; $i ++ ) {
+            $index += $counts[ $i ];
+        }
+
+        // Get the total count.
+        $total_count = array_sum( $counts );
+
+        return new Sync_Background_Process_Info( $this->state, $started, $index, $total_count, $last_update );
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -6,27 +6,27 @@
 
 	private $state;
 
-	function __construct( $state ) {
+	function __construct($state) {
 		$this->state = $state;
 	}
 
 	function get_info() {
-		$started     = get_option( '_wl_sync_background_process_started' );
-		$offset      = get_option( '_wl_sync_background_process_offset' );
-		$stage       = get_option( '_wl_sync_background_process_stage' );
-		$counts      = get_option( '_wl_sync_background_process_count', array( 0 ) );
-		$last_update = get_option( '_wl_sync_background_process_updated' );
+		$started     = get_option('_wl_sync_background_process_started');
+		$offset      = get_option('_wl_sync_background_process_offset');
+		$stage       = get_option('_wl_sync_background_process_stage');
+		$counts      = get_option('_wl_sync_background_process_count', array(0));
+		$last_update = get_option('_wl_sync_background_process_updated');
 
 		// Calculate the overall index by adding the count of completed stages.
 		$index = $offset + 1;
-		for ( $i = 0; $i < $stage; $i ++ ) {
-			$index += $counts[ $i ];
+		for ($i = 0; $i < $stage; $i++) {
+			$index += $counts[$i];
 		}
 
 		// Get the total count.
-		$total_count = array_sum( $counts );
+		$total_count = array_sum($counts);
 
-		return new Sync_Background_Process_Info( $this->state, $started, $index, $total_count, $last_update );
+		return new Sync_Background_Process_Info($this->state, $started, $index, $total_count, $last_update);
 	}
 
 }

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

Indentation +16 added lines, -16 removed lines

@@ -4,24 +4,24 @@
 
 interface Sync_Background_Process_State {
 
-	function enter();
+    function enter();
 
-	function leave();
+    function leave();
 
-	/**
-	 * 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
-	 */
-	function task( $item );
+    /**
+     * 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
+     */
+    function task( $item );
 
-	function get_info();
+    function get_info();
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	 *
 	 * @return mixed
 	 */
-	function task( $item );
+	function task($item);
 
 	function get_info();
 

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

Indentation +21 added lines, -21 removed lines

@@ -4,27 +4,27 @@
 
 class Sync_Background_Process_Info {
 
-	public $started;
-	public $index;
-	public $count;
-	public $last_update;
-	public $state;
+    public $started;
+    public $index;
+    public $count;
+    public $last_update;
+    public $state;
 
-	/**
-	 * Sync_Model constructor.
-	 *
-	 * @param $started
-	 * @param $index
-	 * @param $count
-	 * @param $last_update
-	 * @param $state
-	 */
-	public function __construct( $state, $started = null, $index = null, $count = null, $last_update = null ) {
-		$this->started     = $started;
-		$this->index       = $index;
-		$this->count       = (int) $count;
-		$this->last_update = $last_update;
-		$this->state       = $state;
-	}
+    /**
+     * Sync_Model constructor.
+     *
+     * @param $started
+     * @param $index
+     * @param $count
+     * @param $last_update
+     * @param $state
+     */
+    public function __construct( $state, $started = null, $index = null, $count = null, $last_update = null ) {
+        $this->started     = $started;
+        $this->index       = $index;
+        $this->count       = (int) $count;
+        $this->last_update = $last_update;
+        $this->state       = $state;
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 * @param $last_update
 	 * @param $state
 	 */
-	public function __construct( $state, $started = null, $index = null, $count = null, $last_update = null ) {
+	public function __construct($state, $started = null, $index = null, $count = null, $last_update = null) {
 		$this->started     = $started;
 		$this->index       = $index;
 		$this->count       = (int) $count;

src/wordlift/dataset/background/stages/class-sync-background-stage.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 interface Sync_Background_Process_Stage {
 
-	function count();
+    function count();
 
-	function get_sync_object_adapters( $offset, $batch_size );
+    function get_sync_object_adapters( $offset, $batch_size );
 
 }

Spacing +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
 
 	function count();
 
-	function get_sync_object_adapters( $offset, $batch_size );
+	function get_sync_object_adapters($offset, $batch_size);
 
 }

src/wordlift/dataset/background/stages/class-sync-background-process-terms-stage.php

Indentation +31 added lines, -31 removed lines

@@ -7,42 +7,42 @@ 
 
 class Sync_Background_Process_Terms_Stage {
 
-	/**
-	 * @var Sync_Object_Adapter_Factory
-	 */
-	private $sync_object_adapter_factory;
-
-	/**
-	 * Sync_Background_Process_Posts_Stage constructor.
-	 *
-	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
-	 */
-	function __construct( $sync_object_adapter_factory ) {
-		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
-	}
-
-	function count() {
-
-		$taxonomies    = get_taxonomies( array( 'public' => true ) );
-		$in_taxonomies = implode( "','", array_map( 'esc_sql', $taxonomies ) );
-
-		global $wpdb;
-		$sql = "
+    /**
+     * @var Sync_Object_Adapter_Factory
+     */
+    private $sync_object_adapter_factory;
+
+    /**
+     * Sync_Background_Process_Posts_Stage constructor.
+     *
+     * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
+     */
+    function __construct( $sync_object_adapter_factory ) {
+        $this->sync_object_adapter_factory = $sync_object_adapter_factory;
+    }
+
+    function count() {
+
+        $taxonomies    = get_taxonomies( array( 'public' => true ) );
+        $in_taxonomies = implode( "','", array_map( 'esc_sql', $taxonomies ) );
+
+        global $wpdb;
+        $sql = "
 			SELECT COUNT( 1 )
 			FROM $wpdb->term_taxonomy
 			WHERE taxonomy IN ('$in_taxonomies')
 			";
 
-		return $wpdb->get_var( $sql );
-	}
+        return $wpdb->get_var( $sql );
+    }
 
-	function get_sync_object_adapters( $offset, $limit ) {
+    function get_sync_object_adapters( $offset, $limit ) {
 
-		$taxonomies    = get_taxonomies( array( 'public' => true ) );
-		$in_taxonomies = implode( "','", array_map( 'esc_sql', $taxonomies ) );
+        $taxonomies    = get_taxonomies( array( 'public' => true ) );
+        $in_taxonomies = implode( "','", array_map( 'esc_sql', $taxonomies ) );
 
-		global $wpdb;
-		$sql = "
+        global $wpdb;
+        $sql = "
 			SELECT term_id
 			FROM $wpdb->term_taxonomy
 		    WHERE taxonomy IN ('$in_taxonomies')
@@ -50,9 +50,9 @@ 
 			LIMIT %d, %d
 			";
 
-		$ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
+        $ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
 
-		return $this->sync_object_adapter_factory->create_many( Object_Type_Enum::TERM, $ids );
-	}
+        return $this->sync_object_adapter_factory->create_many( Object_Type_Enum::TERM, $ids );
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -17,14 +17,14 @@ 
 	 *
 	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
 	 */
-	function __construct( $sync_object_adapter_factory ) {
+	function __construct($sync_object_adapter_factory) {
 		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
 	}
 
 	function count() {
 
-		$taxonomies    = get_taxonomies( array( 'public' => true ) );
-		$in_taxonomies = implode( "','", array_map( 'esc_sql', $taxonomies ) );
+		$taxonomies    = get_taxonomies(array('public' => true));
+		$in_taxonomies = implode("','", array_map('esc_sql', $taxonomies));
 
 		global $wpdb;
 		$sql = "
@@ -33,13 +33,13 @@ 
 			WHERE taxonomy IN ('$in_taxonomies')
 			";
 
-		return $wpdb->get_var( $sql );
+		return $wpdb->get_var($sql);
 	}
 
-	function get_sync_object_adapters( $offset, $limit ) {
+	function get_sync_object_adapters($offset, $limit) {
 
-		$taxonomies    = get_taxonomies( array( 'public' => true ) );
-		$in_taxonomies = implode( "','", array_map( 'esc_sql', $taxonomies ) );
+		$taxonomies    = get_taxonomies(array('public' => true));
+		$in_taxonomies = implode("','", array_map('esc_sql', $taxonomies));
 
 		global $wpdb;
 		$sql = "
@@ -50,9 +50,9 @@ 
 			LIMIT %d, %d
 			";
 
-		$ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
+		$ids = $wpdb->get_col($wpdb->prepare($sql, $offset, $limit));
 
-		return $this->sync_object_adapter_factory->create_many( Object_Type_Enum::TERM, $ids );
+		return $this->sync_object_adapter_factory->create_many(Object_Type_Enum::TERM, $ids);
 	}
 
 }

src/wordlift/dataset/background/stages/class-sync-background-process-posts-stage.php

Indentation +34 added lines, -34 removed lines

@@ -8,49 +8,49 @@ 
 
 class Sync_Background_Process_Posts_Stage {
 
-	/**
-	 * @var Sync_Object_Adapter_Factory
-	 */
-	private $sync_object_adapter_factory;
+    /**
+     * @var Sync_Object_Adapter_Factory
+     */
+    private $sync_object_adapter_factory;
 
-	/**
-	 * Sync_Background_Process_Posts_Stage constructor.
-	 *
-	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
-	 */
-	function __construct( $sync_object_adapter_factory ) {
-		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
-	}
+    /**
+     * Sync_Background_Process_Posts_Stage constructor.
+     *
+     * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
+     */
+    function __construct( $sync_object_adapter_factory ) {
+        $this->sync_object_adapter_factory = $sync_object_adapter_factory;
+    }
 
-	function count() {
+    function count() {
 
-		$post_types = get_post_types( array( 'public' => true ) );
+        $post_types = get_post_types( array( 'public' => true ) );
 
-		global $wpdb;
-		$in_post_type = implode( "','", array_map( 'esc_sql', $post_types ) );
-		$sql          = "
+        global $wpdb;
+        $in_post_type = implode( "','", array_map( 'esc_sql', $post_types ) );
+        $sql          = "
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
 			WHERE post_type IN ('$in_post_type')
 				AND post_status IN ( 'publish',  'future', 'draft', 'pending', 'private' )
 			";
 
-		return $wpdb->get_var( $sql );
-	}
+        return $wpdb->get_var( $sql );
+    }
 
-	/**
-	 * @param int $offset
-	 * @param int $limit
-	 *
-	 * @return Sync_Object_Adapter[]
-	 */
-	function get_sync_object_adapters( $offset, $limit ) {
+    /**
+     * @param int $offset
+     * @param int $limit
+     *
+     * @return Sync_Object_Adapter[]
+     */
+    function get_sync_object_adapters( $offset, $limit ) {
 
-		$post_types = get_post_types( array( 'public' => true ) );
+        $post_types = get_post_types( array( 'public' => true ) );
 
-		global $wpdb;
-		$in_post_type = implode( "','", array_map( 'esc_sql', $post_types ) );
-		$sql          = "
+        global $wpdb;
+        $in_post_type = implode( "','", array_map( 'esc_sql', $post_types ) );
+        $sql          = "
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_type IN ('$in_post_type')
@@ -59,10 +59,10 @@ 
 			LIMIT %d, %d
 			";
 
-		$ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
+        $ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
 
-		return $this->sync_object_adapter_factory
-			->create_many( Object_Type_Enum::POST, array_map( 'intval', $ids ) );
-	}
+        return $this->sync_object_adapter_factory
+            ->create_many( Object_Type_Enum::POST, array_map( 'intval', $ids ) );
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -18,16 +18,16 @@ 
 	 *
 	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
 	 */
-	function __construct( $sync_object_adapter_factory ) {
+	function __construct($sync_object_adapter_factory) {
 		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
 	}
 
 	function count() {
 
-		$post_types = get_post_types( array( 'public' => true ) );
+		$post_types = get_post_types(array('public' => true));
 
 		global $wpdb;
-		$in_post_type = implode( "','", array_map( 'esc_sql', $post_types ) );
+		$in_post_type = implode("','", array_map('esc_sql', $post_types));
 		$sql          = "
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
@@ -35,7 +35,7 @@ 
 				AND post_status IN ( 'publish',  'future', 'draft', 'pending', 'private' )
 			";
 
-		return $wpdb->get_var( $sql );
+		return $wpdb->get_var($sql);
 	}
 
 	/**
@@ -44,12 +44,12 @@ 
 	 *
 	 * @return Sync_Object_Adapter[]
 	 */
-	function get_sync_object_adapters( $offset, $limit ) {
+	function get_sync_object_adapters($offset, $limit) {
 
-		$post_types = get_post_types( array( 'public' => true ) );
+		$post_types = get_post_types(array('public' => true));
 
 		global $wpdb;
-		$in_post_type = implode( "','", array_map( 'esc_sql', $post_types ) );
+		$in_post_type = implode("','", array_map('esc_sql', $post_types));
 		$sql          = "
 			SELECT ID
 			FROM $wpdb->posts
@@ -59,10 +59,10 @@ 
 			LIMIT %d, %d
 			";
 
-		$ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
+		$ids = $wpdb->get_col($wpdb->prepare($sql, $offset, $limit));
 
 		return $this->sync_object_adapter_factory
-			->create_many( Object_Type_Enum::POST, array_map( 'intval', $ids ) );
+			->create_many(Object_Type_Enum::POST, array_map('intval', $ids));
 	}
 
 }

src/wordlift/dataset/background/stages/class-sync-background-process-users-stage.php

Indentation +26 added lines, -26 removed lines

@@ -7,43 +7,43 @@
 
 class Sync_Background_Process_Users_Stage {
 
-	/**
-	 * @var Sync_Object_Adapter_Factory
-	 */
-	private $sync_object_adapter_factory;
-
-	/**
-	 * Sync_Background_Process_Posts_Stage constructor.
-	 *
-	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
-	 */
-	function __construct( $sync_object_adapter_factory ) {
-		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
-	}
-
-	function count() {
-
-		global $wpdb;
-		$sql = "
+    /**
+     * @var Sync_Object_Adapter_Factory
+     */
+    private $sync_object_adapter_factory;
+
+    /**
+     * Sync_Background_Process_Posts_Stage constructor.
+     *
+     * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
+     */
+    function __construct( $sync_object_adapter_factory ) {
+        $this->sync_object_adapter_factory = $sync_object_adapter_factory;
+    }
+
+    function count() {
+
+        global $wpdb;
+        $sql = "
 			SELECT COUNT( 1 )
 			FROM $wpdb->users
 			";
 
-		return $wpdb->get_var( $sql );
-	}
+        return $wpdb->get_var( $sql );
+    }
 
-	function get_sync_object_adapters( $offset, $limit ) {
+    function get_sync_object_adapters( $offset, $limit ) {
 
-		global $wpdb;
-		$sql = "
+        global $wpdb;
+        $sql = "
 			SELECT ID
 			FROM $wpdb->users
 			LIMIT %d, %d
 			";
 
-		$ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
+        $ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
 
-		return $this->sync_object_adapter_factory->create_many( Object_Type_Enum::USER, $ids );
-	}
+        return $this->sync_object_adapter_factory->create_many( Object_Type_Enum::USER, $ids );
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 	 *
 	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
 	 */
-	function __construct( $sync_object_adapter_factory ) {
+	function __construct($sync_object_adapter_factory) {
 		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
 	}
 
@@ -29,10 +29,10 @@ 
 			FROM $wpdb->users
 			";
 
-		return $wpdb->get_var( $sql );
+		return $wpdb->get_var($sql);
 	}
 
-	function get_sync_object_adapters( $offset, $limit ) {
+	function get_sync_object_adapters($offset, $limit) {
 
 		global $wpdb;
 		$sql = "
@@ -41,9 +41,9 @@ 
 			LIMIT %d, %d
 			";
 
-		$ids = $wpdb->get_col( $wpdb->prepare( $sql, $offset, $limit ) );
+		$ids = $wpdb->get_col($wpdb->prepare($sql, $offset, $limit));
 
-		return $this->sync_object_adapter_factory->create_many( Object_Type_Enum::USER, $ids );
+		return $this->sync_object_adapter_factory->create_many(Object_Type_Enum::USER, $ids);
 	}
 
 }

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

Indentation +107 added lines, -107 removed lines

@@ -18,112 +18,112 @@
  */
 class Sync_Background_Process extends \Wordlift_Plugin_WP_Background_Process {
 
-	const STATE_STARTED = 'started';
-	const STATE_STOPPED = 'stopped';
-
-	protected $action = 'wl_dataset__sync';
-
-	/**
-	 * @var Sync_Service
-	 */
-	private $sync_service;
-
-	/**
-	 * @var Sync_Object_Adapter_Factory
-	 */
-	private $sync_object_adapter_factory;
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * @var Sync_Background_Process_State
-	 */
-	private $state;
-
-	/**
-	 * Sync_Background_Process constructor.
-	 *
-	 * @param Sync_Service $sync_service A {@link Sync_Service} instance providing the supporting functions to this background process.
-	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
-	 */
-	public function __construct( $sync_service, $sync_object_adapter_factory ) {
-		parent::__construct();
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->sync_service                = $sync_service;
-		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
-
-		// Set the current state.
-		if ( self::STATE_STARTED === $this->get_state() ) {
-			$this->state = new Sync_Background_Process_Started_State( $this, $this->sync_service, $this->sync_object_adapter_factory );
-		} else {
-			$this->state = new Sync_Background_Process_Stopped_State( $this );
-		}
-
-	}
-
-	/**
-	 * 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 mixed $item Queue item to iterate over.
-	 *
-	 * @return int[]|false The next post IDs or false if there are no more.
-	 */
-	protected function task( $item ) {
-
-		return $this->state->task( $item );
-	}
-
-	/**
-	 * Transition to the started state.
-	 */
-	public function start() {
-		$this->state->leave();
-		$this->state = new Sync_Background_Process_Started_State( $this, $this->sync_service, $this->sync_object_adapter_factory );
-		$this->state->enter();
-	}
-
-	/**
-	 * Transition to the stopped state.
-	 */
-	public function stop() {
-		$this->state->leave();
-		$this->state = new Sync_Background_Process_Stopped_State( $this );
-		$this->state->enter();
-	}
-
-	/**
-	 * Get the current state.
-	 *
-	 * @return string Either self::STARTED_STATE or self::STOPPED_STATE (default).
-	 */
-	public function get_state() {
-		return get_option( '_wl_sync_background_process_state', self::STATE_STOPPED );
-	}
-
-	/**
-	 * Persist the current state.
-	 *
-	 * @param string $value
-	 *
-	 * @return bool
-	 */
-	public function set_state( $value ) {
-		return null === $value
-			? delete_option( '_wl_sync_background_process_state' )
-			: update_option( '_wl_sync_background_process_state', $value, true );
-	}
-
-	public function get_info() {
-		return $this->state->get_info();
-	}
+    const STATE_STARTED = 'started';
+    const STATE_STOPPED = 'stopped';
+
+    protected $action = 'wl_dataset__sync';
+
+    /**
+     * @var Sync_Service
+     */
+    private $sync_service;
+
+    /**
+     * @var Sync_Object_Adapter_Factory
+     */
+    private $sync_object_adapter_factory;
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * @var Sync_Background_Process_State
+     */
+    private $state;
+
+    /**
+     * Sync_Background_Process constructor.
+     *
+     * @param Sync_Service $sync_service A {@link Sync_Service} instance providing the supporting functions to this background process.
+     * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
+     */
+    public function __construct( $sync_service, $sync_object_adapter_factory ) {
+        parent::__construct();
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->sync_service                = $sync_service;
+        $this->sync_object_adapter_factory = $sync_object_adapter_factory;
+
+        // Set the current state.
+        if ( self::STATE_STARTED === $this->get_state() ) {
+            $this->state = new Sync_Background_Process_Started_State( $this, $this->sync_service, $this->sync_object_adapter_factory );
+        } else {
+            $this->state = new Sync_Background_Process_Stopped_State( $this );
+        }
+
+    }
+
+    /**
+     * 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 mixed $item Queue item to iterate over.
+     *
+     * @return int[]|false The next post IDs or false if there are no more.
+     */
+    protected function task( $item ) {
+
+        return $this->state->task( $item );
+    }
+
+    /**
+     * Transition to the started state.
+     */
+    public function start() {
+        $this->state->leave();
+        $this->state = new Sync_Background_Process_Started_State( $this, $this->sync_service, $this->sync_object_adapter_factory );
+        $this->state->enter();
+    }
+
+    /**
+     * Transition to the stopped state.
+     */
+    public function stop() {
+        $this->state->leave();
+        $this->state = new Sync_Background_Process_Stopped_State( $this );
+        $this->state->enter();
+    }
+
+    /**
+     * Get the current state.
+     *
+     * @return string Either self::STARTED_STATE or self::STOPPED_STATE (default).
+     */
+    public function get_state() {
+        return get_option( '_wl_sync_background_process_state', self::STATE_STOPPED );
+    }
+
+    /**
+     * Persist the current state.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    public function set_state( $value ) {
+        return null === $value
+            ? delete_option( '_wl_sync_background_process_state' )
+            : update_option( '_wl_sync_background_process_state', $value, true );
+    }
+
+    public function get_info() {
+        return $this->state->get_info();
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -49,19 +49,19 @@ 
 	 * @param Sync_Service $sync_service A {@link Sync_Service} instance providing the supporting functions to this background process.
 	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
 	 */
-	public function __construct( $sync_service, $sync_object_adapter_factory ) {
+	public function __construct($sync_service, $sync_object_adapter_factory) {
 		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;
 		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
 
 		// Set the current state.
-		if ( self::STATE_STARTED === $this->get_state() ) {
-			$this->state = new Sync_Background_Process_Started_State( $this, $this->sync_service, $this->sync_object_adapter_factory );
+		if (self::STATE_STARTED === $this->get_state()) {
+			$this->state = new Sync_Background_Process_Started_State($this, $this->sync_service, $this->sync_object_adapter_factory);
 		} else {
-			$this->state = new Sync_Background_Process_Stopped_State( $this );
+			$this->state = new Sync_Background_Process_Stopped_State($this);
 		}
 
 	}
@@ -77,9 +77,9 @@ 
 	 *
 	 * @return int[]|false The next post IDs or false if there are no more.
 	 */
-	protected function task( $item ) {
+	protected function task($item) {
 
-		return $this->state->task( $item );
+		return $this->state->task($item);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function start() {
 		$this->state->leave();
-		$this->state = new Sync_Background_Process_Started_State( $this, $this->sync_service, $this->sync_object_adapter_factory );
+		$this->state = new Sync_Background_Process_Started_State($this, $this->sync_service, $this->sync_object_adapter_factory);
 		$this->state->enter();
 	}
 
@@ -96,7 +96,7 @@ 
 	 */
 	public function stop() {
 		$this->state->leave();
-		$this->state = new Sync_Background_Process_Stopped_State( $this );
+		$this->state = new Sync_Background_Process_Stopped_State($this);
 		$this->state->enter();
 	}
 
@@ -106,7 +106,7 @@ 
 	 * @return string Either self::STARTED_STATE or self::STOPPED_STATE (default).
 	 */
 	public function get_state() {
-		return get_option( '_wl_sync_background_process_state', self::STATE_STOPPED );
+		return get_option('_wl_sync_background_process_state', self::STATE_STOPPED);
 	}
 
 	/**
@@ -116,10 +116,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_state( $value ) {
+	public function set_state($value) {
 		return null === $value
-			? delete_option( '_wl_sync_background_process_state' )
-			: update_option( '_wl_sync_background_process_state', $value, true );
+			? delete_option('_wl_sync_background_process_state')
+			: update_option('_wl_sync_background_process_state', $value, true);
 	}
 
 	public function get_info() {

src/wordlift/analysis/response/class-analysis-response-ops.php

Indentation +315 added lines, -315 removed lines

@@ -14,288 +14,288 @@ 
 
 class Analysis_Response_Ops {
 
-	/**
-	 * The analysis response json.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var mixed $json Holds the analysis response json.
-	 */
-	private $json;
-
-	/**
-	 * Holds the {@link Wordlift_Entity_Uri_Service}.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	private $entity_service;
-
-	/**
-	 * @var \Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-	/**
-	 * @var \Wordlift_Post_Image_Storage
-	 */
-	private $post_image_storage;
-
-	/**
-	 * @var Entity_Helper
-	 */
-	private $entity_helper;
-
-	/**
-	 * Analysis_Response_Ops constructor.
-	 *
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service}.
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service}.
-	 * @param \Wordlift_Post_Image_Storage $post_image_storage A {@link Wordlift_Post_Image_Storage} instance.
-	 * @param Entity_Helper $entity_helper The {@link Entity_Helper}.
-	 * @param mixed $json The analysis response json.
-	 *
-	 * @since 3.21.5
-	 */
-	public function __construct( $entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $entity_helper, $json ) {
-
-		$this->json                = $json;
-		$this->entity_uri_service  = $entity_uri_service;
-		$this->entity_service      = $entity_service;
-		$this->entity_type_service = $entity_type_service;
-		$this->post_image_storage  = $post_image_storage;
-		$this->entity_helper       = $entity_helper;
-
-	}
-
-	/**
-	 * Switches remote entities, i.e. entities with id outside the local dataset, to local entities.
-	 *
-	 * The function takes all the entities that have an id which is not local. For each remote entity, a list of URIs
-	 * is built comprising the entity id and the sameAs. Then a query is issued in the local database to find potential
-	 * matches from the local vocabulary.
-	 *
-	 * If found, the entity id is swapped with the local id and the remote id is added to the sameAs.
-	 *
-	 * @return Analysis_Response_Ops The current Analysis_Response_Ops instance.
-	 */
-	public function make_entities_local() {
-
-		if ( ! isset( $this->json->entities ) ) {
-			return $this;
-		}
-
-		// Get the URIs.
-		$uris     = array_keys( get_object_vars( $this->json->entities ) );
-		$mappings = $this->entity_helper->map_many_to_local( $uris );
-
-		foreach ( $mappings as $external_uri => $internal_uri ) {
-
-			// Move the data from the external URI to the internal URI.
-			if ( ! isset( $this->json->entities->{$internal_uri} ) ) {
-				$this->json->entities->{$internal_uri} = $this->json->entities->{$external_uri};
-			}
-
-			// Ensure sameAs is an array.
-			if ( ! isset( $this->json->entities->{$internal_uri}->sameAs )
-			     || ! is_array( $this->json->entities->{$internal_uri}->sameAs ) ) {
-				$this->json->entities->{$internal_uri}->sameAs = array();
-			}
-
-			// Add the external URI as sameAs.
-			$this->json->entities->{$internal_uri}->sameAs[] = $external_uri;
-
-			// Finally remove the external URI.
-			unset( $this->json->entities->{$external_uri} );
-		}
-
-		if ( isset( $this->json->annotations ) ) {
-			foreach ( $this->json->annotations as $key => $annotation ) {
-				if ( isset( $annotation->entityMatches ) ) {
-					foreach ( $annotation->entityMatches as $match ) {
-						if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
-							$match->entityId = $mappings[ $match->entityId ];
-						}
-					}
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Add occurrences by parsing the provided html content.
-	 *
-	 * @param string $content The html content with annotations.
-	 *
-	 * @return Analysis_Response_Ops The {@link Analysis_Response_Ops} instance.
-	 *
-	 * @since 3.23.7 refactor the regex pattern to take into account that there might be css classes between textannotation
-	 *  and disambiguated.
-	 *
-	 * @link https://github.com/insideout10/wordlift-plugin/issues/1001
-	 */
-	public function add_occurrences( $content ) {
-
-		// Try to get all the disambiguated annotations and bail out if an error occurs.
-		if ( false === preg_match_all(
-				'|<span\s+id="([^"]+)"\s+class="textannotation\s+(?:\S+\s+)?disambiguated(?=[\s"])[^"]*"\s+itemid="([^"]*)">(.*?)</span>|',
-				$content,
-				$matches,
-				PREG_OFFSET_CAPTURE
-			) ) {
-			return $this;
-		}
-
-		if ( empty( $matches ) ) {
-			return $this;
-		}
-
-		$parse_data = array_reduce( range( 0, count( $matches[1] ) - 1 ), function ( $carry, $i ) use ( $matches ) {
-			if ( empty( $matches[0] ) ) {
-				return $carry;
-			}
-
-			$start         = $matches[0][ $i ][1];
-			$end           = $start + strlen( $matches[0][ $i ][0] );
-			$annotation_id = $matches[1][ $i ][0];
-			$item_id       = $matches[2][ $i ][0];
-			$text          = $matches[3][ $i ][0];
-
-			$annotation               = new StdClass;
-			$annotation->annotationId = $annotation_id;
-			$annotation->start        = $start;
-			$annotation->end          = $end;
-			$annotation->text         = $text;
-
-			$entity_match                = new StdClass;
-			$entity_match->confidence    = 100;
-			$entity_match->entityId      = $item_id;
-			$annotation->entityMatches[] = $entity_match;
-
-			$carry['annotations'][ $annotation_id ] = $annotation;
-			$carry['occurrences'][ $item_id ][]     = $annotation_id;
-
-			return $carry;
-		}, array( 'annotations' => array(), 'occurrences' => array(), ) );
-
-		$annotations = $parse_data['annotations'];
-		$occurrences = $parse_data['occurrences'];
-
-		foreach ( array_keys( $occurrences ) as $item_id ) {
-
-			// If the entity isn't there, add it.
-			if ( ! is_bool( $this->json ) && ! isset( $this->json->entities->{$item_id} ) ) {
-				$entity = $this->get_local_entity( $item_id );
-
-				// Entity not found in the local vocabulary, continue to the next one.
-				if ( false === $entity ) {
-					continue;
-				}
-
-				$this->json->entities->{$item_id} = $entity;
-			}
-		}
-
-		// Here we're adding back some data structures required by the client-side code.
-		//
-		// We're adding:
-		//  1. the .entities[entity_id].occurrences array with the annotations' ids.
-		//  2. the .entities[entity_id].annotations[annotation_id] = { id: annotation_id } map.
-		//
-		// Before 3.23.0 this was done by the client-side code located in src/coffee/editpost-widget/app.services.AnalysisService.coffee
-		// function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
-		// `embedAnalysis`.
-
-		if ( ! is_bool( $this->json ) ) {
-			foreach ( $this->json->entities as $id => $entity ) {
-				$this->json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();;
-
-				foreach ( $this->json->entities->{$id}->occurrences as $annotation_id ) {
-					$this->json->entities->{$id}->annotations[ $annotation_id ] = array(
-						'id' => $annotation_id,
-					);
-				}
-			}
-		}
-
-		// Add the missing annotations. This allows the analysis response to work also if we didn't receive results
-		// from the analysis API.
-		foreach ( $annotations as $annotation_id => $annotation ) {
-
-			if ( ! is_bool( $this->json ) && ! isset( $this->json->annotations->{$annotation_id} ) ) {
-				$this->json->annotations->{$annotation_id} = $annotation;
-			}
-
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Add local entities
-	 *
-	 * @return Analysis_Response_Ops The {@link Analysis_Response_Ops} instance.
-	 *
-	 * @since 3.27.6
-	 *
-	 * @link https://github.com/insideout10/wordlift-plugin/issues/1178
-	 */
-	public function add_local_entities() {
-
-		// Populating the local entities object
-		$entities = array();
-		foreach ( $this->json->annotations as $annotation ) {
-			foreach ( $annotation->entityMatches as $entity_matches ) {
-
-				$entity_id         = url_to_postid( htmlspecialchars_decode( $entity_matches->entityId ) );
-				$serialized_entity = wl_serialize_entity( $entity_id );
-
-				if ( $serialized_entity ) {
-					$serialized_entity['entityId'] = $serialized_entity['id'];
-					unset( $serialized_entity['id'] );
-
-					$entities[ $entity_matches->entityId ] = $serialized_entity;
-				}
-
-			}
-		}
-
-		// Adding occurrences and annotations data structures required by the client-side code.
-		foreach ( $entities as $entity_id => $entity ) {
-			foreach ( $this->json->annotations as $annotation ) {
-				if ( $annotation->entityMatches[0]->entityId === $entity_id ) {
-					$entities[ $entity_id ]['occurrences'][]                                  = $annotation->annotationId;
-					$entities[ $entity_id ]['annotations'][ $annotation->annotationId ]['id'] = $annotation->annotationId;
-				}
-			}
-		}
-
-		$this->json->entities = $entities;
-
-		return $this;
-
-	}
-
-	private function get_local_entity( $uri ) {
-
-		$entity = $this->entity_uri_service->get_entity( $uri );
-
-		if ( null === $entity ) {
-			return false;
-		}
-
-		$type   = $this->entity_type_service->get( $entity->ID );
-		$images = $this->post_image_storage->get( $entity->ID );
-
-		return (object) array(
-			'id'          => $uri,
-			'label'       => $entity->post_title,
-			/*
+    /**
+     * The analysis response json.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var mixed $json Holds the analysis response json.
+     */
+    private $json;
+
+    /**
+     * Holds the {@link Wordlift_Entity_Uri_Service}.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    private $entity_service;
+
+    /**
+     * @var \Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+    /**
+     * @var \Wordlift_Post_Image_Storage
+     */
+    private $post_image_storage;
+
+    /**
+     * @var Entity_Helper
+     */
+    private $entity_helper;
+
+    /**
+     * Analysis_Response_Ops constructor.
+     *
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service}.
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service}.
+     * @param \Wordlift_Post_Image_Storage $post_image_storage A {@link Wordlift_Post_Image_Storage} instance.
+     * @param Entity_Helper $entity_helper The {@link Entity_Helper}.
+     * @param mixed $json The analysis response json.
+     *
+     * @since 3.21.5
+     */
+    public function __construct( $entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $entity_helper, $json ) {
+
+        $this->json                = $json;
+        $this->entity_uri_service  = $entity_uri_service;
+        $this->entity_service      = $entity_service;
+        $this->entity_type_service = $entity_type_service;
+        $this->post_image_storage  = $post_image_storage;
+        $this->entity_helper       = $entity_helper;
+
+    }
+
+    /**
+     * Switches remote entities, i.e. entities with id outside the local dataset, to local entities.
+     *
+     * The function takes all the entities that have an id which is not local. For each remote entity, a list of URIs
+     * is built comprising the entity id and the sameAs. Then a query is issued in the local database to find potential
+     * matches from the local vocabulary.
+     *
+     * If found, the entity id is swapped with the local id and the remote id is added to the sameAs.
+     *
+     * @return Analysis_Response_Ops The current Analysis_Response_Ops instance.
+     */
+    public function make_entities_local() {
+
+        if ( ! isset( $this->json->entities ) ) {
+            return $this;
+        }
+
+        // Get the URIs.
+        $uris     = array_keys( get_object_vars( $this->json->entities ) );
+        $mappings = $this->entity_helper->map_many_to_local( $uris );
+
+        foreach ( $mappings as $external_uri => $internal_uri ) {
+
+            // Move the data from the external URI to the internal URI.
+            if ( ! isset( $this->json->entities->{$internal_uri} ) ) {
+                $this->json->entities->{$internal_uri} = $this->json->entities->{$external_uri};
+            }
+
+            // Ensure sameAs is an array.
+            if ( ! isset( $this->json->entities->{$internal_uri}->sameAs )
+                 || ! is_array( $this->json->entities->{$internal_uri}->sameAs ) ) {
+                $this->json->entities->{$internal_uri}->sameAs = array();
+            }
+
+            // Add the external URI as sameAs.
+            $this->json->entities->{$internal_uri}->sameAs[] = $external_uri;
+
+            // Finally remove the external URI.
+            unset( $this->json->entities->{$external_uri} );
+        }
+
+        if ( isset( $this->json->annotations ) ) {
+            foreach ( $this->json->annotations as $key => $annotation ) {
+                if ( isset( $annotation->entityMatches ) ) {
+                    foreach ( $annotation->entityMatches as $match ) {
+                        if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
+                            $match->entityId = $mappings[ $match->entityId ];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add occurrences by parsing the provided html content.
+     *
+     * @param string $content The html content with annotations.
+     *
+     * @return Analysis_Response_Ops The {@link Analysis_Response_Ops} instance.
+     *
+     * @since 3.23.7 refactor the regex pattern to take into account that there might be css classes between textannotation
+     *  and disambiguated.
+     *
+     * @link https://github.com/insideout10/wordlift-plugin/issues/1001
+     */
+    public function add_occurrences( $content ) {
+
+        // Try to get all the disambiguated annotations and bail out if an error occurs.
+        if ( false === preg_match_all(
+                '|<span\s+id="([^"]+)"\s+class="textannotation\s+(?:\S+\s+)?disambiguated(?=[\s"])[^"]*"\s+itemid="([^"]*)">(.*?)</span>|',
+                $content,
+                $matches,
+                PREG_OFFSET_CAPTURE
+            ) ) {
+            return $this;
+        }
+
+        if ( empty( $matches ) ) {
+            return $this;
+        }
+
+        $parse_data = array_reduce( range( 0, count( $matches[1] ) - 1 ), function ( $carry, $i ) use ( $matches ) {
+            if ( empty( $matches[0] ) ) {
+                return $carry;
+            }
+
+            $start         = $matches[0][ $i ][1];
+            $end           = $start + strlen( $matches[0][ $i ][0] );
+            $annotation_id = $matches[1][ $i ][0];
+            $item_id       = $matches[2][ $i ][0];
+            $text          = $matches[3][ $i ][0];
+
+            $annotation               = new StdClass;
+            $annotation->annotationId = $annotation_id;
+            $annotation->start        = $start;
+            $annotation->end          = $end;
+            $annotation->text         = $text;
+
+            $entity_match                = new StdClass;
+            $entity_match->confidence    = 100;
+            $entity_match->entityId      = $item_id;
+            $annotation->entityMatches[] = $entity_match;
+
+            $carry['annotations'][ $annotation_id ] = $annotation;
+            $carry['occurrences'][ $item_id ][]     = $annotation_id;
+
+            return $carry;
+        }, array( 'annotations' => array(), 'occurrences' => array(), ) );
+
+        $annotations = $parse_data['annotations'];
+        $occurrences = $parse_data['occurrences'];
+
+        foreach ( array_keys( $occurrences ) as $item_id ) {
+
+            // If the entity isn't there, add it.
+            if ( ! is_bool( $this->json ) && ! isset( $this->json->entities->{$item_id} ) ) {
+                $entity = $this->get_local_entity( $item_id );
+
+                // Entity not found in the local vocabulary, continue to the next one.
+                if ( false === $entity ) {
+                    continue;
+                }
+
+                $this->json->entities->{$item_id} = $entity;
+            }
+        }
+
+        // Here we're adding back some data structures required by the client-side code.
+        //
+        // We're adding:
+        //  1. the .entities[entity_id].occurrences array with the annotations' ids.
+        //  2. the .entities[entity_id].annotations[annotation_id] = { id: annotation_id } map.
+        //
+        // Before 3.23.0 this was done by the client-side code located in src/coffee/editpost-widget/app.services.AnalysisService.coffee
+        // function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
+        // `embedAnalysis`.
+
+        if ( ! is_bool( $this->json ) ) {
+            foreach ( $this->json->entities as $id => $entity ) {
+                $this->json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();;
+
+                foreach ( $this->json->entities->{$id}->occurrences as $annotation_id ) {
+                    $this->json->entities->{$id}->annotations[ $annotation_id ] = array(
+                        'id' => $annotation_id,
+                    );
+                }
+            }
+        }
+
+        // Add the missing annotations. This allows the analysis response to work also if we didn't receive results
+        // from the analysis API.
+        foreach ( $annotations as $annotation_id => $annotation ) {
+
+            if ( ! is_bool( $this->json ) && ! isset( $this->json->annotations->{$annotation_id} ) ) {
+                $this->json->annotations->{$annotation_id} = $annotation;
+            }
+
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add local entities
+     *
+     * @return Analysis_Response_Ops The {@link Analysis_Response_Ops} instance.
+     *
+     * @since 3.27.6
+     *
+     * @link https://github.com/insideout10/wordlift-plugin/issues/1178
+     */
+    public function add_local_entities() {
+
+        // Populating the local entities object
+        $entities = array();
+        foreach ( $this->json->annotations as $annotation ) {
+            foreach ( $annotation->entityMatches as $entity_matches ) {
+
+                $entity_id         = url_to_postid( htmlspecialchars_decode( $entity_matches->entityId ) );
+                $serialized_entity = wl_serialize_entity( $entity_id );
+
+                if ( $serialized_entity ) {
+                    $serialized_entity['entityId'] = $serialized_entity['id'];
+                    unset( $serialized_entity['id'] );
+
+                    $entities[ $entity_matches->entityId ] = $serialized_entity;
+                }
+
+            }
+        }
+
+        // Adding occurrences and annotations data structures required by the client-side code.
+        foreach ( $entities as $entity_id => $entity ) {
+            foreach ( $this->json->annotations as $annotation ) {
+                if ( $annotation->entityMatches[0]->entityId === $entity_id ) {
+                    $entities[ $entity_id ]['occurrences'][]                                  = $annotation->annotationId;
+                    $entities[ $entity_id ]['annotations'][ $annotation->annotationId ]['id'] = $annotation->annotationId;
+                }
+            }
+        }
+
+        $this->json->entities = $entities;
+
+        return $this;
+
+    }
+
+    private function get_local_entity( $uri ) {
+
+        $entity = $this->entity_uri_service->get_entity( $uri );
+
+        if ( null === $entity ) {
+            return false;
+        }
+
+        $type   = $this->entity_type_service->get( $entity->ID );
+        $images = $this->post_image_storage->get( $entity->ID );
+
+        return (object) array(
+            'id'          => $uri,
+            'label'       => $entity->post_title,
+            /*
 			 * As of 2020.06.29 we're comment out the `post_content` because Gutenberg posts will return here
 			 * the whole Gutenberg source including potentially our own wordlift/classification block, which means
 			 * that data may grow quickly to more than a 100 KBytes and could break web servers.
@@ -307,38 +307,38 @@ 
 			 *
 			 * PS: We didn't test using the WordLift Post Excerpt Helper.
 			 */
-			// 'description' => $entity->post_content,
-			'description' => '',
-			'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
-			'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
-			'types'       => wl_get_entity_rdf_types( $entity->ID ),
-			'images'      => $images,
-		);
-	}
-
-	/**
-	 * Return the JSON response.
-	 *
-	 * @return mixed The JSON response.
-	 * @since 3.24.2
-	 */
-	public function get_json() {
-
-		return $this->json;
-	}
-
-	/**
-	 * Get the string representation of the JSON.
-	 *
-	 * @return false|string The string representation or false in case of error.
-	 */
-	public function to_string() {
-
-		// Add the `JSON_UNESCAPED_UNICODE` only for PHP 5.4+.
-		$options = ( version_compare( PHP_VERSION, '5.4', '>=' )
-			? 256 : 0 );
-
-		return wp_json_encode( $this->json, $options );
-	}
+            // 'description' => $entity->post_content,
+            'description' => '',
+            'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
+            'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
+            'types'       => wl_get_entity_rdf_types( $entity->ID ),
+            'images'      => $images,
+        );
+    }
+
+    /**
+     * Return the JSON response.
+     *
+     * @return mixed The JSON response.
+     * @since 3.24.2
+     */
+    public function get_json() {
+
+        return $this->json;
+    }
+
+    /**
+     * Get the string representation of the JSON.
+     *
+     * @return false|string The string representation or false in case of error.
+     */
+    public function to_string() {
+
+        // Add the `JSON_UNESCAPED_UNICODE` only for PHP 5.4+.
+        $options = ( version_compare( PHP_VERSION, '5.4', '>=' )
+            ? 256 : 0 );
+
+        return wp_json_encode( $this->json, $options );
+    }
 
 }

Spacing +63 added lines, -63 removed lines

@@ -60,7 +60,7 @@ 
 	 *
 	 * @since 3.21.5
 	 */
-	public function __construct( $entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $entity_helper, $json ) {
+	public function __construct($entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $entity_helper, $json) {
 
 		$this->json                = $json;
 		$this->entity_uri_service  = $entity_uri_service;
@@ -84,24 +84,24 @@ 
 	 */
 	public function make_entities_local() {
 
-		if ( ! isset( $this->json->entities ) ) {
+		if ( ! isset($this->json->entities)) {
 			return $this;
 		}
 
 		// Get the URIs.
-		$uris     = array_keys( get_object_vars( $this->json->entities ) );
-		$mappings = $this->entity_helper->map_many_to_local( $uris );
+		$uris     = array_keys(get_object_vars($this->json->entities));
+		$mappings = $this->entity_helper->map_many_to_local($uris);
 
-		foreach ( $mappings as $external_uri => $internal_uri ) {
+		foreach ($mappings as $external_uri => $internal_uri) {
 
 			// Move the data from the external URI to the internal URI.
-			if ( ! isset( $this->json->entities->{$internal_uri} ) ) {
+			if ( ! isset($this->json->entities->{$internal_uri} )) {
 				$this->json->entities->{$internal_uri} = $this->json->entities->{$external_uri};
 			}
 
 			// Ensure sameAs is an array.
-			if ( ! isset( $this->json->entities->{$internal_uri}->sameAs )
-			     || ! is_array( $this->json->entities->{$internal_uri}->sameAs ) ) {
+			if ( ! isset($this->json->entities->{$internal_uri}->sameAs)
+			     || ! is_array($this->json->entities->{$internal_uri}->sameAs)) {
 				$this->json->entities->{$internal_uri}->sameAs = array();
 			}
 
@@ -109,15 +109,15 @@ 
 			$this->json->entities->{$internal_uri}->sameAs[] = $external_uri;
 
 			// Finally remove the external URI.
-			unset( $this->json->entities->{$external_uri} );
+			unset($this->json->entities->{$external_uri} );
 		}
 
-		if ( isset( $this->json->annotations ) ) {
-			foreach ( $this->json->annotations as $key => $annotation ) {
-				if ( isset( $annotation->entityMatches ) ) {
-					foreach ( $annotation->entityMatches as $match ) {
-						if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
-							$match->entityId = $mappings[ $match->entityId ];
+		if (isset($this->json->annotations)) {
+			foreach ($this->json->annotations as $key => $annotation) {
+				if (isset($annotation->entityMatches)) {
+					foreach ($annotation->entityMatches as $match) {
+						if (isset($match->entityId) && isset($mappings[$match->entityId])) {
+							$match->entityId = $mappings[$match->entityId];
 						}
 					}
 				}
@@ -139,32 +139,32 @@ 
 	 *
 	 * @link https://github.com/insideout10/wordlift-plugin/issues/1001
 	 */
-	public function add_occurrences( $content ) {
+	public function add_occurrences($content) {
 
 		// Try to get all the disambiguated annotations and bail out if an error occurs.
-		if ( false === preg_match_all(
+		if (false === preg_match_all(
 				'|<span\s+id="([^"]+)"\s+class="textannotation\s+(?:\S+\s+)?disambiguated(?=[\s"])[^"]*"\s+itemid="([^"]*)">(.*?)</span>|',
 				$content,
 				$matches,
 				PREG_OFFSET_CAPTURE
-			) ) {
+			)) {
 			return $this;
 		}
 
-		if ( empty( $matches ) ) {
+		if (empty($matches)) {
 			return $this;
 		}
 
-		$parse_data = array_reduce( range( 0, count( $matches[1] ) - 1 ), function ( $carry, $i ) use ( $matches ) {
-			if ( empty( $matches[0] ) ) {
+		$parse_data = array_reduce(range(0, count($matches[1]) - 1), function($carry, $i) use ($matches) {
+			if (empty($matches[0])) {
 				return $carry;
 			}
 
-			$start         = $matches[0][ $i ][1];
-			$end           = $start + strlen( $matches[0][ $i ][0] );
-			$annotation_id = $matches[1][ $i ][0];
-			$item_id       = $matches[2][ $i ][0];
-			$text          = $matches[3][ $i ][0];
+			$start         = $matches[0][$i][1];
+			$end           = $start + strlen($matches[0][$i][0]);
+			$annotation_id = $matches[1][$i][0];
+			$item_id       = $matches[2][$i][0];
+			$text          = $matches[3][$i][0];
 
 			$annotation               = new StdClass;
 			$annotation->annotationId = $annotation_id;
@@ -177,23 +177,23 @@ 
 			$entity_match->entityId      = $item_id;
 			$annotation->entityMatches[] = $entity_match;
 
-			$carry['annotations'][ $annotation_id ] = $annotation;
-			$carry['occurrences'][ $item_id ][]     = $annotation_id;
+			$carry['annotations'][$annotation_id] = $annotation;
+			$carry['occurrences'][$item_id][]     = $annotation_id;
 
 			return $carry;
-		}, array( 'annotations' => array(), 'occurrences' => array(), ) );
+		}, array('annotations' => array(), 'occurrences' => array(),));
 
 		$annotations = $parse_data['annotations'];
 		$occurrences = $parse_data['occurrences'];
 
-		foreach ( array_keys( $occurrences ) as $item_id ) {
+		foreach (array_keys($occurrences) as $item_id) {
 
 			// If the entity isn't there, add it.
-			if ( ! is_bool( $this->json ) && ! isset( $this->json->entities->{$item_id} ) ) {
-				$entity = $this->get_local_entity( $item_id );
+			if ( ! is_bool($this->json) && ! isset($this->json->entities->{$item_id} )) {
+				$entity = $this->get_local_entity($item_id);
 
 				// Entity not found in the local vocabulary, continue to the next one.
-				if ( false === $entity ) {
+				if (false === $entity) {
 					continue;
 				}
 
@@ -211,12 +211,12 @@ 
 		// function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
 		// `embedAnalysis`.
 
-		if ( ! is_bool( $this->json ) ) {
-			foreach ( $this->json->entities as $id => $entity ) {
-				$this->json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();;
+		if ( ! is_bool($this->json)) {
+			foreach ($this->json->entities as $id => $entity) {
+				$this->json->entities->{$id}->occurrences = isset($occurrences[$id]) ? $occurrences[$id] : array(); ;
 
-				foreach ( $this->json->entities->{$id}->occurrences as $annotation_id ) {
-					$this->json->entities->{$id}->annotations[ $annotation_id ] = array(
+				foreach ($this->json->entities->{$id}->occurrences as $annotation_id) {
+					$this->json->entities->{$id}->annotations[$annotation_id] = array(
 						'id' => $annotation_id,
 					);
 				}
@@ -225,9 +225,9 @@ 
 
 		// Add the missing annotations. This allows the analysis response to work also if we didn't receive results
 		// from the analysis API.
-		foreach ( $annotations as $annotation_id => $annotation ) {
+		foreach ($annotations as $annotation_id => $annotation) {
 
-			if ( ! is_bool( $this->json ) && ! isset( $this->json->annotations->{$annotation_id} ) ) {
+			if ( ! is_bool($this->json) && ! isset($this->json->annotations->{$annotation_id} )) {
 				$this->json->annotations->{$annotation_id} = $annotation;
 			}
 
@@ -249,28 +249,28 @@ 
 
 		// Populating the local entities object
 		$entities = array();
-		foreach ( $this->json->annotations as $annotation ) {
-			foreach ( $annotation->entityMatches as $entity_matches ) {
+		foreach ($this->json->annotations as $annotation) {
+			foreach ($annotation->entityMatches as $entity_matches) {
 
-				$entity_id         = url_to_postid( htmlspecialchars_decode( $entity_matches->entityId ) );
-				$serialized_entity = wl_serialize_entity( $entity_id );
+				$entity_id         = url_to_postid(htmlspecialchars_decode($entity_matches->entityId));
+				$serialized_entity = wl_serialize_entity($entity_id);
 
-				if ( $serialized_entity ) {
+				if ($serialized_entity) {
 					$serialized_entity['entityId'] = $serialized_entity['id'];
-					unset( $serialized_entity['id'] );
+					unset($serialized_entity['id']);
 
-					$entities[ $entity_matches->entityId ] = $serialized_entity;
+					$entities[$entity_matches->entityId] = $serialized_entity;
 				}
 
 			}
 		}
 
 		// Adding occurrences and annotations data structures required by the client-side code.
-		foreach ( $entities as $entity_id => $entity ) {
-			foreach ( $this->json->annotations as $annotation ) {
-				if ( $annotation->entityMatches[0]->entityId === $entity_id ) {
-					$entities[ $entity_id ]['occurrences'][]                                  = $annotation->annotationId;
-					$entities[ $entity_id ]['annotations'][ $annotation->annotationId ]['id'] = $annotation->annotationId;
+		foreach ($entities as $entity_id => $entity) {
+			foreach ($this->json->annotations as $annotation) {
+				if ($annotation->entityMatches[0]->entityId === $entity_id) {
+					$entities[$entity_id]['occurrences'][]                                  = $annotation->annotationId;
+					$entities[$entity_id]['annotations'][$annotation->annotationId]['id'] = $annotation->annotationId;
 				}
 			}
 		}
@@ -281,16 +281,16 @@ 
 
 	}
 
-	private function get_local_entity( $uri ) {
+	private function get_local_entity($uri) {
 
-		$entity = $this->entity_uri_service->get_entity( $uri );
+		$entity = $this->entity_uri_service->get_entity($uri);
 
-		if ( null === $entity ) {
+		if (null === $entity) {
 			return false;
 		}
 
-		$type   = $this->entity_type_service->get( $entity->ID );
-		$images = $this->post_image_storage->get( $entity->ID );
+		$type   = $this->entity_type_service->get($entity->ID);
+		$images = $this->post_image_storage->get($entity->ID);
 
 		return (object) array(
 			'id'          => $uri,
@@ -309,9 +309,9 @@ 
 			 */
 			// 'description' => $entity->post_content,
 			'description' => '',
-			'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
-			'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
-			'types'       => wl_get_entity_rdf_types( $entity->ID ),
+			'sameAs'      => wl_schema_get_value($entity->ID, 'sameAs'),
+			'mainType'    => str_replace('wl-', '', $type['css_class']),
+			'types'       => wl_get_entity_rdf_types($entity->ID),
 			'images'      => $images,
 		);
 	}
@@ -335,10 +335,10 @@ 
 	public function to_string() {
 
 		// Add the `JSON_UNESCAPED_UNICODE` only for PHP 5.4+.
-		$options = ( version_compare( PHP_VERSION, '5.4', '>=' )
-			? 256 : 0 );
+		$options = (version_compare(PHP_VERSION, '5.4', '>=')
+			? 256 : 0);
 
-		return wp_json_encode( $this->json, $options );
+		return wp_json_encode($this->json, $options);
 	}
 
 }