insideout10 / wordlift-plugin

src/modules/analyzer/wordlift_analyzer.php

Indentation +75 added lines, -75 removed lines

@@ -11,17 +11,17 @@ 
  * @since 3.27.6
  */
 function wl_ajax_analyze_disabled_action() {
-	// adding the below header for debugging purpose.
-	if ( ! headers_sent() ) {
-		header( 'X-WordLift-Analysis: OFF' );
-	}
-	wp_send_json_success(
-		array(
-			'entities'    => array(),
-			'annotations' => array(),
-			'topics'      => array(),
-		)
-	);
+    // adding the below header for debugging purpose.
+    if ( ! headers_sent() ) {
+        header( 'X-WordLift-Analysis: OFF' );
+    }
+    wp_send_json_success(
+        array(
+            'entities'    => array(),
+            'annotations' => array(),
+            'topics'      => array(),
+        )
+    );
 }
 
 /**
@@ -35,13 +35,13 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+    check_admin_referer( 'wl_analyze' );
 
-	// If you use `filter_input` here, `Ajax_Content_Analysis_Test` would fail because `filter_input` doesn't use
-	// `$_POST`.
-	$data = $_POST['data'];
+    // If you use `filter_input` here, `Ajax_Content_Analysis_Test` would fail because `filter_input` doesn't use
+    // `$_POST`.
+    $data = $_POST['data'];
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
+    wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
 
 }
 
@@ -63,74 +63,74 @@ 
  */
 function wl_analyze_content( $data, $content_type ) {
 
-	$default_response = json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' );
-	$request_body     = json_decode( $data, true );
-	$post_id = isset( $_REQUEST['postId'] ) ? intval( $_REQUEST['postId'] ) : 0;
-	if ( $request_body === null ) {
-		/**
-		 * @since 3.27.7
-		 *
-		 * Conditionally try using stripslashes as $_POST['data'] could be escaped
-		 */
-		$request_body = json_decode( stripslashes( $data ), true );
-	}
-	$request_body['contentLanguage'] = Wordlift_Configuration_Service::get_instance()->get_language_code();
-	$excluded_uris                   = array_key_exists( 'exclude', $request_body ) ? (array) $request_body['exclude'] : array();
-	$data                            = wp_json_encode( $request_body );
-
-	// If dataset is not enabled, return a locally prepared response without analysis API.
-	if ( ! apply_filters( 'wl_features__enable__dataset', true ) ) {
-
-		return Analysis_Response_Ops_Factory::get_instance()
-											->create( $default_response, $post_id )
-											->make_entities_local()
-											->add_occurrences( $request_body['content'] )
-											->add_local_entities()
-											->get_json();
-	}
-
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
-
-
-	$json    = Analysis_Service_Factory::get_instance( $post_id )
-								->get_analysis_response( $data, $content_type, $post_id );
-
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
-
-	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
-		return Analysis_Response_Ops_Factory::get_instance()
-											->create( $default_response, $post_id )
-											->make_entities_local()
-											->add_occurrences( $request_body['content'] )
-											->get_json();
-	}
-
-	/*
+    $default_response = json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' );
+    $request_body     = json_decode( $data, true );
+    $post_id = isset( $_REQUEST['postId'] ) ? intval( $_REQUEST['postId'] ) : 0;
+    if ( $request_body === null ) {
+        /**
+         * @since 3.27.7
+         *
+         * Conditionally try using stripslashes as $_POST['data'] could be escaped
+         */
+        $request_body = json_decode( stripslashes( $data ), true );
+    }
+    $request_body['contentLanguage'] = Wordlift_Configuration_Service::get_instance()->get_language_code();
+    $excluded_uris                   = array_key_exists( 'exclude', $request_body ) ? (array) $request_body['exclude'] : array();
+    $data                            = wp_json_encode( $request_body );
+
+    // If dataset is not enabled, return a locally prepared response without analysis API.
+    if ( ! apply_filters( 'wl_features__enable__dataset', true ) ) {
+
+        return Analysis_Response_Ops_Factory::get_instance()
+                                            ->create( $default_response, $post_id )
+                                            ->make_entities_local()
+                                            ->add_occurrences( $request_body['content'] )
+                                            ->add_local_entities()
+                                            ->get_json();
+    }
+
+    add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+
+
+    $json    = Analysis_Service_Factory::get_instance( $post_id )
+                                ->get_analysis_response( $data, $content_type, $post_id );
+
+    remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+
+    // If it's an error log it.
+    if ( is_wp_error( $json ) ) {
+        return Analysis_Response_Ops_Factory::get_instance()
+                                            ->create( $default_response, $post_id )
+                                            ->make_entities_local()
+                                            ->add_occurrences( $request_body['content'] )
+                                            ->get_json();
+    }
+
+    /*
 	 * We pass the response to the Analysis_Response_Ops to ensure that we make remote entities local.
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/944
 	 * @since 3.21.5
 	 */
 
