insideout10 / wordlift-plugin

src/wordlift/analysis/occurrences/class-no-annotation-strategy.php

Indentation +20 added lines, -20 removed lines

@@ -16,25 +16,25 @@
 
 class No_Annotation_Strategy extends Singleton implements Occurrences {
 
-	public function add_occurences_to_entities( $occurrences, $json, $post_id ) {
-
-		$references = Object_Relation_Factory::get_instance( $post_id )->get_references(
-			$post_id,
-			// TODO: when term content analysis is implemented, the subject_type should be sent by editor.
-			Object_Type_Enum::POST
-		);
-
-		$content_service = Wordpress_Content_Service::get_instance();
-
-		foreach ( $references as $reference ) {
-			$entity_uri                    = $content_service
-				->get_entity_id( new Wordpress_Content_Id( $reference->get_id(), $reference->get_type() ) );
-			$entity_data                   = wl_serialize_entity( $reference->get_id() );
-			$entity_data['occurrences']    = array( 'placeholder-occurrence' );
-			$json->entities->{$entity_uri} = $entity_data;
-		}
-
-		return $json;
-	}
+    public function add_occurences_to_entities( $occurrences, $json, $post_id ) {
+
+        $references = Object_Relation_Factory::get_instance( $post_id )->get_references(
+            $post_id,
+            // TODO: when term content analysis is implemented, the subject_type should be sent by editor.
+            Object_Type_Enum::POST
+        );
+
+        $content_service = Wordpress_Content_Service::get_instance();
+
+        foreach ( $references as $reference ) {
+            $entity_uri                    = $content_service
+                ->get_entity_id( new Wordpress_Content_Id( $reference->get_id(), $reference->get_type() ) );
+            $entity_data                   = wl_serialize_entity( $reference->get_id() );
+            $entity_data['occurrences']    = array( 'placeholder-occurrence' );
+            $json->entities->{$entity_uri} = $entity_data;
+        }
+
+        return $json;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -16,9 +16,9 @@ 
 
 class No_Annotation_Strategy extends Singleton implements Occurrences {
 
-	public function add_occurences_to_entities( $occurrences, $json, $post_id ) {
+	public function add_occurences_to_entities($occurrences, $json, $post_id) {
 
-		$references = Object_Relation_Factory::get_instance( $post_id )->get_references(
+		$references = Object_Relation_Factory::get_instance($post_id)->get_references(
 			$post_id,
 			// TODO: when term content analysis is implemented, the subject_type should be sent by editor.
 			Object_Type_Enum::POST
@@ -26,11 +26,11 @@ 
 
 		$content_service = Wordpress_Content_Service::get_instance();
 
-		foreach ( $references as $reference ) {
+		foreach ($references as $reference) {
 			$entity_uri                    = $content_service
-				->get_entity_id( new Wordpress_Content_Id( $reference->get_id(), $reference->get_type() ) );
-			$entity_data                   = wl_serialize_entity( $reference->get_id() );
-			$entity_data['occurrences']    = array( 'placeholder-occurrence' );
+				->get_entity_id(new Wordpress_Content_Id($reference->get_id(), $reference->get_type()));
+			$entity_data                   = wl_serialize_entity($reference->get_id());
+			$entity_data['occurrences']    = array('placeholder-occurrence');
 			$json->entities->{$entity_uri} = $entity_data;
 		}
 

src/wordlift/analysis/occurrences/class-default-strategy.php

Indentation +12 added lines, -12 removed lines

@@ -11,20 +11,20 @@
 
 class Default_Strategy extends Singleton implements Occurrences {
 
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function add_occurences_to_entities( $occurrences, $json, $post_id ) {
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function add_occurences_to_entities( $occurrences, $json, $post_id ) {
 
-		foreach ( $json->entities as $id => $entity ) {
+        foreach ( $json->entities as $id => $entity ) {
 
-			$json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();
+            $json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();
 
-			foreach ( $json->entities->{$id}->occurrences as $annotation_id ) {
-				$json->entities->{$id}->annotations[ $annotation_id ] = array(
-					'id' => $annotation_id,
-				);
-			}
-		}
+            foreach ( $json->entities->{$id}->occurrences as $annotation_id ) {
+                $json->entities->{$id}->annotations[ $annotation_id ] = array(
+                    'id' => $annotation_id,
+                );
+            }
+        }
 
-		return $json;
-	}
+        return $json;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -12,14 +12,14 @@
 class Default_Strategy extends Singleton implements Occurrences {
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function add_occurences_to_entities( $occurrences, $json, $post_id ) {
+	public function add_occurences_to_entities($occurrences, $json, $post_id) {
 
-		foreach ( $json->entities as $id => $entity ) {
+		foreach ($json->entities as $id => $entity) {
 
-			$json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();
+			$json->entities->{$id}->occurrences = isset($occurrences[$id]) ? $occurrences[$id] : array();
 
-			foreach ( $json->entities->{$id}->occurrences as $annotation_id ) {
-				$json->entities->{$id}->annotations[ $annotation_id ] = array(
+			foreach ($json->entities->{$id}->occurrences as $annotation_id) {
+				$json->entities->{$id}->annotations[$annotation_id] = array(
 					'id' => $annotation_id,
 				);
 			}

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

Indentation +52 added lines, -52 removed lines

@@ -13,68 +13,68 @@
 use Wordlift_Entity_Uri_Service;
 
 class Analysis_Response_Ops_Factory {
-	/**
-	 * @var Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
+    /**
+     * @var Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
 
-	/**
-	 * @var Entity_Helper
-	 */
-	private $entity_helper;
+    /**
+     * @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 Entity_Helper               $entity_helper The {@link Entity_Helper}.
-	 *
-	 * @since 3.25.1
-	 */
-	protected function __construct( $entity_uri_service, $entity_helper ) {
+    /**
+     * Analysis_Response_Ops constructor.
+     *
+     * @param Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
+     * @param Entity_Helper               $entity_helper The {@link Entity_Helper}.
+     *
+     * @since 3.25.1
+     */
+    protected function __construct( $entity_uri_service, $entity_helper ) {
 
-		$this->entity_uri_service = $entity_uri_service;
-		$this->entity_helper      = $entity_helper;
+        $this->entity_uri_service = $entity_uri_service;
+        $this->entity_helper      = $entity_helper;
 
-	}
+    }
 
-	private static $instance;
+    private static $instance;
 
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self( Wordlift_Entity_Uri_Service::get_instance(), Entity_Helper::get_instance() );
-		}
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self( Wordlift_Entity_Uri_Service::get_instance(), Entity_Helper::get_instance() );
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public function create( $json, $post_id ) {
-		return new Analysis_Response_Ops(
-			$this->entity_uri_service,
-			$this->entity_helper,
-			$json,
-			$post_id
-		);
-	}
+    public function create( $json, $post_id ) {
+        return new Analysis_Response_Ops(
+            $this->entity_uri_service,
+            $this->entity_helper,
+            $json,
+            $post_id
+        );
+    }
 
-	/**
-	 * Create an Analysis_Response_Ops instance given the provided http response.
-	 *
-	 * @param array $response {
-	 *
-	 * @type string $body The response body.
-	 * }
-	 *
-	 * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
-	 * @throws \Exception if the provided response doesn't contain a `body` element.
-	 */
-	public function create_with_response( $response, $post_id ) {
+    /**
+     * Create an Analysis_Response_Ops instance given the provided http response.
+     *
+     * @param array $response {
+     *
+     * @type string $body The response body.
+     * }
+     *
+     * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
+     * @throws \Exception if the provided response doesn't contain a `body` element.
+     */
+    public function create_with_response( $response, $post_id ) {
 
-		if ( ! isset( $response['body'] ) ) {
-			throw new \Exception( '`body` is required in response.' );
-		}
+        if ( ! isset( $response['body'] ) ) {
+            throw new \Exception( '`body` is required in response.' );
+        }
 
-		return $this->create( json_decode( $response['body'] ), $post_id );
-	}
+        return $this->create( json_decode( $response['body'] ), $post_id );
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @since 3.25.1
 	 */
-	protected function __construct( $entity_uri_service, $entity_helper ) {
+	protected function __construct($entity_uri_service, $entity_helper) {
 
 		$this->entity_uri_service = $entity_uri_service;
 		$this->entity_helper      = $entity_helper;
@@ -41,14 +41,14 @@ 
 	private static $instance;
 
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self( Wordlift_Entity_Uri_Service::get_instance(), Entity_Helper::get_instance() );
+		if ( ! isset(self::$instance)) {
+			self::$instance = new self(Wordlift_Entity_Uri_Service::get_instance(), Entity_Helper::get_instance());
 		}
 
 		return self::$instance;
 	}
 
-	public function create( $json, $post_id ) {
+	public function create($json, $post_id) {
 		return new Analysis_Response_Ops(
 			$this->entity_uri_service,
 			$this->entity_helper,
@@ -68,13 +68,13 @@ 
 	 * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
 	 * @throws \Exception if the provided response doesn't contain a `body` element.
 	 */
-	public function create_with_response( $response, $post_id ) {
+	public function create_with_response($response, $post_id) {
 
-		if ( ! isset( $response['body'] ) ) {
-			throw new \Exception( '`body` is required in response.' );
+		if ( ! isset($response['body'])) {
+			throw new \Exception('`body` is required in response.');
 		}
 
-		return $this->create( json_decode( $response['body'] ), $post_id );
+		return $this->create(json_decode($response['body']), $post_id);
 	}
 
 }

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

Indentation +377 added lines, -377 removed lines

@@ -16,382 +16,382 @@
 
 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;
-
-	/**
-	 * @var Entity_Helper
-	 */
-	private $entity_helper;
-
-	/**
-	 * @var int $post_id
-	 */
-	private $post_id;
-
-	/**
-	 * Analysis_Response_Ops constructor.
-	 *
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
-	 * @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_helper, $json, $post_id ) {
-		$this->json               = $json;
-		$this->entity_uri_service = $entity_uri_service;
-		$this->entity_helper      = $entity_helper;
-		$this->post_id            = $post_id;
-	}
-
-	/**
-	 * 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} );
-		}
-
-		// Set the internal uri in the annotation for the entityMatch in annotations.
-		if ( isset( $this->json->annotations ) ) {
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			foreach ( $this->json->annotations as $key => $annotation ) {
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( isset( $annotation->entityMatches ) ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					foreach ( $annotation->entityMatches as $match ) {
-						// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-						if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
-							// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-							$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();
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				$annotation->annotationId = $annotation_id;
-				$annotation->start        = $start;
-				$annotation->end          = $end;
-				$annotation->text         = $text;
-
-				$entity_match             = new StdClass();
-				$entity_match->confidence = 100;
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				$entity_match->entityId = $item_id;
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				$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'];
-
-		$entity_provider_registry = Entity_Provider_Registry::get_instance();
-
-		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 = $entity_provider_registry->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 ) && isset( $this->json->entities ) ) {
-			$occurrences_processor = Occurrences_Factory::get_instance( $this->post_id );
-			$this->json            = $occurrences_processor->add_occurences_to_entities( $occurrences, $this->json, $this->post_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 ) {
-			// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			foreach ( $annotation->entityMatches as $entity_matches ) {
-
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				$entity_id         = $this->entity_uri_service->get_post_id_from_url( $entity_matches->entityId );
-				$serialized_entity = wl_serialize_entity( $entity_id );
-
-				if ( $serialized_entity ) {
-					$serialized_entity['entityId'] = $serialized_entity['id'];
-					unset( $serialized_entity['id'] );
-
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$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 ) {
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( $annotation->entityMatches[0]->entityId === $entity_id ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$entities[ $entity_id ]['occurrences'][] = $annotation->annotationId;
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$entities[ $entity_id ]['annotations'][ $annotation->annotationId ]['id'] = $annotation->annotationId;
-				}
-			}
-		}
-
-		$this->json->entities = $entities;
-
-		return $this;
-
-	}
-
-	/**
-	 * Return the JSON response.
-	 *
-	 * @return mixed The JSON response.
-	 * @since 3.24.2
-	 */
-	public function get_json() {
-
-		return $this->json;
-	}
-
-	/**
-	 * This function should be invoked after `make_entities_local` after this
-	 * method.
-	 *
-	 * @param $excluded_uris array An array of entity URIs to be excluded.
-	 *
-	 * @return $this
-	 * @since 3.32.3.1
-	 */
-	public function remove_excluded_entities( $excluded_uris ) {
-
-		// If we didnt receive array, return early.
-		if ( ! is_array( $excluded_uris ) ) {
-			return $this;
-		}
-
-		// We may also receive an array of null, make sure to filter uris when receiving.
-		$excluded_uris = array_filter( $excluded_uris, 'is_string' );
-
-		$this->remove_entities_with_excluded_uris( $excluded_uris );
-
-		$this->remove_annotations_with_excluded_uris( $excluded_uris );
-
-		return $this;
-	}
-
-	/**
-	 * 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 );
-	}
-
-	/**
-	 * Remove all the entities with the excluded URIs.
-	 *
-	 * @param array $excluded_uris The array of URIs to be excluded.
-	 */
-	private function remove_entities_with_excluded_uris( array $excluded_uris ) {
-		// Remove the excluded entity uris.
-		if ( isset( $this->json->entities ) ) {
-			foreach ( $excluded_uris as $excluded_uri ) {
-
-				if ( isset( $this->json->entities->{$excluded_uri} ) ) {
-					// Remove this entity.
-					unset( $this->json->entities->{$excluded_uri} );
-					// Also remove the annotations.
-				}
-			}
-		}
-	}
-
-	/**
-	 * Remove all the annotations with the excluded entity URIs.
-	 *
-	 * @param array $excluded_uris The array of URIs to be excluded.
-	 *
-	 * @return void
-	 */
-	private function remove_annotations_with_excluded_uris( array $excluded_uris ) {
-		if ( isset( $this->json->annotations ) ) {
-			foreach ( $this->json->annotations as $annotation_key => &$annotation_data ) {
-
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( ! isset( $annotation_data->entityMatches ) ) {
-					continue;
-				}
-
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				foreach ( $annotation_data->entityMatches as $entity_match_key => $entity_match_data ) {
-
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$entity_uri = $entity_match_data->entityId;
-
-					if ( ! in_array( $entity_uri, $excluded_uris, true ) ) {
-						continue;
-					}
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					unset( $annotation_data->entityMatches[ $entity_match_key ] );
-				}
-
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( count( $annotation_data->entityMatches ) === 0 ) {
-					// Remove the annotation if we have zero empty annotation matches.
-					unset( $this->json->annotations->{$annotation_key} );
-				}
-			}
-		}
-
-	}
+    /**
+     * 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;
+
+    /**
+     * @var Entity_Helper
+     */
+    private $entity_helper;
+
+    /**
+     * @var int $post_id
+     */
+    private $post_id;
+
+    /**
+     * Analysis_Response_Ops constructor.
+     *
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
+     * @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_helper, $json, $post_id ) {
+        $this->json               = $json;
+        $this->entity_uri_service = $entity_uri_service;
+        $this->entity_helper      = $entity_helper;
+        $this->post_id            = $post_id;
+    }
+
+    /**
+     * 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} );
+        }
+
+        // Set the internal uri in the annotation for the entityMatch in annotations.
+        if ( isset( $this->json->annotations ) ) {
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+            foreach ( $this->json->annotations as $key => $annotation ) {
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                if ( isset( $annotation->entityMatches ) ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    foreach ( $annotation->entityMatches as $match ) {
+                        // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                        if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
+                            // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                            $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();
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                $annotation->annotationId = $annotation_id;
+                $annotation->start        = $start;
+                $annotation->end          = $end;
+                $annotation->text         = $text;
+
+                $entity_match             = new StdClass();
+                $entity_match->confidence = 100;
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                $entity_match->entityId = $item_id;
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                $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'];
+
+        $entity_provider_registry = Entity_Provider_Registry::get_instance();
+
+        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 = $entity_provider_registry->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 ) && isset( $this->json->entities ) ) {
+            $occurrences_processor = Occurrences_Factory::get_instance( $this->post_id );
+            $this->json            = $occurrences_processor->add_occurences_to_entities( $occurrences, $this->json, $this->post_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 ) {
+            // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+            foreach ( $annotation->entityMatches as $entity_matches ) {
+
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                $entity_id         = $this->entity_uri_service->get_post_id_from_url( $entity_matches->entityId );
+                $serialized_entity = wl_serialize_entity( $entity_id );
+
+                if ( $serialized_entity ) {
+                    $serialized_entity['entityId'] = $serialized_entity['id'];
+                    unset( $serialized_entity['id'] );
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    $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 ) {
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                if ( $annotation->entityMatches[0]->entityId === $entity_id ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    $entities[ $entity_id ]['occurrences'][] = $annotation->annotationId;
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    $entities[ $entity_id ]['annotations'][ $annotation->annotationId ]['id'] = $annotation->annotationId;
+                }
+            }
+        }
+
+        $this->json->entities = $entities;
+
+        return $this;
+
+    }
+
+    /**
+     * Return the JSON response.
+     *
+     * @return mixed The JSON response.
+     * @since 3.24.2
+     */
+    public function get_json() {
+
+        return $this->json;
+    }
+
+    /**
+     * This function should be invoked after `make_entities_local` after this
+     * method.
+     *
+     * @param $excluded_uris array An array of entity URIs to be excluded.
+     *
+     * @return $this
+     * @since 3.32.3.1
+     */
+    public function remove_excluded_entities( $excluded_uris ) {
+
+        // If we didnt receive array, return early.
+        if ( ! is_array( $excluded_uris ) ) {
+            return $this;
+        }
+
+        // We may also receive an array of null, make sure to filter uris when receiving.
+        $excluded_uris = array_filter( $excluded_uris, 'is_string' );
+
+        $this->remove_entities_with_excluded_uris( $excluded_uris );
+
+        $this->remove_annotations_with_excluded_uris( $excluded_uris );
+
+        return $this;
+    }
+
+    /**
+     * 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 );
+    }
+
+    /**
+     * Remove all the entities with the excluded URIs.
+     *
+     * @param array $excluded_uris The array of URIs to be excluded.
+     */
+    private function remove_entities_with_excluded_uris( array $excluded_uris ) {
+        // Remove the excluded entity uris.
+        if ( isset( $this->json->entities ) ) {
+            foreach ( $excluded_uris as $excluded_uri ) {
+
+                if ( isset( $this->json->entities->{$excluded_uri} ) ) {
+                    // Remove this entity.
+                    unset( $this->json->entities->{$excluded_uri} );
+                    // Also remove the annotations.
+                }
+            }
+        }
+    }
+
+    /**
+     * Remove all the annotations with the excluded entity URIs.
+     *
+     * @param array $excluded_uris The array of URIs to be excluded.
+     *
+     * @return void
+     */
+    private function remove_annotations_with_excluded_uris( array $excluded_uris ) {
+        if ( isset( $this->json->annotations ) ) {
+            foreach ( $this->json->annotations as $annotation_key => &$annotation_data ) {
+
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                if ( ! isset( $annotation_data->entityMatches ) ) {
+                    continue;
+                }
+
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                foreach ( $annotation_data->entityMatches as $entity_match_key => $entity_match_data ) {
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    $entity_uri = $entity_match_data->entityId;
+
+                    if ( ! in_array( $entity_uri, $excluded_uris, true ) ) {
+                        continue;
+                    }
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    unset( $annotation_data->entityMatches[ $entity_match_key ] );
+                }
+
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                if ( count( $annotation_data->entityMatches ) === 0 ) {
+                    // Remove the annotation if we have zero empty annotation matches.
+                    unset( $this->json->annotations->{$annotation_key} );
+                }
+            }
+        }
+
+    }
 
 }

Spacing +72 added lines, -72 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @since 3.21.5
 	 */
-	public function __construct( $entity_uri_service, $entity_helper, $json, $post_id ) {
+	public function __construct($entity_uri_service, $entity_helper, $json, $post_id) {
 		$this->json               = $json;
 		$this->entity_uri_service = $entity_uri_service;
 		$this->entity_helper      = $entity_helper;
@@ -73,24 +73,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();
 			}
 
@@ -98,21 +98,21 @@ 
 			$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} );
 		}
 
 		// Set the internal uri in the annotation for the entityMatch in annotations.
-		if ( isset( $this->json->annotations ) ) {
+		if (isset($this->json->annotations)) {
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			foreach ( $this->json->annotations as $key => $annotation ) {
+			foreach ($this->json->annotations as $key => $annotation) {
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( isset( $annotation->entityMatches ) ) {
+				if (isset($annotation->entityMatches)) {
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					foreach ( $annotation->entityMatches as $match ) {
+					foreach ($annotation->entityMatches as $match) {
 						// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-						if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
+						if (isset($match->entityId) && isset($mappings[$match->entityId])) {
 							// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-							$match->entityId = $mappings[ $match->entityId ];
+							$match->entityId = $mappings[$match->entityId];
 						}
 					}
 				}
@@ -134,34 +134,34 @@ 
 	 *
 	 * @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] ) ) {
+			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();
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
@@ -177,8 +177,8 @@ 
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 				$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;
 			},
@@ -193,14 +193,14 @@ 
 
 		$entity_provider_registry = Entity_Provider_Registry::get_instance();
 
-		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 = $entity_provider_registry->get_local_entity( $item_id );
+			if ( ! is_bool($this->json) && ! isset($this->json->entities->{$item_id} )) {
+				$entity = $entity_provider_registry->get_local_entity($item_id);
 
 				// Entity not found in the local vocabulary, continue to the next one.
-				if ( false === $entity ) {
+				if (false === $entity) {
 					continue;
 				}
 
@@ -218,16 +218,16 @@ 
 		// function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
 		// `embedAnalysis`.
 
-		if ( ! is_bool( $this->json ) && isset( $this->json->entities ) ) {
-			$occurrences_processor = Occurrences_Factory::get_instance( $this->post_id );
-			$this->json            = $occurrences_processor->add_occurences_to_entities( $occurrences, $this->json, $this->post_id );
+		if ( ! is_bool($this->json) && isset($this->json->entities)) {
+			$occurrences_processor = Occurrences_Factory::get_instance($this->post_id);
+			$this->json            = $occurrences_processor->add_occurences_to_entities($occurrences, $this->json, $this->post_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 ) {
+		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;
 			}
 		}
@@ -248,33 +248,33 @@ 
 
 		// Populating the local entities object
 		$entities = array();
-		foreach ( $this->json->annotations as $annotation ) {
+		foreach ($this->json->annotations as $annotation) {
 			// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			foreach ( $annotation->entityMatches as $entity_matches ) {
+			foreach ($annotation->entityMatches as $entity_matches) {
 
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				$entity_id         = $this->entity_uri_service->get_post_id_from_url( $entity_matches->entityId );
-				$serialized_entity = wl_serialize_entity( $entity_id );
+				$entity_id         = $this->entity_uri_service->get_post_id_from_url($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']);
 
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$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 ) {
+		foreach ($entities as $entity_id => $entity) {
+			foreach ($this->json->annotations as $annotation) {
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( $annotation->entityMatches[0]->entityId === $entity_id ) {
+				if ($annotation->entityMatches[0]->entityId === $entity_id) {
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$entities[ $entity_id ]['occurrences'][] = $annotation->annotationId;
+					$entities[$entity_id]['occurrences'][] = $annotation->annotationId;
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$entities[ $entity_id ]['annotations'][ $annotation->annotationId ]['id'] = $annotation->annotationId;
+					$entities[$entity_id]['annotations'][$annotation->annotationId]['id'] = $annotation->annotationId;
 				}
 			}
 		}
@@ -305,19 +305,19 @@ 
 	 * @return $this
 	 * @since 3.32.3.1
 	 */
-	public function remove_excluded_entities( $excluded_uris ) {
+	public function remove_excluded_entities($excluded_uris) {
 
 		// If we didnt receive array, return early.
-		if ( ! is_array( $excluded_uris ) ) {
+		if ( ! is_array($excluded_uris)) {
 			return $this;
 		}
 
 		// We may also receive an array of null, make sure to filter uris when receiving.
-		$excluded_uris = array_filter( $excluded_uris, 'is_string' );
+		$excluded_uris = array_filter($excluded_uris, 'is_string');
 
-		$this->remove_entities_with_excluded_uris( $excluded_uris );
+		$this->remove_entities_with_excluded_uris($excluded_uris);
 
-		$this->remove_annotations_with_excluded_uris( $excluded_uris );
+		$this->remove_annotations_with_excluded_uris($excluded_uris);
 
 		return $this;
 	}
@@ -330,10 +330,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);
 	}
 
 	/**
@@ -341,14 +341,14 @@ 
 	 *
 	 * @param array $excluded_uris The array of URIs to be excluded.
 	 */
-	private function remove_entities_with_excluded_uris( array $excluded_uris ) {
+	private function remove_entities_with_excluded_uris(array $excluded_uris) {
 		// Remove the excluded entity uris.
-		if ( isset( $this->json->entities ) ) {
-			foreach ( $excluded_uris as $excluded_uri ) {
+		if (isset($this->json->entities)) {
+			foreach ($excluded_uris as $excluded_uri) {
 
-				if ( isset( $this->json->entities->{$excluded_uri} ) ) {
+				if (isset($this->json->entities->{$excluded_uri} )) {
 					// Remove this entity.
-					unset( $this->json->entities->{$excluded_uri} );
+					unset($this->json->entities->{$excluded_uri} );
 					// Also remove the annotations.
 				}
 			}
@@ -362,32 +362,32 @@ 
 	 *
 	 * @return void
 	 */
-	private function remove_annotations_with_excluded_uris( array $excluded_uris ) {
-		if ( isset( $this->json->annotations ) ) {
-			foreach ( $this->json->annotations as $annotation_key => &$annotation_data ) {
+	private function remove_annotations_with_excluded_uris(array $excluded_uris) {
+		if (isset($this->json->annotations)) {
+			foreach ($this->json->annotations as $annotation_key => &$annotation_data) {
 
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( ! isset( $annotation_data->entityMatches ) ) {
+				if ( ! isset($annotation_data->entityMatches)) {
 					continue;
 				}
 
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				foreach ( $annotation_data->entityMatches as $entity_match_key => $entity_match_data ) {
+				foreach ($annotation_data->entityMatches as $entity_match_key => $entity_match_data) {
 
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 					$entity_uri = $entity_match_data->entityId;
 
-					if ( ! in_array( $entity_uri, $excluded_uris, true ) ) {
+					if ( ! in_array($entity_uri, $excluded_uris, true)) {
 						continue;
 					}
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					unset( $annotation_data->entityMatches[ $entity_match_key ] );
+					unset($annotation_data->entityMatches[$entity_match_key]);
 				}
 
 				// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				if ( count( $annotation_data->entityMatches ) === 0 ) {
+				if (count($annotation_data->entityMatches) === 0) {
 					// Remove the annotation if we have zero empty annotation matches.
-					unset( $this->json->annotations->{$annotation_key} );
+					unset($this->json->annotations->{$annotation_key} );
 				}
 			}
 		}

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

Indentation +131 added lines, -131 removed lines

@@ -4,136 +4,136 @@
 
 class Analysis_Background_Service {
 
-	const ANALYSIS_DONE_FLAG        = '_wl_cmkg_analysis_complete_for_term_options_cache';
-	const TERMS_COUNT_TRANSIENT     = '_wl_cmkg_analysis_background_service_terms_count';
-	const ENTITIES_PRESENT_FOR_TERM = '_wl_cmkg_analysis_entities_present_for_term_options_cache';
-
-	/**
-	 * @var Analysis_Service
-	 */
-	private $analysis_service;
-	/**
-	 * @var Analysis_Background_Process
-	 */
-	private $analysis_background_process;
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	public function __construct( $analysis_service ) {
-
-		$this->analysis_service = $analysis_service;
-
-		$this->analysis_background_process = new Analysis_Background_Process( $this );
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-	}
-
-	public function start() {
-		$this->analysis_background_process->start();
-	}
-
-	public function cancel() {
-		$this->analysis_background_process->cancel();
-	}
-
-	public function stop() {
-		$this->analysis_background_process->cancel();
-		$this->analysis_background_process->request_cancel();
-	}
-
-	/**
-	 * A list of term ids.
-	 *
-	 * @return int|\WP_Error|\WP_Term[]
-	 */
-	public function next() {
-
-		return Terms_Compat::get_terms(
-			Terms_Compat::get_public_taxonomies(),
-			array(
-				'fields'                             => 'ids',
-				'hide_empty'                         => false,
-				'number'                             => $this->get_batch_size(),
-				// 'offset'     => $state->index,
-										'meta_query' => array(
-											array(
-												'key'     => self::ANALYSIS_DONE_FLAG,
-												'compare' => 'NOT EXISTS',
-											),
-										),
-			)
-		);
-	}
-
-	public function count() {
-
-		$count = count(
-			Terms_Compat::get_terms(
-				Terms_Compat::get_public_taxonomies(),
-				array(
-					'fields'     => 'ids',
-					'hide_empty' => false,
-					// return all terms, we cant pass -1 here.
-					'number'     => 0,
-					'meta_query' => array(
-						array(
-							'key'     => self::ANALYSIS_DONE_FLAG,
-							'compare' => 'NOT EXISTS',
-						),
-					),
-				)
-			)
-		);
-
-		$this->log->debug( "Count returned as $count" );
-
-		return $count;
-	}
-
-	public function get_batch_size() {
-		return 10;
-	}
-
-	public function info() {
-		return Analysis_Background_Process::get_state();
-	}
-
-	/**
-	 * @param $term_ids
-	 *
-	 * @return bool
-	 */
-	public function perform_analysis_for_terms( $term_ids ) {
-
-		foreach ( $term_ids as $term_id ) {
-
-			$tag = get_term( $term_id );
-
-			// This adds the entities to ttl cache
-			$result = $this->analysis_service->get_entities( $tag );
-
-			// then set the analysis complete flag.
-			update_term_meta( $term_id, self::ANALYSIS_DONE_FLAG, 1 );
-
-			if ( false !== $result ) {
-				if ( count( $result ) > 0 ) {
-					update_term_meta( $term_id, self::ENTITIES_PRESENT_FOR_TERM, 1 );
-				}
-			}
-		}
-
-		/**
-		 * This action fires when the analysis is complete for the current batch
-		 *
-		 * @since 3.30.0
-		 */
-		do_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch' );
-
-		return true;
-
-	}
+    const ANALYSIS_DONE_FLAG        = '_wl_cmkg_analysis_complete_for_term_options_cache';
+    const TERMS_COUNT_TRANSIENT     = '_wl_cmkg_analysis_background_service_terms_count';
+    const ENTITIES_PRESENT_FOR_TERM = '_wl_cmkg_analysis_entities_present_for_term_options_cache';
+
+    /**
+     * @var Analysis_Service
+     */
+    private $analysis_service;
+    /**
+     * @var Analysis_Background_Process
+     */
+    private $analysis_background_process;
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    public function __construct( $analysis_service ) {
+
+        $this->analysis_service = $analysis_service;
+
+        $this->analysis_background_process = new Analysis_Background_Process( $this );
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+    }
+
+    public function start() {
+        $this->analysis_background_process->start();
+    }
+
+    public function cancel() {
+        $this->analysis_background_process->cancel();
+    }
+
+    public function stop() {
+        $this->analysis_background_process->cancel();
+        $this->analysis_background_process->request_cancel();
+    }
+
+    /**
+     * A list of term ids.
+     *
+     * @return int|\WP_Error|\WP_Term[]
+     */
+    public function next() {
+
+        return Terms_Compat::get_terms(
+            Terms_Compat::get_public_taxonomies(),
+            array(
+                'fields'                             => 'ids',
+                'hide_empty'                         => false,
+                'number'                             => $this->get_batch_size(),
+                // 'offset'     => $state->index,
+                                        'meta_query' => array(
+                                            array(
+                                                'key'     => self::ANALYSIS_DONE_FLAG,
+                                                'compare' => 'NOT EXISTS',
+                                            ),
+                                        ),
+            )
+        );
+    }
+
+    public function count() {
+
+        $count = count(
+            Terms_Compat::get_terms(
+                Terms_Compat::get_public_taxonomies(),
+                array(
+                    'fields'     => 'ids',
+                    'hide_empty' => false,
+                    // return all terms, we cant pass -1 here.
+                    'number'     => 0,
+                    'meta_query' => array(
+                        array(
+                            'key'     => self::ANALYSIS_DONE_FLAG,
+                            'compare' => 'NOT EXISTS',
+                        ),
+                    ),
+                )
+            )
+        );
+
+        $this->log->debug( "Count returned as $count" );
+
+        return $count;
+    }
+
+    public function get_batch_size() {
+        return 10;
+    }
+
+    public function info() {
+        return Analysis_Background_Process::get_state();
+    }
+
+    /**
+     * @param $term_ids
+     *
+     * @return bool
+     */
+    public function perform_analysis_for_terms( $term_ids ) {
+
+        foreach ( $term_ids as $term_id ) {
+
+            $tag = get_term( $term_id );
+
+            // This adds the entities to ttl cache
+            $result = $this->analysis_service->get_entities( $tag );
+
+            // then set the analysis complete flag.
+            update_term_meta( $term_id, self::ANALYSIS_DONE_FLAG, 1 );
+
+            if ( false !== $result ) {
+                if ( count( $result ) > 0 ) {
+                    update_term_meta( $term_id, self::ENTITIES_PRESENT_FOR_TERM, 1 );
+                }
+            }
+        }
+
+        /**
+         * This action fires when the analysis is complete for the current batch
+         *
+         * @since 3.30.0
+         */
+        do_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch' );
+
+        return true;
+
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -22,13 +22,13 @@ 
 	 */
 	private $log;
 
-	public function __construct( $analysis_service ) {
+	public function __construct($analysis_service) {
 
 		$this->analysis_service = $analysis_service;
 
-		$this->analysis_background_process = new Analysis_Background_Process( $this );
+		$this->analysis_background_process = new Analysis_Background_Process($this);
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 	}
 
 	public function start() {
@@ -88,7 +88,7 @@ 
 			)
 		);
 
-		$this->log->debug( "Count returned as $count" );
+		$this->log->debug("Count returned as $count");
 
 		return $count;
 	}
@@ -106,21 +106,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function perform_analysis_for_terms( $term_ids ) {
+	public function perform_analysis_for_terms($term_ids) {
 
-		foreach ( $term_ids as $term_id ) {
+		foreach ($term_ids as $term_id) {
 
-			$tag = get_term( $term_id );
+			$tag = get_term($term_id);
 
 			// This adds the entities to ttl cache
-			$result = $this->analysis_service->get_entities( $tag );
+			$result = $this->analysis_service->get_entities($tag);
 
 			// then set the analysis complete flag.
-			update_term_meta( $term_id, self::ANALYSIS_DONE_FLAG, 1 );
+			update_term_meta($term_id, self::ANALYSIS_DONE_FLAG, 1);
 
-			if ( false !== $result ) {
-				if ( count( $result ) > 0 ) {
-					update_term_meta( $term_id, self::ENTITIES_PRESENT_FOR_TERM, 1 );
+			if (false !== $result) {
+				if (count($result) > 0) {
+					update_term_meta($term_id, self::ENTITIES_PRESENT_FOR_TERM, 1);
 				}
 			}
 		}
@@ -130,7 +130,7 @@ 
 		 *
 		 * @since 3.30.0
 		 */
-		do_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch' );
+		do_action('wordlift_vocabulary_analysis_complete_for_terms_batch');
 
 		return true;
 

src/wordlift/vocabulary/menu/badge/class-badge-generator.php

Indentation +33 added lines, -33 removed lines

@@ -10,38 +10,38 @@
  */
 class Badge_Generator {
 
-	/**
-	 * Returns the term count which needs to be shown on ui.
-	 *
-	 * @param $number
-	 *
-	 * @return int
-	 */
-	public static function get_ui_count( $number ) {
-
-		$number = (int) $number;
-
-		if ( $number < 100 ) {
-			return $number;
-		}
-
-		return 100;
-	}
-
-	public static function generate_html( $number ) {
-		$count_string = self::get_formatted_count_string( $number );
-		return "<span class=\"wl-admin-menu-badge\">$count_string</span>";
-	}
-
-	/**
-	 * @param $number
-	 *
-	 * @return string
-	 */
-	public static function get_formatted_count_string( $number ) {
-		$round = self::get_ui_count( $number );
-
-		return $round < 100 ? "$round" : "$round+";
-	}
+    /**
+     * Returns the term count which needs to be shown on ui.
+     *
+     * @param $number
+     *
+     * @return int
+     */
+    public static function get_ui_count( $number ) {
+
+        $number = (int) $number;
+
+        if ( $number < 100 ) {
+            return $number;
+        }
+
+        return 100;
+    }
+
+    public static function generate_html( $number ) {
+        $count_string = self::get_formatted_count_string( $number );
+        return "<span class=\"wl-admin-menu-badge\">$count_string</span>";
+    }
+
+    /**
+     * @param $number
+     *
+     * @return string
+     */
+    public static function get_formatted_count_string( $number ) {
+        $round = self::get_ui_count( $number );
+
+        return $round < 100 ? "$round" : "$round+";
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -17,19 +17,19 @@ 
 	 *
 	 * @return int
 	 */
-	public static function get_ui_count( $number ) {
+	public static function get_ui_count($number) {
 
 		$number = (int) $number;
 
-		if ( $number < 100 ) {
+		if ($number < 100) {
 			return $number;
 		}
 
 		return 100;
 	}
 
-	public static function generate_html( $number ) {
-		$count_string = self::get_formatted_count_string( $number );
+	public static function generate_html($number) {
+		$count_string = self::get_formatted_count_string($number);
 		return "<span class=\"wl-admin-menu-badge\">$count_string</span>";
 	}
 
@@ -38,8 +38,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_formatted_count_string( $number ) {
-		$round = self::get_ui_count( $number );
+	public static function get_formatted_count_string($number) {
+		$round = self::get_ui_count($number);
 
 		return $round < 100 ? "$round" : "$round+";
 	}

src/wordlift/vocabulary/pages/class-match-terms.php

Indentation +42 added lines, -42 removed lines

@@ -12,54 +12,54 @@
  * @author Naveen Muthusamy <naveen@wordlift.io>
  */
 class Match_Terms {
-	/**
-	 * @var Term_Count
-	 */
-	private $term_count;
+    /**
+     * @var Term_Count
+     */
+    private $term_count;
 
-	/**
-	 * Match_Terms constructor.
-	 *
-	 * @param $term_count Term_Count
-	 */
-	public function __construct( $term_count ) {
+    /**
+     * Match_Terms constructor.
+     *
+     * @param $term_count Term_Count
+     */
+    public function __construct( $term_count ) {
 
-		$this->term_count = $term_count;
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+        $this->term_count = $term_count;
+        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
 
-	}
+    }
 
-	public function admin_menu() {
-		$number = $this->term_count->get_term_count();
-		add_submenu_page(
-			'wl_admin_menu',
-			__( 'Match Terms', 'wordlift' ),
-			__( 'Match Terms', 'wordlift' ) . ' ' . Badge_Generator::generate_html( $number ),
-			'manage_options',
-			'wl-vocabulary-match-terms',
-			array( $this, 'submenu_page_callback' )
-		);
-		remove_submenu_page( 'wl_admin_menu', 'wl_admin_menu' );
-	}
+    public function admin_menu() {
+        $number = $this->term_count->get_term_count();
+        add_submenu_page(
+            'wl_admin_menu',
+            __( 'Match Terms', 'wordlift' ),
+            __( 'Match Terms', 'wordlift' ) . ' ' . Badge_Generator::generate_html( $number ),
+            'manage_options',
+            'wl-vocabulary-match-terms',
+            array( $this, 'submenu_page_callback' )
+        );
+        remove_submenu_page( 'wl_admin_menu', 'wl_admin_menu' );
+    }
 
-	public function submenu_page_callback() {
+    public function submenu_page_callback() {
 
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-vocabulary-reconcile-script',
-			plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary',
-			array( 'react', 'react-dom', 'wp-i18n', 'wp-polyfill' ),
-			true
-		);
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-vocabulary-reconcile-script',
+            plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary',
+            array( 'react', 'react-dom', 'wp-i18n', 'wp-polyfill' ),
+            true
+        );
 
-		wp_enqueue_style(
-			'wl-vocabulary-reconcile-script',
-			plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary.full.css',
-			array(),
-			WORDLIFT_VERSION
-		);
-		wp_localize_script( 'wl-vocabulary-reconcile-script', '_wlVocabularyMatchTermsConfig', Api_Config::get_api_config() );
-		echo "<div id='wl_cmkg_reconcile_progress' class='wrap'></div>";
-		echo "<div id='wl_cmkg_table' class='wrap'></div>";
-	}
+        wp_enqueue_style(
+            'wl-vocabulary-reconcile-script',
+            plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary.full.css',
+            array(),
+            WORDLIFT_VERSION
+        );
+        wp_localize_script( 'wl-vocabulary-reconcile-script', '_wlVocabularyMatchTermsConfig', Api_Config::get_api_config() );
+        echo "<div id='wl_cmkg_reconcile_progress' class='wrap'></div>";
+        echo "<div id='wl_cmkg_table' class='wrap'></div>";
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -22,10 +22,10 @@ 
 	 *
 	 * @param $term_count Term_Count
 	 */
-	public function __construct( $term_count ) {
+	public function __construct($term_count) {
 
 		$this->term_count = $term_count;
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
 
 	}
 
@@ -33,31 +33,31 @@ 
 		$number = $this->term_count->get_term_count();
 		add_submenu_page(
 			'wl_admin_menu',
-			__( 'Match Terms', 'wordlift' ),
-			__( 'Match Terms', 'wordlift' ) . ' ' . Badge_Generator::generate_html( $number ),
+			__('Match Terms', 'wordlift'),
+			__('Match Terms', 'wordlift').' '.Badge_Generator::generate_html($number),
 			'manage_options',
 			'wl-vocabulary-match-terms',
-			array( $this, 'submenu_page_callback' )
+			array($this, 'submenu_page_callback')
 		);
-		remove_submenu_page( 'wl_admin_menu', 'wl_admin_menu' );
+		remove_submenu_page('wl_admin_menu', 'wl_admin_menu');
 	}
 
 	public function submenu_page_callback() {
 
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			'wl-vocabulary-reconcile-script',
-			plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary',
-			array( 'react', 'react-dom', 'wp-i18n', 'wp-polyfill' ),
+			plugin_dir_url(dirname(dirname(__DIR__))).'js/dist/vocabulary',
+			array('react', 'react-dom', 'wp-i18n', 'wp-polyfill'),
 			true
 		);
 
 		wp_enqueue_style(
 			'wl-vocabulary-reconcile-script',
-			plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary.full.css',
+			plugin_dir_url(dirname(dirname(__DIR__))).'js/dist/vocabulary.full.css',
 			array(),
 			WORDLIFT_VERSION
 		);
-		wp_localize_script( 'wl-vocabulary-reconcile-script', '_wlVocabularyMatchTermsConfig', Api_Config::get_api_config() );
+		wp_localize_script('wl-vocabulary-reconcile-script', '_wlVocabularyMatchTermsConfig', Api_Config::get_api_config());
 		echo "<div id='wl_cmkg_reconcile_progress' class='wrap'></div>";
 		echo "<div id='wl_cmkg_table' class='wrap'></div>";
 	}

src/wordlift/vocabulary/data/term-data/class-term-data-factory.php

Indentation +19 added lines, -19 removed lines

@@ -4,26 +4,26 @@
 use Wordlift\Vocabulary\Analysis_Service;
 
 class Term_Data_Factory {
-	/**
-	 * @var Analysis_Service
-	 */
-	private $analysis_service;
+    /**
+     * @var Analysis_Service
+     */
+    private $analysis_service;
 
-	/**
-	 * @var Analysis_Service
-	 */
-	public function __construct( $analysis_service ) {
-		$this->analysis_service = $analysis_service;
-	}
+    /**
+     * @var Analysis_Service
+     */
+    public function __construct( $analysis_service ) {
+        $this->analysis_service = $analysis_service;
+    }
 
-	/**
-	 * @param $term \WP_Term
-	 *
-	 * @return Term_Data
-	 */
-	public function get_term_data( $term ) {
-		$entities = $this->analysis_service->get_entities( $term );
-		return new Default_Term_Data( $term, $entities );
-	}
+    /**
+     * @param $term \WP_Term
+     *
+     * @return Term_Data
+     */
+    public function get_term_data( $term ) {
+        $entities = $this->analysis_service->get_entities( $term );
+        return new Default_Term_Data( $term, $entities );
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 	/**
 	 * @var Analysis_Service
 	 */
-	public function __construct( $analysis_service ) {
+	public function __construct($analysis_service) {
 		$this->analysis_service = $analysis_service;
 	}
 
@@ -21,9 +21,9 @@ 
 	 *
 	 * @return Term_Data
 	 */
-	public function get_term_data( $term ) {
-		$entities = $this->analysis_service->get_entities( $term );
-		return new Default_Term_Data( $term, $entities );
+	public function get_term_data($term) {
+		$entities = $this->analysis_service->get_entities($term);
+		return new Default_Term_Data($term, $entities);
 	}
 
 }

src/wordlift/vocabulary/data/term-data/class-term-data.php

Indentation +6 added lines, -6 removed lines

@@ -8,11 +8,11 @@
 
 interface Term_Data {
 
-	/**
-	 * Should return an array which can be used by ui components.
-	 *
-	 * @return array
-	 */
-	public function get_data();
+    /**
+     * Should return an array which can be used by ui components.
+     *
+     * @return array
+     */
+    public function get_data();
 
 }