insideout10 / wordlift-plugin

src/wordlift/class-assertions.php

Indentation +100 added lines, -100 removed lines

@@ -15,105 +15,105 @@
 
 class Assertions {
 
-	/**
-	 * Asserts that the provided value is of the specified type.
-	 *
-	 * @param mixed  $value The value to test.
-	 * @param string $type The expected type.
-	 *
-	 * @throws Exception when an error occurs.
-	 */
-	public static function assert_of_type( $value, $type ) {
-
-		// Check for nulls.
-		if ( null === $value ) {
-			throw new Exception( 'Value can`t be null.' );
-		}
-
-		// Check for type.
-		if ( get_class( $value ) !== $type ) {
-			throw new Exception( "Value must be a $type." );
-		}
-
-	}
-
-	/**
-	 * @throws Exception when the argument is not a string.
-	 */
-	public static function is_string( $arg, $message = 'Value must be a string' ) {
-		if ( ! is_string( $arg ) ) {
-			throw new Exception( $message );
-		}
-	}
-
-	/**
-	 * @throws Exception when actual doesn't match expected.
-	 */
-	public static function equals( $actual, $expected, $message = 'Values do not match' ) {
-		if ( $actual !== $expected ) {
-			throw new Exception( $message );
-		}
-	}
-
-	/**
-	 * @throws Exception when actual doesn't match expected.
-	 */
-	public static function array_key_exists( $arr, $key ) {
-		if ( ! array_key_exists( $key, $arr ) ) {
-			throw new Exception( "The key {$key} doesn't exist in array" );
-		}
-	}
-
-	/**
-	 * @throws Exception when the value doesn't match the pattern.
-	 */
-	public static function matches( $value, $pattern, $message = "Value doesn't match" ) {
-		if ( 1 !== preg_match( $pattern, $value ) ) {
-			throw new Exception( $message );
-		}
-
-	}
-
-	/**
-	 * @throws Exception when the value doesn't start with the provided scope.
-	 */
-	public static function starts_with( $value, $scope, $message = "Value doesn't start with provided scope" ) {
-		if ( 0 !== strpos( $value, $scope ) ) {
-			throw new Exception( $message );
-		}
-	}
-
-	/**
-	 * @throws Exception when the value is not of the specified type.
-	 */
-	public static function is_a( $value, $type, $message = 'Value is not of the required type' ) {
-		if ( ! is_a( $value, $type ) ) {
-			throw new Exception( $message );
-		}
-	}
-
-	public static function is_set( $value, $message = 'Value is not set' ) {
-		if ( ! isset( $value ) ) {
-			throw new Exception( $message );
-		}
-	}
-
-	public static function not_empty( $value, $message = "Value can't be empty" ) {
-		if ( empty( $value ) ) {
-			throw new Exception( $message );
-		}
-	}
-
-	public static function is_array( $value, $message = 'Value should be array' ) {
-		if ( ! is_array( $value ) ) {
-			throw new Exception( $message );
-		}
-	}
-
-	public static function is_numeric( $value, $message = 'Value should be numeric' ) {
-		if ( ! is_numeric( $value ) ) {
-			throw new Exception( $message );
-		}
-	}
+    /**
+     * Asserts that the provided value is of the specified type.
+     *
+     * @param mixed  $value The value to test.
+     * @param string $type The expected type.
+     *
+     * @throws Exception when an error occurs.
+     */
+    public static function assert_of_type( $value, $type ) {
+
+        // Check for nulls.
+        if ( null === $value ) {
+            throw new Exception( 'Value can`t be null.' );
+        }
+
+        // Check for type.
+        if ( get_class( $value ) !== $type ) {
+            throw new Exception( "Value must be a $type." );
+        }
+
+    }
+
+    /**
+     * @throws Exception when the argument is not a string.
+     */
+    public static function is_string( $arg, $message = 'Value must be a string' ) {
+        if ( ! is_string( $arg ) ) {
+            throw new Exception( $message );
+        }
+    }
+
+    /**
+     * @throws Exception when actual doesn't match expected.
+     */
+    public static function equals( $actual, $expected, $message = 'Values do not match' ) {
+        if ( $actual !== $expected ) {
+            throw new Exception( $message );
+        }
+    }
+
+    /**
+     * @throws Exception when actual doesn't match expected.
+     */
+    public static function array_key_exists( $arr, $key ) {
+        if ( ! array_key_exists( $key, $arr ) ) {
+            throw new Exception( "The key {$key} doesn't exist in array" );
+        }
+    }
+
+    /**
+     * @throws Exception when the value doesn't match the pattern.
+     */
+    public static function matches( $value, $pattern, $message = "Value doesn't match" ) {
+        if ( 1 !== preg_match( $pattern, $value ) ) {
+            throw new Exception( $message );
+        }
+
+    }
+
+    /**
+     * @throws Exception when the value doesn't start with the provided scope.
+     */
+    public static function starts_with( $value, $scope, $message = "Value doesn't start with provided scope" ) {
+        if ( 0 !== strpos( $value, $scope ) ) {
+            throw new Exception( $message );
+        }
+    }
+
+    /**
+     * @throws Exception when the value is not of the specified type.
+     */
+    public static function is_a( $value, $type, $message = 'Value is not of the required type' ) {
+        if ( ! is_a( $value, $type ) ) {
+            throw new Exception( $message );
+        }
+    }
+
+    public static function is_set( $value, $message = 'Value is not set' ) {
+        if ( ! isset( $value ) ) {
+            throw new Exception( $message );
+        }
+    }
+
+    public static function not_empty( $value, $message = "Value can't be empty" ) {
+        if ( empty( $value ) ) {
+            throw new Exception( $message );
+        }
+    }
+
+    public static function is_array( $value, $message = 'Value should be array' ) {
+        if ( ! is_array( $value ) ) {
+            throw new Exception( $message );
+        }
+    }
+
+    public static function is_numeric( $value, $message = 'Value should be numeric' ) {
+        if ( ! is_numeric( $value ) ) {
+            throw new Exception( $message );
+        }
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -23,16 +23,16 @@ 
 	 *
 	 * @throws Exception when an error occurs.
 	 */
-	public static function assert_of_type( $value, $type ) {
+	public static function assert_of_type($value, $type) {
 
 		// Check for nulls.
-		if ( null === $value ) {
-			throw new Exception( 'Value can`t be null.' );
+		if (null === $value) {
+			throw new Exception('Value can`t be null.');
 		}
 
 		// Check for type.
-		if ( get_class( $value ) !== $type ) {
-			throw new Exception( "Value must be a $type." );
+		if (get_class($value) !== $type) {
+			throw new Exception("Value must be a $type.");
 		}
 
 	}
@@ -40,36 +40,36 @@ 
 	/**
 	 * @throws Exception when the argument is not a string.
 	 */
-	public static function is_string( $arg, $message = 'Value must be a string' ) {
-		if ( ! is_string( $arg ) ) {
-			throw new Exception( $message );
+	public static function is_string($arg, $message = 'Value must be a string') {
+		if ( ! is_string($arg)) {
+			throw new Exception($message);
 		}
 	}
 
 	/**
 	 * @throws Exception when actual doesn't match expected.
 	 */
-	public static function equals( $actual, $expected, $message = 'Values do not match' ) {
-		if ( $actual !== $expected ) {
-			throw new Exception( $message );
+	public static function equals($actual, $expected, $message = 'Values do not match') {
+		if ($actual !== $expected) {
+			throw new Exception($message);
 		}
 	}
 
 	/**
 	 * @throws Exception when actual doesn't match expected.
 	 */
-	public static function array_key_exists( $arr, $key ) {
-		if ( ! array_key_exists( $key, $arr ) ) {
-			throw new Exception( "The key {$key} doesn't exist in array" );
+	public static function array_key_exists($arr, $key) {
+		if ( ! array_key_exists($key, $arr)) {
+			throw new Exception("The key {$key} doesn't exist in array");
 		}
 	}
 
 	/**
 	 * @throws Exception when the value doesn't match the pattern.
 	 */
-	public static function matches( $value, $pattern, $message = "Value doesn't match" ) {
-		if ( 1 !== preg_match( $pattern, $value ) ) {
-			throw new Exception( $message );
+	public static function matches($value, $pattern, $message = "Value doesn't match") {
+		if (1 !== preg_match($pattern, $value)) {
+			throw new Exception($message);
 		}
 
 	}
@@ -77,42 +77,42 @@ 
 	/**
 	 * @throws Exception when the value doesn't start with the provided scope.
 	 */
-	public static function starts_with( $value, $scope, $message = "Value doesn't start with provided scope" ) {
-		if ( 0 !== strpos( $value, $scope ) ) {
-			throw new Exception( $message );
+	public static function starts_with($value, $scope, $message = "Value doesn't start with provided scope") {
+		if (0 !== strpos($value, $scope)) {
+			throw new Exception($message);
 		}
 	}
 
 	/**
 	 * @throws Exception when the value is not of the specified type.
 	 */
-	public static function is_a( $value, $type, $message = 'Value is not of the required type' ) {
-		if ( ! is_a( $value, $type ) ) {
-			throw new Exception( $message );
+	public static function is_a($value, $type, $message = 'Value is not of the required type') {
+		if ( ! is_a($value, $type)) {
+			throw new Exception($message);
 		}
 	}
 
-	public static function is_set( $value, $message = 'Value is not set' ) {
-		if ( ! isset( $value ) ) {
-			throw new Exception( $message );
+	public static function is_set($value, $message = 'Value is not set') {
+		if ( ! isset($value)) {
+			throw new Exception($message);
 		}
 	}
 
-	public static function not_empty( $value, $message = "Value can't be empty" ) {
-		if ( empty( $value ) ) {
-			throw new Exception( $message );
+	public static function not_empty($value, $message = "Value can't be empty") {
+		if (empty($value)) {
+			throw new Exception($message);
 		}
 	}
 
-	public static function is_array( $value, $message = 'Value should be array' ) {
-		if ( ! is_array( $value ) ) {
-			throw new Exception( $message );
+	public static function is_array($value, $message = 'Value should be array') {
+		if ( ! is_array($value)) {
+			throw new Exception($message);
 		}
 	}
 
-	public static function is_numeric( $value, $message = 'Value should be numeric' ) {
-		if ( ! is_numeric( $value ) ) {
-			throw new Exception( $message );
+	public static function is_numeric($value, $message = 'Value should be numeric') {
+		if ( ! is_numeric($value)) {
+			throw new Exception($message);
 		}
 	}
 

src/wordlift/jsonld/class-jsonld-article-wrapper.php

Indentation +152 added lines, -152 removed lines

@@ -7,167 +7,167 @@
 
 class Jsonld_Article_Wrapper {
 
-	public static $article_types = array(
-		'Article',
-		'AdvertiserContentArticle',
-		'NewsArticle',
-		'AnalysisNewsArticle',
-		'AskPublicNewsArticle',
-		'BackgroundNewsArticle',
-		'OpinionNewsArticle',
-		'ReportageNewsArticle',
-		'ReviewNewsArticle',
-		'Report',
-		'SatiricalArticle',
-		'ScholarlyArticle',
-		'MedicalScholarlyArticle',
-		'SocialMediaPosting',
-		'BlogPosting',
-		'LiveBlogPosting',
-		'DiscussionForumPosting',
-		'TechArticle',
-		'APIReference',
-	);
-
-	/**
-	 * @var Wordlift_Post_To_Jsonld_Converter
-	 */
-	private $post_to_jsonld_converter;
-	/**
-	 * @var \Wordlift_Cached_Post_Converter
-	 */
-	private $cached_postid_to_jsonld_converter;
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Article_Wrapper constructor.
-	 *
-	 * @param Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter
-	 * @param $cached_postid_to_jsonld_converter
-	 */
-	public function __construct( $post_to_jsonld_converter, $cached_postid_to_jsonld_converter ) {
-
-		$this->post_to_jsonld_converter = $post_to_jsonld_converter->new_instance_with_filters_disabled();
-
-		add_filter(
-			'wl_after_get_jsonld',
-			array(
-				$this,
-				'after_get_jsonld',
-			),
-			PHP_INT_MAX - 100,
-			3
-		);
-
-		$this->cached_postid_to_jsonld_converter = $cached_postid_to_jsonld_converter;
-
-		$this->entity_uri_service = \Wordlift_Entity_Uri_Service::get_instance();
-	}
-
-	public function after_get_jsonld( $jsonld, $post_id, $context ) {
-
-		// Invalid data structure
-		if ( ! is_array( $jsonld ) || ! isset( $jsonld[0] ) || ! is_array( $jsonld[0] ) ) {
-			return $jsonld;
-		}
-
-		if ( Jsonld_Context_Enum::PAGE !== $context
-			 // Returns true for "1", "true", "on" and "yes". Returns false otherwise.
-			 && ! filter_input( INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN ) ) {
-			return $jsonld;
-		}
-
-		// Copy the 1st array element
-		$post_jsonld = $jsonld[0];
-
-		// Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
-		// in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
-		if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
-			return $jsonld;
-		}
-
-		$references      = array();
-		$reference_infos = array();
-
-		// Convert the post as Article.
-		$article_jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $reference_infos, new Relations() );
-
-		$article_jsonld['@id'] = $post_jsonld['@id'] . '#article';
-		// Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
-		$article_jsonld['@type'] = 'Article';
-		$article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
-
-		// Copy over the URLs.
-		if ( isset( $post_jsonld['url'] ) ) {
-			$article_jsonld['url'] = $post_jsonld['url'];
-		}
-
-		array_unshift( $jsonld, $article_jsonld );
-
-		$author_jsonld = $this->get_author_linked_entity( $article_jsonld );
-
-		/**
-		 * The author entities can be present in graph for some entity types
-		 * for Person and Organization, so check before we add it to graph.
-		 * reference : https://schema.org/author
-		 */
-		if ( $author_jsonld && ! $this->is_author_entity_present_in_graph( $jsonld, $article_jsonld['author']['@id'] ) ) {
-			$jsonld[] = $author_jsonld;
-		}
-
-		return $jsonld;
-	}
-
-	private function is_article( $schema_types ) {
-
-		$array_intersect = array_intersect( self::$article_types, (array) $schema_types );
-
-		return ! empty( $array_intersect );
-	}
-
-	private function get_author_linked_entity( $article_jsonld ) {
-		if ( ! array_key_exists( 'author', $article_jsonld ) ) {
-			return false;
-		}
-
-		$author = $article_jsonld['author'];
+    public static $article_types = array(
+        'Article',
+        'AdvertiserContentArticle',
+        'NewsArticle',
+        'AnalysisNewsArticle',
+        'AskPublicNewsArticle',
+        'BackgroundNewsArticle',
+        'OpinionNewsArticle',
+        'ReportageNewsArticle',
+        'ReviewNewsArticle',
+        'Report',
+        'SatiricalArticle',
+        'ScholarlyArticle',
+        'MedicalScholarlyArticle',
+        'SocialMediaPosting',
+        'BlogPosting',
+        'LiveBlogPosting',
+        'DiscussionForumPosting',
+        'TechArticle',
+        'APIReference',
+    );
+
+    /**
+     * @var Wordlift_Post_To_Jsonld_Converter
+     */
+    private $post_to_jsonld_converter;
+    /**
+     * @var \Wordlift_Cached_Post_Converter
+     */
+    private $cached_postid_to_jsonld_converter;
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Article_Wrapper constructor.
+     *
+     * @param Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter
+     * @param $cached_postid_to_jsonld_converter
+     */
+    public function __construct( $post_to_jsonld_converter, $cached_postid_to_jsonld_converter ) {
+
+        $this->post_to_jsonld_converter = $post_to_jsonld_converter->new_instance_with_filters_disabled();
+
+        add_filter(
+            'wl_after_get_jsonld',
+            array(
+                $this,
+                'after_get_jsonld',
+            ),
+            PHP_INT_MAX - 100,
+            3
+        );
+
+        $this->cached_postid_to_jsonld_converter = $cached_postid_to_jsonld_converter;
+
+        $this->entity_uri_service = \Wordlift_Entity_Uri_Service::get_instance();
+    }
+
+    public function after_get_jsonld( $jsonld, $post_id, $context ) {
+
+        // Invalid data structure
+        if ( ! is_array( $jsonld ) || ! isset( $jsonld[0] ) || ! is_array( $jsonld[0] ) ) {
+            return $jsonld;
+        }
+
+        if ( Jsonld_Context_Enum::PAGE !== $context
+                // Returns true for "1", "true", "on" and "yes". Returns false otherwise.
+             && ! filter_input( INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN ) ) {
+            return $jsonld;
+        }
+
+        // Copy the 1st array element
+        $post_jsonld = $jsonld[0];
+
+        // Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
+        // in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
+        if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
+            return $jsonld;
+        }
+
+        $references      = array();
+        $reference_infos = array();
+
+        // Convert the post as Article.
+        $article_jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $reference_infos, new Relations() );
+
+        $article_jsonld['@id'] = $post_jsonld['@id'] . '#article';
+        // Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
+        $article_jsonld['@type'] = 'Article';
+        $article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
+
+        // Copy over the URLs.
+        if ( isset( $post_jsonld['url'] ) ) {
+            $article_jsonld['url'] = $post_jsonld['url'];
+        }
+
+        array_unshift( $jsonld, $article_jsonld );
+
+        $author_jsonld = $this->get_author_linked_entity( $article_jsonld );
+
+        /**
+         * The author entities can be present in graph for some entity types
+         * for Person and Organization, so check before we add it to graph.
+         * reference : https://schema.org/author
+         */
+        if ( $author_jsonld && ! $this->is_author_entity_present_in_graph( $jsonld, $article_jsonld['author']['@id'] ) ) {
+            $jsonld[] = $author_jsonld;
+        }
+
+        return $jsonld;
+    }
+
+    private function is_article( $schema_types ) {
+
+        $array_intersect = array_intersect( self::$article_types, (array) $schema_types );
+
+        return ! empty( $array_intersect );
+    }
+
+    private function get_author_linked_entity( $article_jsonld ) {
+        if ( ! array_key_exists( 'author', $article_jsonld ) ) {
+            return false;
+        }
+
+        $author = $article_jsonld['author'];
 
-		if ( count( array_keys( $author ) ) !== 1 || ! array_key_exists( '@id', $author ) ) {
-			return false;
-		}
+        if ( count( array_keys( $author ) ) !== 1 || ! array_key_exists( '@id', $author ) ) {
+            return false;
+        }
 
-		$author_linked_entity_id = $author['@id'];
+        $author_linked_entity_id = $author['@id'];
 
-		$author_entity_post = $this->entity_uri_service->get_entity( $author_linked_entity_id );
+        $author_entity_post = $this->entity_uri_service->get_entity( $author_linked_entity_id );
 
-		if ( ! $author_entity_post instanceof \WP_Post ) {
-			return false;
-		}
+        if ( ! $author_entity_post instanceof \WP_Post ) {
+            return false;
+        }
 
-		$references      = array();
-		$reference_infos = array();
+        $references      = array();
+        $reference_infos = array();
 
-		return $this->cached_postid_to_jsonld_converter->convert(
-			$author_entity_post->ID,
-			$references,
-			$reference_infos,
-			new Relations()
-		);
+        return $this->cached_postid_to_jsonld_converter->convert(
+            $author_entity_post->ID,
+            $references,
+            $reference_infos,
+            new Relations()
+        );
 
-	}
+    }
 
-	private function is_author_entity_present_in_graph( $jsonld, $author_entity_id ) {
+    private function is_author_entity_present_in_graph( $jsonld, $author_entity_id ) {
 
-		foreach ( $jsonld as $item ) {
-			if ( $item && array_key_exists( '@id', $item ) && $item['@id'] === $author_entity_id ) {
-				return true;
-			}
-		}
+        foreach ( $jsonld as $item ) {
+            if ( $item && array_key_exists( '@id', $item ) && $item['@id'] === $author_entity_id ) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter
 	 * @param $cached_postid_to_jsonld_converter
 	 */
-	public function __construct( $post_to_jsonld_converter, $cached_postid_to_jsonld_converter ) {
+	public function __construct($post_to_jsonld_converter, $cached_postid_to_jsonld_converter) {
 
 		$this->post_to_jsonld_converter = $post_to_jsonld_converter->new_instance_with_filters_disabled();
 
@@ -67,16 +67,16 @@ 
 		$this->entity_uri_service = \Wordlift_Entity_Uri_Service::get_instance();
 	}
 
-	public function after_get_jsonld( $jsonld, $post_id, $context ) {
+	public function after_get_jsonld($jsonld, $post_id, $context) {
 
 		// Invalid data structure
-		if ( ! is_array( $jsonld ) || ! isset( $jsonld[0] ) || ! is_array( $jsonld[0] ) ) {
+		if ( ! is_array($jsonld) || ! isset($jsonld[0]) || ! is_array($jsonld[0])) {
 			return $jsonld;
 		}
 
-		if ( Jsonld_Context_Enum::PAGE !== $context
+		if (Jsonld_Context_Enum::PAGE !== $context
 			 // Returns true for "1", "true", "on" and "yes". Returns false otherwise.
-			 && ! filter_input( INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN ) ) {
+			 && ! filter_input(INPUT_GET, 'article_wrapper', FILTER_VALIDATE_BOOLEAN)) {
 			return $jsonld;
 		}
 
@@ -85,7 +85,7 @@ 
 
 		// Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
 		// in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
-		if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
+		if ( ! isset($post_jsonld['@id']) || ! isset($post_jsonld['@type']) || $this->is_article($post_jsonld['@type'])) {
 			return $jsonld;
 		}
 
@@ -93,57 +93,57 @@ 
 		$reference_infos = array();
 
 		// Convert the post as Article.
-		$article_jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references, $reference_infos, new Relations() );
+		$article_jsonld = $this->post_to_jsonld_converter->convert($post_id, $references, $reference_infos, new Relations());
 
-		$article_jsonld['@id'] = $post_jsonld['@id'] . '#article';
+		$article_jsonld['@id'] = $post_jsonld['@id'].'#article';
 		// Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
 		$article_jsonld['@type'] = 'Article';
-		$article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
+		$article_jsonld['about'] = array('@id' => $post_jsonld['@id']);
 
 		// Copy over the URLs.
-		if ( isset( $post_jsonld['url'] ) ) {
+		if (isset($post_jsonld['url'])) {
 			$article_jsonld['url'] = $post_jsonld['url'];
 		}
 
-		array_unshift( $jsonld, $article_jsonld );
+		array_unshift($jsonld, $article_jsonld);
 
-		$author_jsonld = $this->get_author_linked_entity( $article_jsonld );
+		$author_jsonld = $this->get_author_linked_entity($article_jsonld);
 
 		/**
 		 * The author entities can be present in graph for some entity types
 		 * for Person and Organization, so check before we add it to graph.
 		 * reference : https://schema.org/author
 		 */
-		if ( $author_jsonld && ! $this->is_author_entity_present_in_graph( $jsonld, $article_jsonld['author']['@id'] ) ) {
+		if ($author_jsonld && ! $this->is_author_entity_present_in_graph($jsonld, $article_jsonld['author']['@id'])) {
 			$jsonld[] = $author_jsonld;
 		}
 
 		return $jsonld;
 	}
 
-	private function is_article( $schema_types ) {
+	private function is_article($schema_types) {
 
-		$array_intersect = array_intersect( self::$article_types, (array) $schema_types );
+		$array_intersect = array_intersect(self::$article_types, (array) $schema_types);
 
-		return ! empty( $array_intersect );
+		return ! empty($array_intersect);
 	}
 
-	private function get_author_linked_entity( $article_jsonld ) {
-		if ( ! array_key_exists( 'author', $article_jsonld ) ) {
+	private function get_author_linked_entity($article_jsonld) {
+		if ( ! array_key_exists('author', $article_jsonld)) {
 			return false;
 		}
 
 		$author = $article_jsonld['author'];
 
-		if ( count( array_keys( $author ) ) !== 1 || ! array_key_exists( '@id', $author ) ) {
+		if (count(array_keys($author)) !== 1 || ! array_key_exists('@id', $author)) {
 			return false;
 		}
 
 		$author_linked_entity_id = $author['@id'];
 
-		$author_entity_post = $this->entity_uri_service->get_entity( $author_linked_entity_id );
+		$author_entity_post = $this->entity_uri_service->get_entity($author_linked_entity_id);
 
-		if ( ! $author_entity_post instanceof \WP_Post ) {
+		if ( ! $author_entity_post instanceof \WP_Post) {
 			return false;
 		}
 
@@ -159,10 +159,10 @@ 
 
 	}
 
-	private function is_author_entity_present_in_graph( $jsonld, $author_entity_id ) {
+	private function is_author_entity_present_in_graph($jsonld, $author_entity_id) {
 
-		foreach ( $jsonld as $item ) {
-			if ( $item && array_key_exists( '@id', $item ) && $item['@id'] === $author_entity_id ) {
+		foreach ($jsonld as $item) {
+			if ($item && array_key_exists('@id', $item) && $item['@id'] === $author_entity_id) {
 				return true;
 			}
 		}

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

Indentation +4 added lines, -4 removed lines

@@ -10,9 +10,9 @@
 
 interface Occurrences {
 
-	/**
-	 * @return array Return json data structure.
-	 */
-	public function add_occurrences_to_entities( $occurrences, $json, $post_id );
+    /**
+     * @return array Return json data structure.
+     */
+    public function add_occurrences_to_entities( $occurrences, $json, $post_id );
 
 }

Spacing +1 added lines, -1 removed lines

@@ -13,6 +13,6 @@
 	/**
 	 * @return array Return json data structure.
 	 */
-	public function add_occurrences_to_entities( $occurrences, $json, $post_id );
+	public function add_occurrences_to_entities($occurrences, $json, $post_id);
 
 }

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_occurrences_to_entities( $occurrences, $json, $post_id ) {
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function add_occurrences_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_occurrences_to_entities( $occurrences, $json, $post_id ) {
+	public function add_occurrences_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.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_occurrences_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_occurrences_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_occurrences_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_occurrences_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/content/wordpress/class-wordpress-content-id.php

Indentation +56 added lines, -56 removed lines

@@ -14,61 +14,61 @@
 // phpcs:ignore WordPress.WP.CapitalPDangit.MisspelledClassName
 class Wordpress_Content_Id implements Content_Id, JsonSerializable {
 
-	/**
-	 * @var int $id The post/page/term/user ID.
-	 */
-	private $id;
-
-	/**
-	 * @var Object_Type_Enum $type The content type, post/page/term/user.
-	 */
-	private $type;
-
-	public static function create_post( $id ) {
-		return new self( $id, Object_Type_Enum::POST );
-	}
-
-	public static function create_term( $id ) {
-		return new self( $id, Object_Type_Enum::TERM );
-	}
-
-	public static function create_user( $id ) {
-		return new self( $id, Object_Type_Enum::USER );
-	}
-
-	/**
-	 * @param int $id The post/page/term/user ID.
-	 * @param int $type The content type, post/page/term/user.
-	 */
-	public function __construct( $id, $type ) {
-		Assertions::is_numeric( $id );
-		Assertions::is_numeric( $type );
-
-		$this->id   = (int) $id;
-		$this->type = (int) $type;
-	}
-
-	public static function from_json( $json ) {
-		return new self( $json['id'], $json['type'] );
-	}
-
-	public function get_id() {
-		return $this->id;
-	}
-
-	public function get_type() {
-		return $this->type;
-	}
-
-	public function jsonSerialize() {
-		return array(
-			'id'   => $this->id,
-			'type' => $this->type,
-		);
-	}
-
-	public function __toString() {
-		return sprintf( '%d_%d', $this->type, $this->id );
-	}
+    /**
+     * @var int $id The post/page/term/user ID.
+     */
+    private $id;
+
+    /**
+     * @var Object_Type_Enum $type The content type, post/page/term/user.
+     */
+    private $type;
+
+    public static function create_post( $id ) {
+        return new self( $id, Object_Type_Enum::POST );
+    }
+
+    public static function create_term( $id ) {
+        return new self( $id, Object_Type_Enum::TERM );
+    }
+
+    public static function create_user( $id ) {
+        return new self( $id, Object_Type_Enum::USER );
+    }
+
+    /**
+     * @param int $id The post/page/term/user ID.
+     * @param int $type The content type, post/page/term/user.
+     */
+    public function __construct( $id, $type ) {
+        Assertions::is_numeric( $id );
+        Assertions::is_numeric( $type );
+
+        $this->id   = (int) $id;
+        $this->type = (int) $type;
+    }
+
+    public static function from_json( $json ) {
+        return new self( $json['id'], $json['type'] );
+    }
+
+    public function get_id() {
+        return $this->id;
+    }
+
+    public function get_type() {
+        return $this->type;
+    }
+
+    public function jsonSerialize() {
+        return array(
+            'id'   => $this->id,
+            'type' => $this->type,
+        );
+    }
+
+    public function __toString() {
+        return sprintf( '%d_%d', $this->type, $this->id );
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -24,32 +24,32 @@ 
 	 */
 	private $type;
 
-	public static function create_post( $id ) {
-		return new self( $id, Object_Type_Enum::POST );
+	public static function create_post($id) {
+		return new self($id, Object_Type_Enum::POST);
 	}
 
-	public static function create_term( $id ) {
-		return new self( $id, Object_Type_Enum::TERM );
+	public static function create_term($id) {
+		return new self($id, Object_Type_Enum::TERM);
 	}
 
-	public static function create_user( $id ) {
-		return new self( $id, Object_Type_Enum::USER );
+	public static function create_user($id) {
+		return new self($id, Object_Type_Enum::USER);
 	}
 
 	/**
 	 * @param int $id The post/page/term/user ID.
 	 * @param int $type The content type, post/page/term/user.
 	 */
-	public function __construct( $id, $type ) {
-		Assertions::is_numeric( $id );
-		Assertions::is_numeric( $type );
+	public function __construct($id, $type) {
+		Assertions::is_numeric($id);
+		Assertions::is_numeric($type);
 
 		$this->id   = (int) $id;
 		$this->type = (int) $type;
 	}
 
-	public static function from_json( $json ) {
-		return new self( $json['id'], $json['type'] );
+	public static function from_json($json) {
+		return new self($json['id'], $json['type']);
 	}
 
 	public function get_id() {
@@ -68,7 +68,7 @@ 
 	}
 
 	public function __toString() {
-		return sprintf( '%d_%d', $this->type, $this->id );
+		return sprintf('%d_%d', $this->type, $this->id);
 	}
 
 }

src/wordlift/relation/class-post-terms-relation-service.php

Indentation +55 added lines, -55 removed lines

@@ -16,69 +16,69 @@
 
 class Post_Terms_Relation_Service extends Abstract_Relation_Service {
 
-	private static $instance = null;
+    private static $instance = null;
 
-	/**
-	 * The singleton instance.
-	 *
-	 * @return Relation_Service_Interface
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
+    /**
+     * The singleton instance.
+     *
+     * @return Relation_Service_Interface
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	// **
-	// * @param $term_id int Term id.
-	// */
-	// public function get_relation_type( $term_id ) {
-	// $schema = $this->term_entity_type_service->get_schema(
-	// $term_id
-	// );
+    // **
+    // * @param $term_id int Term id.
+    // */
+    // public function get_relation_type( $term_id ) {
+    // $schema = $this->term_entity_type_service->get_schema(
+    // $term_id
+    // );
 //		// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_unserialize
-	// $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-	//
-	// $entity_type = str_replace( 'wl-', '', $schema['css_class'] );
-	// foreach ( $classification_boxes as $cb ) {
-	// if ( in_array( $entity_type, $cb['registeredTypes'], true ) ) {
-	// return $cb['id'];
-	// }
-	// }
-	//
-	// return WL_WHAT_RELATION;
-	// }
+    // $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+    //
+    // $entity_type = str_replace( 'wl-', '', $schema['css_class'] );
+    // foreach ( $classification_boxes as $cb ) {
+    // if ( in_array( $entity_type, $cb['registeredTypes'], true ) ) {
+    // return $cb['id'];
+    // }
+    // }
+    //
+    // return WL_WHAT_RELATION;
+    // }
 
-	/**
-	 * @param $content_id
-	 * @param $relations
-	 *
-	 * @return void
-	 */
-	public function add_relations( $content_id, $relations ) {
-		if ( $content_id->get_type() !== Object_Type_Enum::POST ) {
-			return;
-		}
+    /**
+     * @param $content_id
+     * @param $relations
+     *
+     * @return void
+     */
+    public function add_relations( $content_id, $relations ) {
+        if ( $content_id->get_type() !== Object_Type_Enum::POST ) {
+            return;
+        }
 
-		$post_id = $content_id->get_id();
-		// @@todo, add a filter here?
-		$taxonomies = array( 'category', 'post_tag' );
-		$term_ids   = wp_get_object_terms( $post_id, $taxonomies, array( 'fields' => 'ids' ) );
+        $post_id = $content_id->get_id();
+        // @@todo, add a filter here?
+        $taxonomies = array( 'category', 'post_tag' );
+        $term_ids   = wp_get_object_terms( $post_id, $taxonomies, array( 'fields' => 'ids' ) );
 
-		$new_relations = array_map(
-			function ( $term_id ) use ( $content_id ) {
-				$object_id = Wordpress_Content_Id::create_term( $term_id );
+        $new_relations = array_map(
+            function ( $term_id ) use ( $content_id ) {
+                $object_id = Wordpress_Content_Id::create_term( $term_id );
 
-				// @@todo Entity Service works only for posts, we default to `WHAT` as predicate
-				// for terms.
-				return new Relation( $content_id, $object_id, WL_WHAT_RELATION );
-			},
-			$term_ids
-		);
+                // @@todo Entity Service works only for posts, we default to `WHAT` as predicate
+                // for terms.
+                return new Relation( $content_id, $object_id, WL_WHAT_RELATION );
+            },
+            $term_ids
+        );
 
-		$relations->add( ...$new_relations );
-	}
+        $relations->add( ...$new_relations );
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 	 * @return Relation_Service_Interface
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -57,28 +57,28 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_relations( $content_id, $relations ) {
-		if ( $content_id->get_type() !== Object_Type_Enum::POST ) {
+	public function add_relations($content_id, $relations) {
+		if ($content_id->get_type() !== Object_Type_Enum::POST) {
 			return;
 		}
 
 		$post_id = $content_id->get_id();
 		// @@todo, add a filter here?
-		$taxonomies = array( 'category', 'post_tag' );
-		$term_ids   = wp_get_object_terms( $post_id, $taxonomies, array( 'fields' => 'ids' ) );
+		$taxonomies = array('category', 'post_tag');
+		$term_ids   = wp_get_object_terms($post_id, $taxonomies, array('fields' => 'ids'));
 
 		$new_relations = array_map(
-			function ( $term_id ) use ( $content_id ) {
-				$object_id = Wordpress_Content_Id::create_term( $term_id );
+			function($term_id) use ($content_id) {
+				$object_id = Wordpress_Content_Id::create_term($term_id);
 
 				// @@todo Entity Service works only for posts, we default to `WHAT` as predicate
 				// for terms.
-				return new Relation( $content_id, $object_id, WL_WHAT_RELATION );
+				return new Relation($content_id, $object_id, WL_WHAT_RELATION);
 			},
 			$term_ids
 		);
 
-		$relations->add( ...$new_relations );
+		$relations->add(...$new_relations);
 	}
 
 }

src/wordlift/relation/class-relation-instances-relation-service.php

Indentation +37 added lines, -37 removed lines

@@ -15,46 +15,46 @@
 
 class Relation_Instances_Relation_Service extends Abstract_Relation_Service {
 
-	private static $instance = null;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @return Relation_Service_Interface
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * @param Wordpress_Content_Id $content_id
-	 * @param Relations_Interface  $relations
-	 */
-	public function add_relations( $content_id, $relations ) {
-		global $wpdb;
-
-		$results = $wpdb->get_results(
-			$wpdb->prepare(
-				"
+    private static $instance = null;
+
+    /**
+     * The singleton instance.
+     *
+     * @return Relation_Service_Interface
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param Wordpress_Content_Id $content_id
+     * @param Relations_Interface  $relations
+     */
+    public function add_relations( $content_id, $relations ) {
+        global $wpdb;
+
+        $results = $wpdb->get_results(
+            $wpdb->prepare(
+                "
 			SELECT subject_id, subject_type, predicate, object_id, object_type
 				FROM {$wpdb->prefix}wl_relation_instances
 				WHERE subject_id = %d AND subject_type = %s
 			",
-				$content_id->get_id(),
-				$content_id->get_type()
-			)
-		);
-
-		$new_relations = array_map(
-			'Wordlift\Relation\Relation::from_relation_instances',
-			$results
-		);
-
-		$relations->add( ...$new_relations );
-	}
+                $content_id->get_id(),
+                $content_id->get_type()
+            )
+        );
+
+        $new_relations = array_map(
+            'Wordlift\Relation\Relation::from_relation_instances',
+            $results
+        );
+
+        $relations->add( ...$new_relations );
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 	 * @return Relation_Service_Interface
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -34,7 +34,7 @@ 
 	 * @param Wordpress_Content_Id $content_id
 	 * @param Relations_Interface  $relations
 	 */
-	public function add_relations( $content_id, $relations ) {
+	public function add_relations($content_id, $relations) {
 		global $wpdb;
 
 		$results = $wpdb->get_results(
@@ -54,7 +54,7 @@ 
 			$results
 		);
 
-		$relations->add( ...$new_relations );
+		$relations->add(...$new_relations);
 	}
 
 }

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

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
 
 abstract class Abstract_Relation_Service implements Relation_Service_Interface {
 
-	protected function __construct() {
+    protected function __construct() {
 
-	}
+    }
 
-	/**
-	 * A default implementation for the `get_relations` method that creates `Relations` instance
-	 * and populates it with `Relation`s.
-	 *
-	 * @param Wordpress_Content_Id $content_id The WordPress content id.
-	 *
-	 * @return Relations_Interface A `Relations` instance.
-	 */
-	public function get_relations( $content_id ) {
-		$relations = new Relations();
+    /**
+     * A default implementation for the `get_relations` method that creates `Relations` instance
+     * and populates it with `Relation`s.
+     *
+     * @param Wordpress_Content_Id $content_id The WordPress content id.
+     *
+     * @return Relations_Interface A `Relations` instance.
+     */
+    public function get_relations( $content_id ) {
+        $relations = new Relations();
 
-		$this->add_relations( $content_id, $relations );
+        $this->add_relations( $content_id, $relations );
 
-		return $relations;
-	}
+        return $relations;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -18,10 +18,10 @@
 	 *
 	 * @return Relations_Interface A `Relations` instance.
 	 */
-	public function get_relations( $content_id ) {
+	public function get_relations($content_id) {
 		$relations = new Relations();
 
-		$this->add_relations( $content_id, $relations );
+		$this->add_relations($content_id, $relations);
 
 		return $relations;
 	}