-	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
-	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
-		$request_content = $request_body['content'];
-	} else {
-		$request_content = $data;
-	}
-
-	return Analysis_Response_Ops_Factory::get_instance()
-										->create( $json, $post_id )
-										->make_entities_local()
-										->remove_excluded_entities( $excluded_uris )
-										->add_occurrences( $request_content )
-										->get_json();
+    // Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
+    // the occurrences for the local entities.
+    if ( 0 === strpos( $content_type, 'application/json' ) ) {
+        $request_content = $request_body['content'];
+    } else {
+        $request_content = $data;
+    }
+
+    return Analysis_Response_Ops_Factory::get_instance()
+                                        ->create( $json, $post_id )
+                                        ->make_entities_local()
+                                        ->remove_excluded_entities( $excluded_uris )
+                                        ->add_occurrences( $request_content )
+                                        ->get_json();
 
 }
 
 function wl_use_analysis_on_api_wordlift_io( $value ) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ) . '/', $value );
+    return preg_replace( '|https://api\.wordlift\.it/|', apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ) . '/', $value );
 }

Spacing +28 added lines, -28 removed lines

@@ -12,8 +12,8 @@ 
  */
 function wl_ajax_analyze_disabled_action() {
 	// adding the below header for debugging purpose.
-	if ( ! headers_sent() ) {
-		header( 'X-WordLift-Analysis: OFF' );
+	if ( ! headers_sent()) {
+		header('X-WordLift-Analysis: OFF');
 	}
 	wp_send_json_success(
 		array(
@@ -35,13 +35,13 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+	check_admin_referer('wl_analyze');
 
 	// If you use `filter_input` here, `Ajax_Content_Analysis_Test` would fail because `filter_input` doesn't use
 	// `$_POST`.
 	$data = $_POST['data'];
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
+	wp_send_json_success(wl_analyze_content($data, 'application/json; charset='.strtolower(get_bloginfo('charset'))));
 
 }
 
@@ -61,48 +61,48 @@ 
  * @since 3.24.2 We don't return an error anymore, but an empty analysis response. This is required to allow the editor
  *   to manage entities or to manually add them even when analysis isn't available.
  */
-function wl_analyze_content( $data, $content_type ) {
+function wl_analyze_content($data, $content_type) {
 
-	$default_response = json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' );
-	$request_body     = json_decode( $data, true );
-	$post_id = isset( $_REQUEST['postId'] ) ? intval( $_REQUEST['postId'] ) : 0;
-	if ( $request_body === null ) {
+	$default_response = json_decode('{ "entities": {}, "annotations": {}, "topics": {} }');
+	$request_body     = json_decode($data, true);
+	$post_id = isset($_REQUEST['postId']) ? intval($_REQUEST['postId']) : 0;
+	if ($request_body === null) {
 		/**
 		 * @since 3.27.7
 		 *
 		 * Conditionally try using stripslashes as $_POST['data'] could be escaped
 		 */
-		$request_body = json_decode( stripslashes( $data ), true );
+		$request_body = json_decode(stripslashes($data), true);
 	}
 	$request_body['contentLanguage'] = Wordlift_Configuration_Service::get_instance()->get_language_code();
-	$excluded_uris                   = array_key_exists( 'exclude', $request_body ) ? (array) $request_body['exclude'] : array();
-	$data                            = wp_json_encode( $request_body );
+	$excluded_uris                   = array_key_exists('exclude', $request_body) ? (array) $request_body['exclude'] : array();
+	$data                            = wp_json_encode($request_body);
 
 	// If dataset is not enabled, return a locally prepared response without analysis API.
-	if ( ! apply_filters( 'wl_features__enable__dataset', true ) ) {
+	if ( ! apply_filters('wl_features__enable__dataset', true)) {
 
 		return Analysis_Response_Ops_Factory::get_instance()
-											->create( $default_response, $post_id )
+											->create($default_response, $post_id)
 											->make_entities_local()
-											->add_occurrences( $request_body['content'] )
+											->add_occurrences($request_body['content'])
 											->add_local_entities()
 											->get_json();
 	}
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	add_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 
 
-	$json    = Analysis_Service_Factory::get_instance( $post_id )
-								->get_analysis_response( $data, $content_type, $post_id );
+	$json = Analysis_Service_Factory::get_instance($post_id)
+								->get_analysis_response($data, $content_type, $post_id);
 
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	remove_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 
 	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
+	if (is_wp_error($json)) {
 		return Analysis_Response_Ops_Factory::get_instance()
-											->create( $default_response, $post_id )
+											->create($default_response, $post_id)
 											->make_entities_local()
-											->add_occurrences( $request_body['content'] )
+											->add_occurrences($request_body['content'])
 											->get_json();
 	}
 
@@ -115,22 +115,22 @@ 
 
 	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
 	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
+	if (0 === strpos($content_type, 'application/json')) {
 		$request_content = $request_body['content'];
 	} else {
 		$request_content = $data;
 	}
 
 	return Analysis_Response_Ops_Factory::get_instance()
-										->create( $json, $post_id )
+										->create($json, $post_id)
 										->make_entities_local()
-										->remove_excluded_entities( $excluded_uris )
-										->add_occurrences( $request_content )
+										->remove_excluded_entities($excluded_uris)
+										->add_occurrences($request_content)
 										->get_json();
 
 }
 
-function wl_use_analysis_on_api_wordlift_io( $value ) {
+function wl_use_analysis_on_api_wordlift_io($value) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ) . '/', $value );
+	return preg_replace('|https://api\.wordlift\.it/|', apply_filters('wl_api_base_url', 'https://api.wordlift.io').'/', $value);
 }

src/wordlift/relation/class-object-relation-factory.php

Indentation +14 added lines, -14 removed lines

@@ -16,20 +16,20 @@
 
 class Object_Relation_Factory {
 
-	/**
-	 * @param int $post_id
-	 *
-	 * @return Relation_Service_Interface
-	 */
-	public static function get_instance( $post_id ) {
-		// The post type doesnt have an editor and no-editor-analysis feature is turned on.
-		if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
-			return Object_No_Annotation_Relation_Service::get_instance();
-		}
-
-		return Object_Relation_Service::get_instance();
-
-	}
+    /**
+     * @param int $post_id
+     *
+     * @return Relation_Service_Interface
+     */
+    public static function get_instance( $post_id ) {
+        // The post type doesnt have an editor and no-editor-analysis feature is turned on.
+        if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
+            return Object_No_Annotation_Relation_Service::get_instance();
+        }
+
+        return Object_Relation_Service::get_instance();
+
+    }
 
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 	 *
 	 * @return Relation_Service_Interface
 	 */
-	public static function get_instance( $post_id ) {
+	public static function get_instance($post_id) {
 		// The post type doesnt have an editor and no-editor-analysis feature is turned on.
-		if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
+		if (No_Editor_Analysis_Feature::can_no_editor_analysis_be_used($post_id)) {
 			return Object_No_Annotation_Relation_Service::get_instance();
 		}
 

src/wordlift/features/class-feature-utils.php

Indentation +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@
  */
 class Feature_Utils {
 
-	/**
-	 * Returns true if the feature is enabled.
-	 *
-	 * @param string $feature_slug Feature slug.
-	 *
-	 * @return bool
-	 */
-	public static function is_feature_on( $feature_slug, $default  ) {
-		return apply_filters( 'wl_feature__enable__' . $feature_slug, $default );
-	}
+    /**
+     * Returns true if the feature is enabled.
+     *
+     * @param string $feature_slug Feature slug.
+     *
+     * @return bool
+     */
+    public static function is_feature_on( $feature_slug, $default  ) {
+        return apply_filters( 'wl_feature__enable__' . $feature_slug, $default );
+    }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
 	 *
 	 * @return bool
 	 */
-	public static function is_feature_on( $feature_slug, $default  ) {
-		return apply_filters( 'wl_feature__enable__' . $feature_slug, $default );
+	public static function is_feature_on($feature_slug, $default) {
+		return apply_filters('wl_feature__enable__'.$feature_slug, $default);
 	}
 
 }
\ No newline at end of file

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

Indentation +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@
  */
 class V1_Analysis_Service extends Abstract_Analysis_Service {
 
-	public function get_analysis_response( $data, $content_type, $post_id ) {
-		return $this->api_service->post_custom_content_type( 'analysis/single', $data, $content_type );
-	}
+    public function get_analysis_response( $data, $content_type, $post_id ) {
+        return $this->api_service->post_custom_content_type( 'analysis/single', $data, $content_type );
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@
  */
 class V1_Analysis_Service extends Abstract_Analysis_Service {
 
-	public function get_analysis_response( $data, $content_type, $post_id ) {
-		return $this->api_service->post_custom_content_type( 'analysis/single', $data, $content_type );
+	public function get_analysis_response($data, $content_type, $post_id) {
+		return $this->api_service->post_custom_content_type('analysis/single', $data, $content_type);
 	}
 }
\ No newline at end of file

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

Indentation +360 added lines, -360 removed lines

@@ -16,365 +16,365 @@
 
 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 Entity_Provider_Registry
-	 */
-	private $entity_provider_registry;
-
-	/**
-	 * @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 Entity_Provider_Registry $entity_provider_registry Entity Provider registry.
-	 * @param mixed $json The analysis response json.
-	 *
-	 * @since 3.21.5
-	 */
-	public function __construct( $entity_uri_service, $entity_helper, $entity_provider_registry, $json, $post_id ) {
-
-		$this->json                     = $json;
-		$this->entity_uri_service       = $entity_uri_service;
-		$this->entity_helper            = $entity_helper;
-		$this->entity_provider_registry = $entity_provider_registry;
-		$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 ) ) {
-			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->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 ) {
-			foreach ( $annotation->entityMatches as $entity_matches ) {
-
-				$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'] );
-
-					$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;
-
-	}
-
-
-	/**
-	 * 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 ) {
-
-				if ( ! isset( $annotation_data->entityMatches ) ) {
-					continue;
-				}
-
-				foreach ( $annotation_data->entityMatches as $entity_match_key => $entity_match_data ) {
-
-					$entity_uri = $entity_match_data->entityId;
-
-					if ( ! in_array( $entity_uri, $excluded_uris ) ) {
-						continue;
-					}
-					unset( $annotation_data->entityMatches[ $entity_match_key ] );
-				}
-
-				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 Entity_Provider_Registry
+     */
+    private $entity_provider_registry;
+
+    /**
+     * @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 Entity_Provider_Registry $entity_provider_registry Entity Provider registry.
+     * @param mixed $json The analysis response json.
+     *
+     * @since 3.21.5
+     */
+    public function __construct( $entity_uri_service, $entity_helper, $entity_provider_registry, $json, $post_id ) {
+
+        $this->json                     = $json;
+        $this->entity_uri_service       = $entity_uri_service;
+        $this->entity_helper            = $entity_helper;
+        $this->entity_provider_registry = $entity_provider_registry;
+        $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 ) ) {
+            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->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 ) {
+            foreach ( $annotation->entityMatches as $entity_matches ) {
+
+                $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'] );
+
+                    $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;
+
+    }
+
+
+    /**
+     * 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 ) {
+
+                if ( ! isset( $annotation_data->entityMatches ) ) {
+                    continue;
+                }
+
+                foreach ( $annotation_data->entityMatches as $entity_match_key => $entity_match_data ) {
+
+                    $entity_uri = $entity_match_data->entityId;
+
+                    if ( ! in_array( $entity_uri, $excluded_uris ) ) {
+                        continue;
+                    }
+                    unset( $annotation_data->entityMatches[ $entity_match_key ] );
+                }
+
+                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

@@ -59,7 +59,7 @@ 
 	 *
 	 * @since 3.21.5
 	 */
-	public function __construct( $entity_uri_service, $entity_helper, $entity_provider_registry, $json, $post_id ) {
+	public function __construct($entity_uri_service, $entity_helper, $entity_provider_registry, $json, $post_id) {
 
 		$this->json                     = $json;
 		$this->entity_uri_service       = $entity_uri_service;
@@ -82,23 +82,23 @@ 
 	 */
 	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();
 			}
 
@@ -106,16 +106,16 @@ 
 			$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 ) ) {
-			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];
 						}
 					}
 				}
@@ -137,32 +137,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;
@@ -175,23 +175,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->entity_provider_registry->get_local_entity( $item_id );
+			if ( ! is_bool($this->json) && ! isset($this->json->entities->{$item_id} )) {
+				$entity = $this->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;
 				}
 
@@ -209,16 +209,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;
 			}
 
@@ -240,28 +240,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         = $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']);
 
-					$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;
 				}
 			}
 		}
@@ -293,19 +293,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;
 	}
@@ -319,24 +319,24 @@ 
 	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);
 	}
 
 	/**
 	 * 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 ) {
+	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.
 				}
 			}
@@ -349,27 +349,27 @@ 
 	 *
 	 * @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) {
 
-				if ( ! isset( $annotation_data->entityMatches ) ) {
+				if ( ! isset($annotation_data->entityMatches)) {
 					continue;
 				}
 
-				foreach ( $annotation_data->entityMatches as $entity_match_key => $entity_match_data ) {
+				foreach ($annotation_data->entityMatches as $entity_match_key => $entity_match_data) {
 
 					$entity_uri = $entity_match_data->entityId;
 
-					if ( ! in_array( $entity_uri, $excluded_uris ) ) {
+					if ( ! in_array($entity_uri, $excluded_uris)) {
 						continue;
 					}
-					unset( $annotation_data->entityMatches[ $entity_match_key ] );
+					unset($annotation_data->entityMatches[$entity_match_key]);
 				}
 
-				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/analysis/response/class-analysis-response-ops-factory.php

Indentation +67 added lines, -67 removed lines

@@ -13,83 +13,83 @@
 use Wordlift\Entity\Entity_Helper;
 
 class Analysis_Response_Ops_Factory {
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-	/**
-	 * @var \Wordlift_Entity_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;
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+    /**
+     * @var \Wordlift_Entity_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;
 
-	private static $instance;
-	/**
-	 * @var Entity_Provider_Registry
-	 */
-	private $entity_provider_registry;
+    private static $instance;
+    /**
+     * @var Entity_Provider_Registry
+     */
+    private $entity_provider_registry;
 
-	/**
-	 * 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
-	 */
-	public function __construct( $entity_uri_service, $entity_helper, $entity_provider_registry ) {
+    /**
+     * 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
+     */
+    public function __construct( $entity_uri_service, $entity_helper, $entity_provider_registry ) {
 
-		$this->entity_uri_service       = $entity_uri_service;
-		$this->entity_helper            = $entity_helper;
-		$this->entity_provider_registry = $entity_provider_registry;
-		self::$instance                 = $this;
+        $this->entity_uri_service       = $entity_uri_service;
+        $this->entity_helper            = $entity_helper;
+        $this->entity_provider_registry = $entity_provider_registry;
+        self::$instance                 = $this;
 
-	}
+    }
 
-	public static function get_instance() {
+    public static function get_instance() {
 
-		return self::$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,
-			$this->entity_provider_registry,
-			$json,
-			$post_id );
-	}
+        return new Analysis_Response_Ops(
+            $this->entity_uri_service,
+            $this->entity_helper,
+            $this->entity_provider_registry,
+            $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 );
+    }
 
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
 	 *
 	 * @since 3.25.1
 	 */
-	public function __construct( $entity_uri_service, $entity_helper, $entity_provider_registry ) {
+	public function __construct($entity_uri_service, $entity_helper, $entity_provider_registry) {
 
 		$this->entity_uri_service       = $entity_uri_service;
 		$this->entity_helper            = $entity_helper;
@@ -62,7 +62,7 @@ 
 		return self::$instance;
 	}
 
-	public function create( $json, $post_id ) {
+	public function create($json, $post_id) {
 
 		return new Analysis_Response_Ops(
 			$this->entity_uri_service,
@@ -83,13 +83,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);
 	}
 
 }
\ No newline at end of file

src/wordlift/analysis/class-no-editor-analysis-service.php

Indentation +5 added lines, -5 removed lines

@@ -13,12 +13,12 @@
  */
 class No_Editor_Analysis_Service extends Abstract_Analysis_Service {
 
-	public function get_analysis_response( $data, $content_type, $post_id ) {
+    public function get_analysis_response( $data, $content_type, $post_id ) {
 
-		$v2_analysis_request = new No_Editor_Analysis_Request( $post_id );
+        $v2_analysis_request = new No_Editor_Analysis_Request( $post_id );
 
-		$json_encoded_body = wp_json_encode( $v2_analysis_request->get_data() );
+        $json_encoded_body = wp_json_encode( $v2_analysis_request->get_data() );
 
-		return $this->api_service->post_custom_content_type( 'analysis/v2/analyze', $json_encoded_body, $content_type );
-	}
+        return $this->api_service->post_custom_content_type( 'analysis/v2/analyze', $json_encoded_body, $content_type );
+    }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -13,12 +13,12 @@
  */
 class No_Editor_Analysis_Service extends Abstract_Analysis_Service {
 
-	public function get_analysis_response( $data, $content_type, $post_id ) {
+	public function get_analysis_response($data, $content_type, $post_id) {
 
-		$v2_analysis_request = new No_Editor_Analysis_Request( $post_id );
+		$v2_analysis_request = new No_Editor_Analysis_Request($post_id);
 
-		$json_encoded_body = wp_json_encode( $v2_analysis_request->get_data() );
+		$json_encoded_body = wp_json_encode($v2_analysis_request->get_data());
 
-		return $this->api_service->post_custom_content_type( 'analysis/v2/analyze', $json_encoded_body, $content_type );
+		return $this->api_service->post_custom_content_type('analysis/v2/analyze', $json_encoded_body, $content_type);
 	}
 }
\ No newline at end of file

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

Indentation +12 added lines, -12 removed lines

@@ -17,18 +17,18 @@
  */
 class Analysis_Service_Factory {
 
-	/**
-	 * Get the analysis service conditionally.
-	 *
-	 * @return Analysis_Service
-	 */
-	public static function get_instance( $post_id ) {
-		// We want this analysis to happen only when the editor is not present.
-		if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
-			return No_Editor_Analysis_Service::get_instance();
-		}
+    /**
+     * Get the analysis service conditionally.
+     *
+     * @return Analysis_Service
+     */
+    public static function get_instance( $post_id ) {
+        // We want this analysis to happen only when the editor is not present.
+        if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
+            return No_Editor_Analysis_Service::get_instance();
+        }
 
-		return V1_Analysis_Service::get_instance();
-	}
+        return V1_Analysis_Service::get_instance();
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
 	 *
 	 * @return Analysis_Service
 	 */
-	public static function get_instance( $post_id ) {
+	public static function get_instance($post_id) {
 		// We want this analysis to happen only when the editor is not present.
-		if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
+		if (No_Editor_Analysis_Feature::can_no_editor_analysis_be_used($post_id)) {
 			return No_Editor_Analysis_Service::get_instance();
 		}
 

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

Indentation +13 added lines, -13 removed lines

@@ -15,19 +15,19 @@
  */
 abstract class Abstract_Analysis_Service extends Singleton implements  Analysis_Service {
 
-	/**
-	 * Wordlift api service.
-	 *
-	 * @var \Wordlift_Api_Service
-	 */
-	protected $api_service;
+    /**
+     * Wordlift api service.
+     *
+     * @var \Wordlift_Api_Service
+     */
+    protected $api_service;
 
-	/**
-	 * Abstract_Analysis_Service constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->api_service = \Wordlift_Api_Service::get_instance();
-	}
+    /**
+     * Abstract_Analysis_Service constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->api_service = \Wordlift_Api_Service::get_instance();
+    }
 
 }