insideout10 / wordlift-plugin

src/wordlift/jsonld/class-graph.php

Indentation +147 added lines, -147 removed lines

@@ -14,152 +14,152 @@
  */
 class Graph {
 
-	/**
-	 * A single item in jsonld ( associative array )
-	 *
-	 * @var array
-	 */
-	private $main_jsonld;
-
-	/**
-	 * @var array<Content_Id>
-	 */
-	private $referenced_content_ids = array();
-	/**
-	 * @var \Wordlift_Post_Converter
-	 */
-	private $post_converter;
-	/**
-	 * @var \Wordlift_Term_JsonLd_Adapter
-	 */
-	private $term_converter;
-
-	public function __construct( $main_jsonld, $post_converter, $term_converter ) {
-		$this->main_jsonld    = $main_jsonld;
-		$this->post_converter = $post_converter;
-		$this->term_converter = $term_converter;
-	}
-
-	public function set_main_jsonld( $main_jsonld ) {
-		$this->main_jsonld = $main_jsonld;
-	}
-
-	public function get_main_jsonld() {
-		return $this->main_jsonld;
-	}
-
-	/**
-	 * @param $references array<int>
-	 *
-	 * @return Graph
-	 */
-	public function add_references( $refs ) {
-		Assertions::is_array( $refs );
-
-		foreach ( $refs as $ref ) {
-			$this->referenced_content_ids[] = Wordpress_Content_Id::create_post( $ref );
-		}
-		return $this;
-	}
-
-	/**
-	 * @param $reference_infos array
-	 *     Structure: [
-	 *         [
-	 *             'reference' => \Wordlift_Property_Entity_Reference,
-	 *         ],
-	 *         // more array items ...
-	 *     ]
-	 *
-	 * @return Graph
-	 */
-	public function add_required_reference_infos( $references_infos ) {
-
-		/**
-		 * @var $required_references array<\Wordlift_Property_Entity_Reference>
-		 */
-		$required_references = array_filter(
-			$references_infos,
-			function ( $item ) {
-				return isset( $item['reference'] ) &&
-					   // Check that the reference is required
-					   $item['reference']->get_required();
-			}
-		);
-
-		foreach ( $required_references as $required_reference ) {
-			$this->referenced_content_ids[] = new Wordpress_Content_Id(
-				$required_reference->get_id(),
-				$required_reference->get_type()
-			);
-		}
-		return $this;
-
-	}
-
-	/**
-	 * @param $relations Relations
-	 *
-	 * @return Graph
-	 */
-	public function add_relations( $relations ) {
-
-		foreach ( $relations->toArray() as $relation ) {
-
-			$this->referenced_content_ids[] = $relation->get_object();
-
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param $content_id Wordpress_Content_Id
-	 * @param $context int
-	 * @return array|bool
-	 */
-	private function expand( $content_id, $context ) {
-		$object_id   = $content_id->get_id();
-		$object_type = $content_id->get_type();
-
-		if ( $object_type === Object_Type_Enum::POST ) {
-			$references     = array();
-			$reference_info = array();
-			$relations      = new Relations();
-			return $this->post_converter->convert( $object_id, $references, $reference_info, $relations );
-		} elseif ( $object_type === Object_Type_Enum::TERM ) {
-			// Skip the Uncategorized term.
-			if ( 1 === $object_id ) {
-				return false;
-			}
-			return current( $this->term_converter->get( $object_id, $context ) );
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param $context int Instance of Jsonld_Context_Enum
-	 *
-	 * @return array
-	 */
-	public function render( $context ) {
-
-		/**
-		 * This is possible because the toString() method of
-		 * Wordpress_Content_Id is used to get the unique value.
-		 */
-		$unique_content_ids = array_unique( $this->referenced_content_ids, SORT_STRING );
-
-		$result = array( $this->main_jsonld );
-
-		foreach ( $unique_content_ids as $unique_content_id ) {
-			$result[] = $this->expand( $unique_content_id, $context );
-		}
-
-		// Filter out the false and empty results.
-		return array_filter( $result );
-
-	}
+    /**
+     * A single item in jsonld ( associative array )
+     *
+     * @var array
+     */
+    private $main_jsonld;
+
+    /**
+     * @var array<Content_Id>
+     */
+    private $referenced_content_ids = array();
+    /**
+     * @var \Wordlift_Post_Converter
+     */
+    private $post_converter;
+    /**
+     * @var \Wordlift_Term_JsonLd_Adapter
+     */
+    private $term_converter;
+
+    public function __construct( $main_jsonld, $post_converter, $term_converter ) {
+        $this->main_jsonld    = $main_jsonld;
+        $this->post_converter = $post_converter;
+        $this->term_converter = $term_converter;
+    }
+
+    public function set_main_jsonld( $main_jsonld ) {
+        $this->main_jsonld = $main_jsonld;
+    }
+
+    public function get_main_jsonld() {
+        return $this->main_jsonld;
+    }
+
+    /**
+     * @param $references array<int>
+     *
+     * @return Graph
+     */
+    public function add_references( $refs ) {
+        Assertions::is_array( $refs );
+
+        foreach ( $refs as $ref ) {
+            $this->referenced_content_ids[] = Wordpress_Content_Id::create_post( $ref );
+        }
+        return $this;
+    }
+
+    /**
+     * @param $reference_infos array
+     *     Structure: [
+     *         [
+     *             'reference' => \Wordlift_Property_Entity_Reference,
+     *         ],
+     *         // more array items ...
+     *     ]
+     *
+     * @return Graph
+     */
+    public function add_required_reference_infos( $references_infos ) {
+
+        /**
+         * @var $required_references array<\Wordlift_Property_Entity_Reference>
+         */
+        $required_references = array_filter(
+            $references_infos,
+            function ( $item ) {
+                return isset( $item['reference'] ) &&
+                       // Check that the reference is required
+                       $item['reference']->get_required();
+            }
+        );
+
+        foreach ( $required_references as $required_reference ) {
+            $this->referenced_content_ids[] = new Wordpress_Content_Id(
+                $required_reference->get_id(),
+                $required_reference->get_type()
+            );
+        }
+        return $this;
+
+    }
+
+    /**
+     * @param $relations Relations
+     *
+     * @return Graph
+     */
+    public function add_relations( $relations ) {
+
+        foreach ( $relations->toArray() as $relation ) {
+
+            $this->referenced_content_ids[] = $relation->get_object();
+
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param $content_id Wordpress_Content_Id
+     * @param $context int
+     * @return array|bool
+     */
+    private function expand( $content_id, $context ) {
+        $object_id   = $content_id->get_id();
+        $object_type = $content_id->get_type();
+
+        if ( $object_type === Object_Type_Enum::POST ) {
+            $references     = array();
+            $reference_info = array();
+            $relations      = new Relations();
+            return $this->post_converter->convert( $object_id, $references, $reference_info, $relations );
+        } elseif ( $object_type === Object_Type_Enum::TERM ) {
+            // Skip the Uncategorized term.
+            if ( 1 === $object_id ) {
+                return false;
+            }
+            return current( $this->term_converter->get( $object_id, $context ) );
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param $context int Instance of Jsonld_Context_Enum
+     *
+     * @return array
+     */
+    public function render( $context ) {
+
+        /**
+         * This is possible because the toString() method of
+         * Wordpress_Content_Id is used to get the unique value.
+         */
+        $unique_content_ids = array_unique( $this->referenced_content_ids, SORT_STRING );
+
+        $result = array( $this->main_jsonld );
+
+        foreach ( $unique_content_ids as $unique_content_id ) {
+            $result[] = $this->expand( $unique_content_id, $context );
+        }
+
+        // Filter out the false and empty results.
+        return array_filter( $result );
+
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -34,13 +34,13 @@ 
 	 */
 	private $term_converter;
 
-	public function __construct( $main_jsonld, $post_converter, $term_converter ) {
+	public function __construct($main_jsonld, $post_converter, $term_converter) {
 		$this->main_jsonld    = $main_jsonld;
 		$this->post_converter = $post_converter;
 		$this->term_converter = $term_converter;
 	}
 
-	public function set_main_jsonld( $main_jsonld ) {
+	public function set_main_jsonld($main_jsonld) {
 		$this->main_jsonld = $main_jsonld;
 	}
 
@@ -53,11 +53,11 @@ 
 	 *
 	 * @return Graph
 	 */
-	public function add_references( $refs ) {
-		Assertions::is_array( $refs );
+	public function add_references($refs) {
+		Assertions::is_array($refs);
 
-		foreach ( $refs as $ref ) {
-			$this->referenced_content_ids[] = Wordpress_Content_Id::create_post( $ref );
+		foreach ($refs as $ref) {
+			$this->referenced_content_ids[] = Wordpress_Content_Id::create_post($ref);
 		}
 		return $this;
 	}
@@ -73,21 +73,21 @@ 
 	 *
 	 * @return Graph
 	 */
-	public function add_required_reference_infos( $references_infos ) {
+	public function add_required_reference_infos($references_infos) {
 
 		/**
 		 * @var $required_references array<\Wordlift_Property_Entity_Reference>
 		 */
 		$required_references = array_filter(
 			$references_infos,
-			function ( $item ) {
-				return isset( $item['reference'] ) &&
+			function($item) {
+				return isset($item['reference']) &&
 					   // Check that the reference is required
 					   $item['reference']->get_required();
 			}
 		);
 
-		foreach ( $required_references as $required_reference ) {
+		foreach ($required_references as $required_reference) {
 			$this->referenced_content_ids[] = new Wordpress_Content_Id(
 				$required_reference->get_id(),
 				$required_reference->get_type()
@@ -102,9 +102,9 @@ 
 	 *
 	 * @return Graph
 	 */
-	public function add_relations( $relations ) {
+	public function add_relations($relations) {
 
-		foreach ( $relations->toArray() as $relation ) {
+		foreach ($relations->toArray() as $relation) {
 
 			$this->referenced_content_ids[] = $relation->get_object();
 
@@ -118,21 +118,21 @@ 
 	 * @param $context int
 	 * @return array|bool
 	 */
-	private function expand( $content_id, $context ) {
+	private function expand($content_id, $context) {
 		$object_id   = $content_id->get_id();
 		$object_type = $content_id->get_type();
 
-		if ( $object_type === Object_Type_Enum::POST ) {
+		if ($object_type === Object_Type_Enum::POST) {
 			$references     = array();
 			$reference_info = array();
 			$relations      = new Relations();
-			return $this->post_converter->convert( $object_id, $references, $reference_info, $relations );
-		} elseif ( $object_type === Object_Type_Enum::TERM ) {
+			return $this->post_converter->convert($object_id, $references, $reference_info, $relations);
+		} elseif ($object_type === Object_Type_Enum::TERM) {
 			// Skip the Uncategorized term.
-			if ( 1 === $object_id ) {
+			if (1 === $object_id) {
 				return false;
 			}
-			return current( $this->term_converter->get( $object_id, $context ) );
+			return current($this->term_converter->get($object_id, $context));
 		} else {
 			return false;
 		}
@@ -143,22 +143,22 @@ 
 	 *
 	 * @return array
 	 */
-	public function render( $context ) {
+	public function render($context) {
 
 		/**
 		 * This is possible because the toString() method of
 		 * Wordpress_Content_Id is used to get the unique value.
 		 */
-		$unique_content_ids = array_unique( $this->referenced_content_ids, SORT_STRING );
+		$unique_content_ids = array_unique($this->referenced_content_ids, SORT_STRING);
 
-		$result = array( $this->main_jsonld );
+		$result = array($this->main_jsonld);
 
-		foreach ( $unique_content_ids as $unique_content_id ) {
-			$result[] = $this->expand( $unique_content_id, $context );
+		foreach ($unique_content_ids as $unique_content_id) {
+			$result[] = $this->expand($unique_content_id, $context);
 		}
 
 		// Filter out the false and empty results.
-		return array_filter( $result );
+		return array_filter($result);
 
 	}
 

src/includes/class-wordlift-abstract-post-to-jsonld-converter.php

Indentation +437 added lines, -437 removed lines

@@ -24,122 +24,122 @@ 
  */
 abstract class Wordlift_Abstract_Post_To_Jsonld_Converter implements Wordlift_Post_Converter {
 
-	/**
-	 * The JSON-LD context.
-	 *
-	 * @since 3.10.0
-	 */
-	const CONTEXT = 'http://schema.org';
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	protected $entity_type_service;
-
-	/**
-	 * A {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
-	 */
-	protected $user_service;
-
-	/**
-	 * A {@link Wordlift_Attachment_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 */
-	protected $attachment_service;
-
-	/**
-	 * @var Wordlift_Property_Getter
-	 */
-	private $property_getter;
-
-	/**
-	 * @var Relation_Service_Interface
-	 */
-	private $relation_service;
-
-	/**
-	 * Wordlift_Post_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_User_Service        $user_service A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service  $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Property_Getter     $property_getter
-	 *
-	 * @since 3.10.0
-	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
-		$this->entity_type_service = $entity_type_service;
-		$this->user_service        = $user_service;
-		$this->attachment_service  = $attachment_service;
-		$this->property_getter     = $property_getter;
-
-		$this->relation_service = Relation_Service::get_instance();
-
-	}
-
-	/**
-	 * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
-	 * found while processing the post is set in the $references array.
-	 *
-	 * @param int $post_id The post id.
-	 * @param array $references An array of entity references.
-	 * @param array $relations
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.0
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
-
-		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the post URI @id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-		if ( $id === null ) {
-			$id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
-		}
-
-		/*
+    /**
+     * The JSON-LD context.
+     *
+     * @since 3.10.0
+     */
+    const CONTEXT = 'http://schema.org';
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    protected $entity_type_service;
+
+    /**
+     * A {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
+     */
+    protected $user_service;
+
+    /**
+     * A {@link Wordlift_Attachment_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     */
+    protected $attachment_service;
+
+    /**
+     * @var Wordlift_Property_Getter
+     */
+    private $property_getter;
+
+    /**
+     * @var Relation_Service_Interface
+     */
+    private $relation_service;
+
+    /**
+     * Wordlift_Post_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_User_Service        $user_service A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service  $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Property_Getter     $property_getter
+     *
+     * @since 3.10.0
+     */
+    public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
+        $this->entity_type_service = $entity_type_service;
+        $this->user_service        = $user_service;
+        $this->attachment_service  = $attachment_service;
+        $this->property_getter     = $property_getter;
+
+        $this->relation_service = Relation_Service::get_instance();
+
+    }
+
+    /**
+     * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
+     * found while processing the post is set in the $references array.
+     *
+     * @param int $post_id The post id.
+     * @param array $references An array of entity references.
+     * @param array $relations
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.0
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+
+        // Get the post instance.
+        $post = get_post( $post_id );
+        if ( null === $post ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the post URI @id.
+        $id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
+        if ( $id === null ) {
+            $id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
+        }
+
+        /*
 		 * The `types` variable holds one or more entity types. The `type` variable isn't used anymore.
 		 *
 		 * @since 3.20.0 We support more than one entity type.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		// Get the entity @type. We consider `post` BlogPostings.
-		// $type = $this->entity_type_service->get( $post_id );
-		$types = $this->entity_type_service->get_names( $post_id );
-		$type  = self::make_one( $types );
-
-		// Prepare the response.
-		$jsonld = array(
-			'@context' => self::CONTEXT,
-			'@id'      => $id,
-			'@type'    => $type,
-		);
-
-		if ( post_type_supports( $post->post_type, 'excerpt' ) ) {
-			$jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post );
-		}
-
-		// Set the `mainEntityOfPage` property if the post has some contents.
-		/*
+        // Get the entity @type. We consider `post` BlogPostings.
+        // $type = $this->entity_type_service->get( $post_id );
+        $types = $this->entity_type_service->get_names( $post_id );
+        $type  = self::make_one( $types );
+
+        // Prepare the response.
+        $jsonld = array(
+            '@context' => self::CONTEXT,
+            '@id'      => $id,
+            '@type'    => $type,
+        );
+
+        if ( post_type_supports( $post->post_type, 'excerpt' ) ) {
+            $jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post );
+        }
+
+        // Set the `mainEntityOfPage` property if the post has some contents.
+        /*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
 		 * because the content is written elsewhere.
 		 *
@@ -147,336 +147,336 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		if ( ! empty( $post_content ) || in_array( 'Product', (array) $type, true ) ) {
-			// We're setting the `mainEntityOfPage` to signal which one is the
-			// main entity for the specified URL. It might be however that the
-			// post/page is actually about another specific entity. How WL deals
-			// with that hasn't been defined yet (see https://github.com/insideout10/wordlift-plugin/issues/451).
-			//
-			// See http://schema.org/mainEntityOfPage
-			//
-			// No need to specify `'@type' => 'WebPage'.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/451.
-			$jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
-
-			/**
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/1207
-			 *
-			 * @since 3.27.7
-			 */
-			if ( in_array(
-				$type,
-				array(
-					'Occupation',
-					'OccupationAggregationByEmployer',
-				),
-				true
-			) ) {
-				$jsonld['mainEntityOfPage'] = array(
-					'@type'        => 'WebPage',
-					'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false ),
-				);
-			}
-		};
-
-		$this->set_images( $this->attachment_service, $post, $jsonld );
-
-		// Naveen: Get the entities referenced by this post and set it to the `references`
-		// array so that the caller can do further processing, such as printing out
-		// more of those references.
-		//
-		// David: you can't set this to the `references`, because `references` it's an array of post
-		// IDs and client are using this. As of 3.42.1 (2023-04-20) I am refactoring this to use a
-		// new variable $relations.
-		// ** @var Object_Relation_Service $object_relation_service */
-		// $object_relation_service      = Object_Relation_Service::get_instance();
-		// $references_without_locations = $object_relation_service->get_references( $post_id, Object_Type_Enum::POST );
-
-		$content_id = Wordpress_Content_Id::create_post( $post_id );
-		// Populate the relations.
-		$this->relation_service->add_relations( $content_id, $relations );
-		// We copy the relations to the legacy references array. Please note that the references
-		// array contains only post IDs, while Relations may contain other content types (e.g.
-		// terms).
-		$this->add_relations_to_references( $relations, $references );
-
-		return $jsonld;
-	}
-
-	/**
-	 * Copies the Post relations to referenced post IDs (legacy).
-	 *
-	 * @param Relations $relations
-	 */
-	private function add_relations_to_references( $relations, &$references ) {
-		if ( ! is_a( $relations, 'Wordlift\Relation\Relations' ) ) {
-			return;
-		}
-
-		foreach ( $relations->toArray() as $relation ) {
-			$object    = $relation->get_object();
-			$object_id = $object->get_id();
-			if ( $object->get_type() === Object_Type_Enum::POST && ! in_array( $object_id, $references, true ) ) {
-				$references[] = $object_id;
-			}
-		}
-	}
-
-	// private function add_location_reference_objects() {
-	// array_reduce(
-	// $references_without_locations,
-	// function ( $carry, $reference ) use ( $entity_type_service ) {
-	// **
-	// * @var $reference Reference
-	// */
-	// @see https://schema.org/location for the schema.org types using the `location` property.
-	// if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
-	// && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
-	// && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
-	//
-	// return $carry;
-	// }
-	// $post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
-	// $post_location_references = array_map(
-	// function ( $post_id ) {
-	// return new Post_Reference( $post_id );
-	// },
-	// $post_location_ids
-	// );
-	//
-	// return array_merge( $carry, $post_location_references );
-	// },
-	// array()
-	// );
-	// }
-
-	/**
-	 * If the provided value starts with the schema.org context, we remove the schema.org
-	 * part since it is set with the '@context'.
-	 *
-	 * @param string $value The property value.
-	 *
-	 * @return string The property value without the context.
-	 * @since 3.10.0
-	 */
-	public function relative_to_context( $value ) {
-		return ! is_array( $value ) && 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
-	}
-
-	/**
-	 * Set the images, by looking for embedded images, for images loaded via the
-	 * gallery and for the featured image.
-	 *
-	 * Uses the cache service to store the results of this function for a day.
-	 *
-	 * @param $attachment_service Wordlift_Attachment_Service
-	 * @param WP_Post                                        $post The target {@link WP_Post}.
-	 * @param array                                          $jsonld The JSON-LD array.
-	 *
-	 * @since 3.10.0
-	 */
-	public static function set_images( $attachment_service, $post, &$jsonld ) {
-
-		// Prepare the attachment ids array.
-		$ids = array();
-
-		// Set the thumbnail id as first attachment id, if any.
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$ids[] = $thumbnail_id;
-		}
-
-		// For the time being the following is being removed since the query
-		// initiated by `get_image_embeds` is consuming lots of CPU.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/689.
-		//
-		// Get the embeds, removing existing ids.
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
-			$embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
-		} else {
-			$embeds = array();
-		}
-
-		// Get the gallery, removing existing ids.
-		$gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
-
-		// Map the attachment ids to images' data structured for schema.org use.
-		$images_with_sizes = array_filter(
-			array_reduce(
-				array_merge( $ids, $embeds, $gallery ),
-				function ( $carry, $item ) {
-					/*
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        if ( ! empty( $post_content ) || in_array( 'Product', (array) $type, true ) ) {
+            // We're setting the `mainEntityOfPage` to signal which one is the
+            // main entity for the specified URL. It might be however that the
+            // post/page is actually about another specific entity. How WL deals
+            // with that hasn't been defined yet (see https://github.com/insideout10/wordlift-plugin/issues/451).
+            //
+            // See http://schema.org/mainEntityOfPage
+            //
+            // No need to specify `'@type' => 'WebPage'.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/451.
+            $jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
+
+            /**
+             * @see https://github.com/insideout10/wordlift-plugin/issues/1207
+             *
+             * @since 3.27.7
+             */
+            if ( in_array(
+                $type,
+                array(
+                    'Occupation',
+                    'OccupationAggregationByEmployer',
+                ),
+                true
+            ) ) {
+                $jsonld['mainEntityOfPage'] = array(
+                    '@type'        => 'WebPage',
+                    'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false ),
+                );
+            }
+        };
+
+        $this->set_images( $this->attachment_service, $post, $jsonld );
+
+        // Naveen: Get the entities referenced by this post and set it to the `references`
+        // array so that the caller can do further processing, such as printing out
+        // more of those references.
+        //
+        // David: you can't set this to the `references`, because `references` it's an array of post
+        // IDs and client are using this. As of 3.42.1 (2023-04-20) I am refactoring this to use a
+        // new variable $relations.
+        // ** @var Object_Relation_Service $object_relation_service */
+        // $object_relation_service      = Object_Relation_Service::get_instance();
+        // $references_without_locations = $object_relation_service->get_references( $post_id, Object_Type_Enum::POST );
+
+        $content_id = Wordpress_Content_Id::create_post( $post_id );
+        // Populate the relations.
+        $this->relation_service->add_relations( $content_id, $relations );
+        // We copy the relations to the legacy references array. Please note that the references
+        // array contains only post IDs, while Relations may contain other content types (e.g.
+        // terms).
+        $this->add_relations_to_references( $relations, $references );
+
+        return $jsonld;
+    }
+
+    /**
+     * Copies the Post relations to referenced post IDs (legacy).
+     *
+     * @param Relations $relations
+     */
+    private function add_relations_to_references( $relations, &$references ) {
+        if ( ! is_a( $relations, 'Wordlift\Relation\Relations' ) ) {
+            return;
+        }
+
+        foreach ( $relations->toArray() as $relation ) {
+            $object    = $relation->get_object();
+            $object_id = $object->get_id();
+            if ( $object->get_type() === Object_Type_Enum::POST && ! in_array( $object_id, $references, true ) ) {
+                $references[] = $object_id;
+            }
+        }
+    }
+
+    // private function add_location_reference_objects() {
+    // array_reduce(
+    // $references_without_locations,
+    // function ( $carry, $reference ) use ( $entity_type_service ) {
+    // **
+    // * @var $reference Reference
+    // */
+    // @see https://schema.org/location for the schema.org types using the `location` property.
+    // if ( ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Action' )
+    // && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Event' )
+    // && ! $entity_type_service->has_entity_type( $reference->get_id(), 'http://schema.org/Organization' ) ) {
+    //
+    // return $carry;
+    // }
+    // $post_location_ids        = get_post_meta( $reference->get_id(), Wordlift_Schema_Service::FIELD_LOCATION );
+    // $post_location_references = array_map(
+    // function ( $post_id ) {
+    // return new Post_Reference( $post_id );
+    // },
+    // $post_location_ids
+    // );
+    //
+    // return array_merge( $carry, $post_location_references );
+    // },
+    // array()
+    // );
+    // }
+
+    /**
+     * If the provided value starts with the schema.org context, we remove the schema.org
+     * part since it is set with the '@context'.
+     *
+     * @param string $value The property value.
+     *
+     * @return string The property value without the context.
+     * @since 3.10.0
+     */
+    public function relative_to_context( $value ) {
+        return ! is_array( $value ) && 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
+    }
+
+    /**
+     * Set the images, by looking for embedded images, for images loaded via the
+     * gallery and for the featured image.
+     *
+     * Uses the cache service to store the results of this function for a day.
+     *
+     * @param $attachment_service Wordlift_Attachment_Service
+     * @param WP_Post                                        $post The target {@link WP_Post}.
+     * @param array                                          $jsonld The JSON-LD array.
+     *
+     * @since 3.10.0
+     */
+    public static function set_images( $attachment_service, $post, &$jsonld ) {
+
+        // Prepare the attachment ids array.
+        $ids = array();
+
+        // Set the thumbnail id as first attachment id, if any.
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+            $ids[] = $thumbnail_id;
+        }
+
+        // For the time being the following is being removed since the query
+        // initiated by `get_image_embeds` is consuming lots of CPU.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/689.
+        //
+        // Get the embeds, removing existing ids.
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
+            $embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
+        } else {
+            $embeds = array();
+        }
+
+        // Get the gallery, removing existing ids.
+        $gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
+
+        // Map the attachment ids to images' data structured for schema.org use.
+        $images_with_sizes = array_filter(
+            array_reduce(
+                array_merge( $ids, $embeds, $gallery ),
+                function ( $carry, $item ) {
+                    /*
 					* @todo: we're not sure that we're getting attachment data here, we
 					* should filter `false`s.
 					*/
 
-					$sources = array_merge(
-						Wordlift_Image_Service::get_sources( $item ),
-						array( wp_get_attachment_image_src( $item, 'full' ) )
-					);
-
-					$sources_with_image = array_filter(
-						$sources,
-						function ( $source ) {
-							return ! empty( $source[0] );
-						}
-					);
-
-					// Get the attachment data.
-					// $attachment = wp_get_attachment_image_src( $item, 'full' );
-
-					// var_dump( array( "sources-$item" => Wordlift_Image_Service::get_sources( $item ) ) );
-
-					// Bail if image is not found.
-					// In some cases, you can delete the image from the database
-					// or from uploads dir, but the image id still exists as featured image
-					// or in [gallery] shortcode.
-					// if ( empty( $attachment[0] ) ) {
-					if ( empty( $sources_with_image ) ) {
-						return $carry;
-					}
-
-					// Merge the arrays.
-					return array_merge(
-						$carry,
-						$sources_with_image
-					);
-				},
-				// Initial array.
-
-				array()
-			)
-		);
-
-		// Refactor data as per schema.org specifications.
-		$images = array_map(
-			function ( $attachment ) {
-				return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
-					array(
-						'@type' => 'ImageObject',
-						'url'   => $attachment[0],
-					),
-					$attachment
-				);
-			},
-			$images_with_sizes
-		);
-
-		// Add images if present.
-		if ( 0 < count( $images ) ) {
-			$jsonld['image'] = $images;
-		}
-
-	}
-
-	/**
-	 * If the provided array of values contains only one value, then one single
-	 * value is returned, otherwise the original array is returned.
-	 *
-	 * @param array $value An array of values.
-	 *
-	 * @return mixed|array A single value or the original array.
-	 * @since 3.20.0 The function has been moved from {@link Wordlift_Entity_Post_To_Jsonld_Converter} to
-	 *  {@link Wordlift_Abstract_Post_To_Jsonld_Converter}.
-	 * @since  3.8.0
-	 * @access private
-	 */
-	protected static function make_one( $value ) {
-
-		return 1 === count( $value ) ? $value[0] : $value;
-	}
-
-	/**
-	 * Process the provided array by adding the width / height if the values
-	 * are available and are greater than 0.
-	 *
-	 * @param array $image The `ImageObject` array.
-	 * @param array $attachment The attachment array.
-	 *
-	 * @return array The enriched `ImageObject` array.
-	 * @since 3.14.0
-	 */
-	public static function set_image_size( $image, $attachment ) {
-
-		// If you specify a "width" or "height" value you should leave out
-		// 'px'. For example: "width":"4608px" should be "width":"4608".
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
-			$image['width'] = $attachment[1];
-		}
-
-		if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
-			$image['height'] = $attachment[2];
-		}
-
-		return $image;
-	}
-
-	/**
-	 * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
-	 * for the post entity type.
-	 *
-	 * @param array   $jsonld The JSON-LD array.
-	 * @param array   $fields The entity types field array.
-	 * @param WP_Post $post The target {@link WP_Post} instance.
-	 * @param array   $references The references array.
-	 *
-	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
-	 *  the {@link Wordlift_Schema_Service} class.
-	 */
-	protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
-
-		// Set a reference to use in closures.
-		$converter = $this;
-
-		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
-
-			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
-
-			// Get the value, the property service will get the right extractor
-			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
-
-			if ( empty( $value ) ) {
-				continue;
-			}
-
-			// Map the value to the property name.
-			// If we got an array with just one value, we return that one value.
-			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one(
-				array_map(
-					function ( $item ) use ( $converter, &$references, &$references_infos ) {
-
-						if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-
-							$url = $item->get_url();
-
-							// The refactored converters require the entity id.
-							// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-							$references[] = $item->to_reference();
-
-							// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-							$references_infos[] = array( 'reference' => $item );
-
-							return array( '@id' => $url );
-						}
-
-						return $converter->relative_to_context( $item );
-					},
-					$value
-				)
-			);
-
-		}
-
-	}
+                    $sources = array_merge(
+                        Wordlift_Image_Service::get_sources( $item ),
+                        array( wp_get_attachment_image_src( $item, 'full' ) )
+                    );
+
+                    $sources_with_image = array_filter(
+                        $sources,
+                        function ( $source ) {
+                            return ! empty( $source[0] );
+                        }
+                    );
+
+                    // Get the attachment data.
+                    // $attachment = wp_get_attachment_image_src( $item, 'full' );
+
+                    // var_dump( array( "sources-$item" => Wordlift_Image_Service::get_sources( $item ) ) );
+
+                    // Bail if image is not found.
+                    // In some cases, you can delete the image from the database
+                    // or from uploads dir, but the image id still exists as featured image
+                    // or in [gallery] shortcode.
+                    // if ( empty( $attachment[0] ) ) {
+                    if ( empty( $sources_with_image ) ) {
+                        return $carry;
+                    }
+
+                    // Merge the arrays.
+                    return array_merge(
+                        $carry,
+                        $sources_with_image
+                    );
+                },
+                // Initial array.
+
+                array()
+            )
+        );
+
+        // Refactor data as per schema.org specifications.
+        $images = array_map(
+            function ( $attachment ) {
+                return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
+                    array(
+                        '@type' => 'ImageObject',
+                        'url'   => $attachment[0],
+                    ),
+                    $attachment
+                );
+            },
+            $images_with_sizes
+        );
+
+        // Add images if present.
+        if ( 0 < count( $images ) ) {
+            $jsonld['image'] = $images;
+        }
+
+    }
+
+    /**
+     * If the provided array of values contains only one value, then one single
+     * value is returned, otherwise the original array is returned.
+     *
+     * @param array $value An array of values.
+     *
+     * @return mixed|array A single value or the original array.
+     * @since 3.20.0 The function has been moved from {@link Wordlift_Entity_Post_To_Jsonld_Converter} to
+     *  {@link Wordlift_Abstract_Post_To_Jsonld_Converter}.
+     * @since  3.8.0
+     * @access private
+     */
+    protected static function make_one( $value ) {
+
+        return 1 === count( $value ) ? $value[0] : $value;
+    }
+
+    /**
+     * Process the provided array by adding the width / height if the values
+     * are available and are greater than 0.
+     *
+     * @param array $image The `ImageObject` array.
+     * @param array $attachment The attachment array.
+     *
+     * @return array The enriched `ImageObject` array.
+     * @since 3.14.0
+     */
+    public static function set_image_size( $image, $attachment ) {
+
+        // If you specify a "width" or "height" value you should leave out
+        // 'px'. For example: "width":"4608px" should be "width":"4608".
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/451.
+        if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
+            $image['width'] = $attachment[1];
+        }
+
+        if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
+            $image['height'] = $attachment[2];
+        }
+
+        return $image;
+    }
+
+    /**
+     * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
+     * for the post entity type.
+     *
+     * @param array   $jsonld The JSON-LD array.
+     * @param array   $fields The entity types field array.
+     * @param WP_Post $post The target {@link WP_Post} instance.
+     * @param array   $references The references array.
+     *
+     * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
+     *  the {@link Wordlift_Schema_Service} class.
+     */
+    protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
+
+        // Set a reference to use in closures.
+        $converter = $this;
+
+        // Try each field on the entity.
+        foreach ( $fields as $key => $value ) {
+
+            // Get the predicate.
+            $name = $this->relative_to_context( $value['predicate'] );
+
+            // Get the value, the property service will get the right extractor
+            // for that property.
+            $value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
+
+            if ( empty( $value ) ) {
+                continue;
+            }
+
+            // Map the value to the property name.
+            // If we got an array with just one value, we return that one value.
+            // If we got a Wordlift_Property_Entity_Reference we get the URL.
+            $jsonld[ $name ] = self::make_one(
+                array_map(
+                    function ( $item ) use ( $converter, &$references, &$references_infos ) {
+
+                        if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+
+                            $url = $item->get_url();
+
+                            // The refactored converters require the entity id.
+                            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                            $references[] = $item->to_reference();
+
+                            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                            $references_infos[] = array( 'reference' => $item );
+
+                            return array( '@id' => $url );
+                        }
+
+                        return $converter->relative_to_context( $item );
+                    },
+                    $value
+                )
+            );
+
+        }
+
+    }
 
 }

Spacing +58 added lines, -58 removed lines

@@ -78,7 +78,7 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter ) {
+	public function __construct($entity_type_service, $user_service, $attachment_service, $property_getter) {
 		$this->entity_type_service = $entity_type_service;
 		$this->user_service        = $user_service;
 		$this->attachment_service  = $attachment_service;
@@ -100,19 +100,19 @@ 
 	 * @since 3.10.0
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array(), $relations = null) {
 
 		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
+		$post = get_post($post_id);
+		if (null === $post) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the post URI @id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-		if ( $id === null ) {
-			$id = 'get_uri returned null, dataset is ' . wl_configuration_get_redlink_dataset_uri();
+		$id = Wordlift_Entity_Service::get_instance()->get_uri($post->ID);
+		if ($id === null) {
+			$id = 'get_uri returned null, dataset is '.wl_configuration_get_redlink_dataset_uri();
 		}
 
 		/*
@@ -124,8 +124,8 @@ 
 		 */
 		// Get the entity @type. We consider `post` BlogPostings.
 		// $type = $this->entity_type_service->get( $post_id );
-		$types = $this->entity_type_service->get_names( $post_id );
-		$type  = self::make_one( $types );
+		$types = $this->entity_type_service->get_names($post_id);
+		$type  = self::make_one($types);
 
 		// Prepare the response.
 		$jsonld = array(
@@ -134,8 +134,8 @@ 
 			'@type'    => $type,
 		);
 
-		if ( post_type_supports( $post->post_type, 'excerpt' ) ) {
-			$jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post );
+		if (post_type_supports($post->post_type, 'excerpt')) {
+			$jsonld['description'] = Wordlift_Post_Excerpt_Helper::get_text_excerpt($post);
 		}
 
 		// Set the `mainEntityOfPage` property if the post has some contents.
@@ -147,8 +147,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		if ( ! empty( $post_content ) || in_array( 'Product', (array) $type, true ) ) {
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
+		if ( ! empty($post_content) || in_array('Product', (array) $type, true)) {
 			// We're setting the `mainEntityOfPage` to signal which one is the
 			// main entity for the specified URL. It might be however that the
 			// post/page is actually about another specific entity. How WL deals
@@ -159,29 +159,29 @@ 
 			// No need to specify `'@type' => 'WebPage'.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/451.
-			$jsonld['mainEntityOfPage'] = get_the_permalink( $post->ID );
+			$jsonld['mainEntityOfPage'] = get_the_permalink($post->ID);
 
 			/**
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/1207
 			 *
 			 * @since 3.27.7
 			 */
-			if ( in_array(
+			if (in_array(
 				$type,
 				array(
 					'Occupation',
 					'OccupationAggregationByEmployer',
 				),
 				true
-			) ) {
+			)) {
 				$jsonld['mainEntityOfPage'] = array(
 					'@type'        => 'WebPage',
-					'lastReviewed' => get_post_time( 'Y-m-d\TH:i:sP', true, $post, false ),
+					'lastReviewed' => get_post_time('Y-m-d\TH:i:sP', true, $post, false),
 				);
 			}
 		};
 
-		$this->set_images( $this->attachment_service, $post, $jsonld );
+		$this->set_images($this->attachment_service, $post, $jsonld);
 
 		// Naveen: Get the entities referenced by this post and set it to the `references`
 		// array so that the caller can do further processing, such as printing out
@@ -194,13 +194,13 @@ 
 		// $object_relation_service      = Object_Relation_Service::get_instance();
 		// $references_without_locations = $object_relation_service->get_references( $post_id, Object_Type_Enum::POST );
 
-		$content_id = Wordpress_Content_Id::create_post( $post_id );
+		$content_id = Wordpress_Content_Id::create_post($post_id);
 		// Populate the relations.
-		$this->relation_service->add_relations( $content_id, $relations );
+		$this->relation_service->add_relations($content_id, $relations);
 		// We copy the relations to the legacy references array. Please note that the references
 		// array contains only post IDs, while Relations may contain other content types (e.g.
 		// terms).
-		$this->add_relations_to_references( $relations, $references );
+		$this->add_relations_to_references($relations, $references);
 
 		return $jsonld;
 	}
@@ -210,15 +210,15 @@ 
 	 *
 	 * @param Relations $relations
 	 */
-	private function add_relations_to_references( $relations, &$references ) {
-		if ( ! is_a( $relations, 'Wordlift\Relation\Relations' ) ) {
+	private function add_relations_to_references($relations, &$references) {
+		if ( ! is_a($relations, 'Wordlift\Relation\Relations')) {
 			return;
 		}
 
-		foreach ( $relations->toArray() as $relation ) {
+		foreach ($relations->toArray() as $relation) {
 			$object    = $relation->get_object();
 			$object_id = $object->get_id();
-			if ( $object->get_type() === Object_Type_Enum::POST && ! in_array( $object_id, $references, true ) ) {
+			if ($object->get_type() === Object_Type_Enum::POST && ! in_array($object_id, $references, true)) {
 				$references[] = $object_id;
 			}
 		}
@@ -261,8 +261,8 @@ 
 	 * @return string The property value without the context.
 	 * @since 3.10.0
 	 */
-	public function relative_to_context( $value ) {
-		return ! is_array( $value ) && 0 === strpos( $value, self::CONTEXT . '/' ) ? substr( $value, strlen( self::CONTEXT ) + 1 ) : $value;
+	public function relative_to_context($value) {
+		return ! is_array($value) && 0 === strpos($value, self::CONTEXT.'/') ? substr($value, strlen(self::CONTEXT) + 1) : $value;
 	}
 
 	/**
@@ -277,14 +277,14 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public static function set_images( $attachment_service, $post, &$jsonld ) {
+	public static function set_images($attachment_service, $post, &$jsonld) {
 
 		// Prepare the attachment ids array.
 		$ids = array();
 
 		// Set the thumbnail id as first attachment id, if any.
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id && 0 !== $thumbnail_id) {
 			$ids[] = $thumbnail_id;
 		}
 
@@ -295,34 +295,34 @@ 
 		//
 		// Get the embeds, removing existing ids.
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__image-embeds', false ) ) {
-			$embeds = array_diff( $attachment_service->get_image_embeds( $post->post_content ), $ids );
+		if (apply_filters('wl_feature__enable__image-embeds', false)) {
+			$embeds = array_diff($attachment_service->get_image_embeds($post->post_content), $ids);
 		} else {
 			$embeds = array();
 		}
 
 		// Get the gallery, removing existing ids.
-		$gallery = array_diff( $attachment_service->get_gallery( $post ), $ids, $embeds );
+		$gallery = array_diff($attachment_service->get_gallery($post), $ids, $embeds);
 
 		// Map the attachment ids to images' data structured for schema.org use.
 		$images_with_sizes = array_filter(
 			array_reduce(
-				array_merge( $ids, $embeds, $gallery ),
-				function ( $carry, $item ) {
+				array_merge($ids, $embeds, $gallery),
+				function($carry, $item) {
 					/*
 					* @todo: we're not sure that we're getting attachment data here, we
 					* should filter `false`s.
 					*/
 
 					$sources = array_merge(
-						Wordlift_Image_Service::get_sources( $item ),
-						array( wp_get_attachment_image_src( $item, 'full' ) )
+						Wordlift_Image_Service::get_sources($item),
+						array(wp_get_attachment_image_src($item, 'full'))
 					);
 
 					$sources_with_image = array_filter(
 						$sources,
-						function ( $source ) {
-							return ! empty( $source[0] );
+						function($source) {
+							return ! empty($source[0]);
 						}
 					);
 
@@ -336,7 +336,7 @@ 
 					// or from uploads dir, but the image id still exists as featured image
 					// or in [gallery] shortcode.
 					// if ( empty( $attachment[0] ) ) {
-					if ( empty( $sources_with_image ) ) {
+					if (empty($sources_with_image)) {
 						return $carry;
 					}
 
@@ -354,7 +354,7 @@ 
 
 		// Refactor data as per schema.org specifications.
 		$images = array_map(
-			function ( $attachment ) {
+			function($attachment) {
 				return Wordlift_Abstract_Post_To_Jsonld_Converter::set_image_size(
 					array(
 						'@type' => 'ImageObject',
@@ -367,7 +367,7 @@ 
 		);
 
 		// Add images if present.
-		if ( 0 < count( $images ) ) {
+		if (0 < count($images)) {
 			$jsonld['image'] = $images;
 		}
 
@@ -385,9 +385,9 @@ 
 	 * @since  3.8.0
 	 * @access private
 	 */
-	protected static function make_one( $value ) {
+	protected static function make_one($value) {
 
-		return 1 === count( $value ) ? $value[0] : $value;
+		return 1 === count($value) ? $value[0] : $value;
 	}
 
 	/**
@@ -400,17 +400,17 @@ 
 	 * @return array The enriched `ImageObject` array.
 	 * @since 3.14.0
 	 */
-	public static function set_image_size( $image, $attachment ) {
+	public static function set_image_size($image, $attachment) {
 
 		// If you specify a "width" or "height" value you should leave out
 		// 'px'. For example: "width":"4608px" should be "width":"4608".
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		if ( isset( $attachment[1] ) && is_numeric( $attachment[1] ) && 0 < $attachment[1] ) {
+		if (isset($attachment[1]) && is_numeric($attachment[1]) && 0 < $attachment[1]) {
 			$image['width'] = $attachment[1];
 		}
 
-		if ( isset( $attachment[2] ) && is_numeric( $attachment[2] ) && 0 < $attachment[2] ) {
+		if (isset($attachment[2]) && is_numeric($attachment[2]) && 0 < $attachment[2]) {
 			$image['height'] = $attachment[2];
 		}
 
@@ -429,33 +429,33 @@ 
 	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
 	 *  the {@link Wordlift_Schema_Service} class.
 	 */
-	protected function process_type_custom_fields( &$jsonld, $fields, $post, &$references, &$references_infos ) {
+	protected function process_type_custom_fields(&$jsonld, $fields, $post, &$references, &$references_infos) {
 
 		// Set a reference to use in closures.
 		$converter = $this;
 
 		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
+		foreach ($fields as $key => $value) {
 
 			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
+			$name = $this->relative_to_context($value['predicate']);
 
 			// Get the value, the property service will get the right extractor
 			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key, Object_Type_Enum::POST );
+			$value = $this->property_getter->get($post->ID, $key, Object_Type_Enum::POST);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				continue;
 			}
 
 			// Map the value to the property name.
 			// If we got an array with just one value, we return that one value.
 			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one(
+			$jsonld[$name] = self::make_one(
 				array_map(
-					function ( $item ) use ( $converter, &$references, &$references_infos ) {
+					function($item) use ($converter, &$references, &$references_infos) {
 
-						if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+						if ($item instanceof Wordlift_Property_Entity_Reference) {
 
 							$url = $item->get_url();
 
@@ -464,12 +464,12 @@ 
 							$references[] = $item->to_reference();
 
 							// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-							$references_infos[] = array( 'reference' => $item );
+							$references_infos[] = array('reference' => $item);
 
-							return array( '@id' => $url );
+							return array('@id' => $url);
 						}
 
-						return $converter->relative_to_context( $item );
+						return $converter->relative_to_context($item);
 					},
 					$value
 				)

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

Indentation +508 added lines, -508 removed lines

@@ -20,521 +20,521 @@
  */
 class Wordlift_Jsonld_Service {
 
-	private static $creative_work_types = array(
-		'AmpStory',
-		'ArchiveComponent',
-		'Article',
-		'Atlas',
-		'Blog',
-		'Book',
-		'Chapter',
-		'Claim',
-		'Clip',
-		'Code',
-		'Collection',
-		'ComicStory',
-		'Comment',
-		'Conversation',
-		'Course',
-		'CreativeWork',
-		'CreativeWorkSeason',
-		'CreativeWorkSeries',
-		'DataCatalog',
-		'Dataset',
-		'DefinedTermSet',
-		'Diet',
-		'DigitalDocument',
-		'Drawing',
-		'EducationalOccupationalCredential',
-		'Episode',
-		'ExercisePlan',
-		'Game',
-		'Guide',
-		'HowTo',
-		'HowToDirection',
-		'HowToSection',
-		'HowToStep',
-		'HowToTip',
-		'HyperToc',
-		'HyperTocEntry',
-		'LearningResource',
-		'Legislation',
-		'Manuscript',
-		'Map',
-		'MathSolver',
-		'MediaObject',
-		'Menu',
-		'MenuSection',
-		'Message',
-		'Movie',
-		'MusicComposition',
-		'MusicPlaylist',
-		'MusicRecording',
-		'Painting',
-		'Photograph',
-		'Play',
-		'Poster',
-		'PublicationIssue',
-		'PublicationVolume',
-		'Quotation',
-		'Review',
-		'Sculpture',
-		'Season',
-		'SheetMusic',
-		'ShortStory',
-		'SoftwareApplication',
-		'SoftwareSourceCode',
-		'SpecialAnnouncement',
-		'Thesis',
-		'TvSeason',
-		'TvSeries',
-		'VisualArtwork',
-		'WebContent',
-		'WebPage',
-		'WebPageElement',
-		'WebSite',
-		'AdvertiserContentArticle',
-		'NewsArticle',
-		'Report',
-		'SatiricalArticle',
-		'ScholarlyArticle',
-		'SocialMediaPosting',
-		'TechArticle',
-		'AnalysisNewsArticle',
-		'AskPublicNewsArticle',
-		'BackgroundNewsArticle',
-		'OpinionNewsArticle',
-		'ReportageNewsArticle',
-		'ReviewNewsArticle',
-		'MedicalScholarlyArticle',
-		'BlogPosting',
-		'DiscussionForumPosting',
-		'LiveBlogPosting',
-		'ApiReference',
-		'Audiobook',
-		'MovieClip',
-		'RadioClip',
-		'TvClip',
-		'VideoGameClip',
-		'ProductCollection',
-		'ComicCoverArt',
-		'Answer',
-		'CorrectionComment',
-		'Question',
-		'PodcastSeason',
-		'RadioSeason',
-		'TvSeason',
-		'BookSeries',
-		'MovieSeries',
-		'Periodical',
-		'PodcastSeries',
-		'RadioSeries',
-		'TvSeries',
-		'VideoGameSeries',
-		'ComicSeries',
-		'Newspaper',
-		'DataFeed',
-		'CompleteDataFeed',
-		'CategoryCodeSet',
-		'NoteDigitalDocument',
-		'PresentationDigitalDocument',
-		'SpreadsheetDigitalDocument',
-		'TextDigitalDocument',
-		'PodcastEpisode',
-		'RadioEpisode',
-		'TvEpisode',
-		'VideoGame',
-		'Recipe',
-		'Course',
-		'Quiz',
-		'LegislationObject',
-		'AudioObject',
-		'DModel',
-		'DataDownload',
-		'ImageObject',
-		'LegislationObject',
-		'MusicVideoObject',
-		'VideoObject',
-		'Audiobook',
-		'Barcode',
-		'EmailMessage',
-		'MusicAlbum',
-		'MusicRelease',
-		'ComicIssue',
-		'ClaimReview',
-		'CriticReview',
-		'EmployerReview',
-		'MediaReview',
-		'Recommendation',
-		'UserReview',
-		'ReviewNewsArticle',
-		'MobileApplication',
-		'VideoGame',
-		'WebApplication',
-		'CoverArt',
-		'ComicCoverArt',
-		'HealthTopicContent',
-		'AboutPage',
-		'CheckoutPage',
-		'CollectionPage',
-		'ContactPage',
-		'FaqPage',
-		'ItemPage',
-		'MedicalWebPage',
-		'ProfilePage',
-		'QaPage',
-		'RealEstateListing',
-		'SearchResultsPage',
-		'MediaGallery',
-		'ImageGallery',
-		'VideoGallery',
-		'SiteNavigationElement',
-		'Table',
-		'WpAdBlock',
-		'WpFooter',
-		'WpHeader',
-		'WpSideBar',
-	);
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Term_JsonLd_Adapter} instance.
-	 *
-	 * @since  3.32.0
-	 * @access private
-	 * @var Wordlift_Term_JsonLd_Adapter $entity_service A {@link Wordlift_Term_JsonLd_Adapter} instance.
-	 */
-	private $term_jsonld_adapter;
-
-	/**
-	 * A {@link Wordlift_Post_Converter} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Post_Converter A {@link Wordlift_Post_Converter} instance.
-	 */
-	private $converter;
-
-	/**
-	 * A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Website_Jsonld_Converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 */
-	private $website_converter;
-
-	/**
-	 * The singleton instance for the JSON-LD service.
-	 *
-	 * @since 3.15.1
-	 *
-	 * @var \Wordlift_Jsonld_Service $instance The singleton instance for the JSON-LD service.
-	 */
-	private static $instance;
-
-	/**
-	 * @var Wordlift_Entity_Type_Service|null
-	 */
-	private $entity_type_service;
-
-	/**
-	 * Create a JSON-LD service.
-	 *
-	 * @param \Wordlift_Entity_Service           $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Post_Converter           $converter A {@link Wordlift_Uri_To_Jsonld_Converter} instance.
-	 * @param \Wordlift_Website_Jsonld_Converter $website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 * @param \Wordlift_Term_JsonLd_Adapter      $term_jsonld_adapter
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
-
-		$this->entity_service      = $entity_service;
-		$this->converter           = $converter;
-		$this->website_converter   = $website_converter;
-		$this->term_jsonld_adapter = $term_jsonld_adapter;
-		$this->entity_type_service = Wordlift_Entity_Type_Service::get_instance();
-		self::$instance            = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance for the JSON-LD service.
-	 *
-	 * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
-	 * @since 3.15.1
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Process calls to the AJAX 'wl_jsonld' endpoint.
-	 *
-	 * @since 3.8.0
-	 */
-	public function get() {
-		// Clear the buffer to be sure someone doesn't mess with our response.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/406.
-		// See https://codex.wordpress.org/AJAX_in_Plugins.
-		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@ob_clean();
-
-		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-		// Send the generated JSON-LD.
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
-
-	}
-
-	/**
-	 * A close of WP's own `wp_send_json` function which uses `application/ld+json` as content type.
-	 *
-	 * @param mixed $response Variable (usually an array or object) to encode as JSON,
-	 *                           then print and die.
-	 *
-	 * @since 3.18.5
-	 */
-	private function send_jsonld( $response ) {
-		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
-		echo wp_json_encode( $response );
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die();
-		} else {
-			die;
-		}
-	}
-
-	/**
-	 * Get the JSON-LD.
-	 *
-	 * @param bool     $is_homepage Whether the JSON-LD for the homepage is being requested.
-	 * @param int|null $post_id The JSON-LD for the specified {@link WP_Post} id.
-	 * @param int      $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
-	 *
-	 * @return array A JSON-LD structure.
-	 * @since 3.15.1
-	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
-		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
-		// e-mails with a low apdex score.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/521
-		Wordlift_NewRelic_Adapter::ignore_apdex();
-
-		// Switch to Website converter if is home page.
-		if ( $is_homepage ) {
-			/**
-			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
-			 *
-			 * @since  3.14.0
-			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
-			 */
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
-				return array();
-			}
-
-			// Set a reference to the website_converter.
-			$website_converter = $this->website_converter;
-
-			// Send JSON-LD.
-			return $website_converter->create_schema();
-		}
-
-		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
-			return array();
-		}
-
-		// An array of references which is captured when converting an URI to a
-		// json which we gather to further expand our json-ld.
-		$references       = array();
-		$references_infos = array();
-
-		// Set a reference to the entity_to_jsonld_converter to use in the closures.
-		$entity_to_jsonld_converter = $this->converter;
-
-		$relations = new Relations();
-		$jsonld    = $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
-
-		$graph = new Graph( $jsonld, $entity_to_jsonld_converter, Wordlift_Term_JsonLd_Adapter::get_instance() );
-
-		$schema_type = is_array( $jsonld['@type'] ) ? $jsonld['@type'] : array( $jsonld['@type'] );
-		// Add `about`/`mentions` only for `CreativeWork` and descendants.
-		if ( array_intersect( $schema_type, self::$creative_work_types ) ) {
-
-			foreach ( $relations->toArray() as $relation ) {
-				$object      = $relation->get_object();
-				$object_id   = $object->get_id();
-				$object_type = $object->get_type();
-
-				if ( $object_type === Object_Type_Enum::POST ) {
-					$post_status = get_post_status( $object_id );
-
-					// Do not add unpublished posts.
-					if ( 'publish' !== $post_status ) {
-						continue;
-					}
-
-					// Do not add Articles.
-					if ( $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Article' ) ) {
-						continue;
-					}
-
-					$references_2      = array();
-					$reference_infos_2 = array();
-					$relations_2       = new Relations();
-					$jsonld[]          = $entity_to_jsonld_converter->convert( $object_id, $references_2, $reference_infos_2, $relations_2 );
-					$this->add_location( $jsonld, $object );
-				} elseif ( $object_type === Object_Type_Enum::TERM && 1 !== $object_id ) { // Skip the Uncategorized term.
-					$jsonld[] = $this->term_jsonld_adapter->get( $object_id, $context );
-				} else {
-					continue;
-				}
-
-				// Add the `mentions`/`about` prop.
-				$this->add_mention_or_about( $jsonld, $post_id, $relation );
-			}
-			$graph->set_main_jsonld( $jsonld );
-		}
-
-		$jsonld_arr = $graph->add_references( $references )
-							->add_relations( $relations )
-							->add_required_reference_infos( $references_infos )
-							->render( $context );
-
-		/**
-		 * Filter name: wl_after_get_jsonld
-		 *
-		 * @return array
-		 * @since 3.27.2
-		 * @var $jsonld array The final jsonld before outputting to page.
-		 * @var $post_id int The post id for which the jsonld is generated.
-		 */
-		$jsonld_arr = apply_filters( 'wl_after_get_jsonld', $jsonld_arr, $post_id, $context );
-
-		return $jsonld_arr;
-	}
-
-	private function add_location( &$jsonld, $content_id ) {
-		/*
+    private static $creative_work_types = array(
+        'AmpStory',
+        'ArchiveComponent',
+        'Article',
+        'Atlas',
+        'Blog',
+        'Book',
+        'Chapter',
+        'Claim',
+        'Clip',
+        'Code',
+        'Collection',
+        'ComicStory',
+        'Comment',
+        'Conversation',
+        'Course',
+        'CreativeWork',
+        'CreativeWorkSeason',
+        'CreativeWorkSeries',
+        'DataCatalog',
+        'Dataset',
+        'DefinedTermSet',
+        'Diet',
+        'DigitalDocument',
+        'Drawing',
+        'EducationalOccupationalCredential',
+        'Episode',
+        'ExercisePlan',
+        'Game',
+        'Guide',
+        'HowTo',
+        'HowToDirection',
+        'HowToSection',
+        'HowToStep',
+        'HowToTip',
+        'HyperToc',
+        'HyperTocEntry',
+        'LearningResource',
+        'Legislation',
+        'Manuscript',
+        'Map',
+        'MathSolver',
+        'MediaObject',
+        'Menu',
+        'MenuSection',
+        'Message',
+        'Movie',
+        'MusicComposition',
+        'MusicPlaylist',
+        'MusicRecording',
+        'Painting',
+        'Photograph',
+        'Play',
+        'Poster',
+        'PublicationIssue',
+        'PublicationVolume',
+        'Quotation',
+        'Review',
+        'Sculpture',
+        'Season',
+        'SheetMusic',
+        'ShortStory',
+        'SoftwareApplication',
+        'SoftwareSourceCode',
+        'SpecialAnnouncement',
+        'Thesis',
+        'TvSeason',
+        'TvSeries',
+        'VisualArtwork',
+        'WebContent',
+        'WebPage',
+        'WebPageElement',
+        'WebSite',
+        'AdvertiserContentArticle',
+        'NewsArticle',
+        'Report',
+        'SatiricalArticle',
+        'ScholarlyArticle',
+        'SocialMediaPosting',
+        'TechArticle',
+        'AnalysisNewsArticle',
+        'AskPublicNewsArticle',
+        'BackgroundNewsArticle',
+        'OpinionNewsArticle',
+        'ReportageNewsArticle',
+        'ReviewNewsArticle',
+        'MedicalScholarlyArticle',
+        'BlogPosting',
+        'DiscussionForumPosting',
+        'LiveBlogPosting',
+        'ApiReference',
+        'Audiobook',
+        'MovieClip',
+        'RadioClip',
+        'TvClip',
+        'VideoGameClip',
+        'ProductCollection',
+        'ComicCoverArt',
+        'Answer',
+        'CorrectionComment',
+        'Question',
+        'PodcastSeason',
+        'RadioSeason',
+        'TvSeason',
+        'BookSeries',
+        'MovieSeries',
+        'Periodical',
+        'PodcastSeries',
+        'RadioSeries',
+        'TvSeries',
+        'VideoGameSeries',
+        'ComicSeries',
+        'Newspaper',
+        'DataFeed',
+        'CompleteDataFeed',
+        'CategoryCodeSet',
+        'NoteDigitalDocument',
+        'PresentationDigitalDocument',
+        'SpreadsheetDigitalDocument',
+        'TextDigitalDocument',
+        'PodcastEpisode',
+        'RadioEpisode',
+        'TvEpisode',
+        'VideoGame',
+        'Recipe',
+        'Course',
+        'Quiz',
+        'LegislationObject',
+        'AudioObject',
+        'DModel',
+        'DataDownload',
+        'ImageObject',
+        'LegislationObject',
+        'MusicVideoObject',
+        'VideoObject',
+        'Audiobook',
+        'Barcode',
+        'EmailMessage',
+        'MusicAlbum',
+        'MusicRelease',
+        'ComicIssue',
+        'ClaimReview',
+        'CriticReview',
+        'EmployerReview',
+        'MediaReview',
+        'Recommendation',
+        'UserReview',
+        'ReviewNewsArticle',
+        'MobileApplication',
+        'VideoGame',
+        'WebApplication',
+        'CoverArt',
+        'ComicCoverArt',
+        'HealthTopicContent',
+        'AboutPage',
+        'CheckoutPage',
+        'CollectionPage',
+        'ContactPage',
+        'FaqPage',
+        'ItemPage',
+        'MedicalWebPage',
+        'ProfilePage',
+        'QaPage',
+        'RealEstateListing',
+        'SearchResultsPage',
+        'MediaGallery',
+        'ImageGallery',
+        'VideoGallery',
+        'SiteNavigationElement',
+        'Table',
+        'WpAdBlock',
+        'WpFooter',
+        'WpHeader',
+        'WpSideBar',
+    );
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Term_JsonLd_Adapter} instance.
+     *
+     * @since  3.32.0
+     * @access private
+     * @var Wordlift_Term_JsonLd_Adapter $entity_service A {@link Wordlift_Term_JsonLd_Adapter} instance.
+     */
+    private $term_jsonld_adapter;
+
+    /**
+     * A {@link Wordlift_Post_Converter} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Post_Converter A {@link Wordlift_Post_Converter} instance.
+     */
+    private $converter;
+
+    /**
+     * A {@link Wordlift_Website_Jsonld_Converter} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Website_Jsonld_Converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     */
+    private $website_converter;
+
+    /**
+     * The singleton instance for the JSON-LD service.
+     *
+     * @since 3.15.1
+     *
+     * @var \Wordlift_Jsonld_Service $instance The singleton instance for the JSON-LD service.
+     */
+    private static $instance;
+
+    /**
+     * @var Wordlift_Entity_Type_Service|null
+     */
+    private $entity_type_service;
+
+    /**
+     * Create a JSON-LD service.
+     *
+     * @param \Wordlift_Entity_Service           $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Post_Converter           $converter A {@link Wordlift_Uri_To_Jsonld_Converter} instance.
+     * @param \Wordlift_Website_Jsonld_Converter $website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     * @param \Wordlift_Term_JsonLd_Adapter      $term_jsonld_adapter
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
+
+        $this->entity_service      = $entity_service;
+        $this->converter           = $converter;
+        $this->website_converter   = $website_converter;
+        $this->term_jsonld_adapter = $term_jsonld_adapter;
+        $this->entity_type_service = Wordlift_Entity_Type_Service::get_instance();
+        self::$instance            = $this;
+
+    }
+
+    /**
+     * Get the singleton instance for the JSON-LD service.
+     *
+     * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
+     * @since 3.15.1
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Process calls to the AJAX 'wl_jsonld' endpoint.
+     *
+     * @since 3.8.0
+     */
+    public function get() {
+        // Clear the buffer to be sure someone doesn't mess with our response.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/406.
+        // See https://codex.wordpress.org/AJAX_in_Plugins.
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+        @ob_clean();
+
+        // Get the parameter from the request.
+        $is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+        // Send the generated JSON-LD.
+        $this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
+
+    }
+
+    /**
+     * A close of WP's own `wp_send_json` function which uses `application/ld+json` as content type.
+     *
+     * @param mixed $response Variable (usually an array or object) to encode as JSON,
+     *                           then print and die.
+     *
+     * @since 3.18.5
+     */
+    private function send_jsonld( $response ) {
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+        @header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
+        echo wp_json_encode( $response );
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die();
+        } else {
+            die;
+        }
+    }
+
+    /**
+     * Get the JSON-LD.
+     *
+     * @param bool     $is_homepage Whether the JSON-LD for the homepage is being requested.
+     * @param int|null $post_id The JSON-LD for the specified {@link WP_Post} id.
+     * @param int      $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
+     *
+     * @return array A JSON-LD structure.
+     * @since 3.15.1
+     */
+    public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+        // Tell NewRelic to ignore us, otherwise NewRelic customers might receive
+        // e-mails with a low apdex score.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/521
+        Wordlift_NewRelic_Adapter::ignore_apdex();
+
+        // Switch to Website converter if is home page.
+        if ( $is_homepage ) {
+            /**
+             * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
+             *
+             * @since  3.14.0
+             * @api    bool $display_search Whether or not to display json+ld search on the frontend.
+             */
+            if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
+                return array();
+            }
+
+            // Set a reference to the website_converter.
+            $website_converter = $this->website_converter;
+
+            // Send JSON-LD.
+            return $website_converter->create_schema();
+        }
+
+        // If no id has been provided return an empty array.
+        if ( ! isset( $post_id ) ) {
+            return array();
+        }
+
+        // An array of references which is captured when converting an URI to a
+        // json which we gather to further expand our json-ld.
+        $references       = array();
+        $references_infos = array();
+
+        // Set a reference to the entity_to_jsonld_converter to use in the closures.
+        $entity_to_jsonld_converter = $this->converter;
+
+        $relations = new Relations();
+        $jsonld    = $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
+
+        $graph = new Graph( $jsonld, $entity_to_jsonld_converter, Wordlift_Term_JsonLd_Adapter::get_instance() );
+
+        $schema_type = is_array( $jsonld['@type'] ) ? $jsonld['@type'] : array( $jsonld['@type'] );
+        // Add `about`/`mentions` only for `CreativeWork` and descendants.
+        if ( array_intersect( $schema_type, self::$creative_work_types ) ) {
+
+            foreach ( $relations->toArray() as $relation ) {
+                $object      = $relation->get_object();
+                $object_id   = $object->get_id();
+                $object_type = $object->get_type();
+
+                if ( $object_type === Object_Type_Enum::POST ) {
+                    $post_status = get_post_status( $object_id );
+
+                    // Do not add unpublished posts.
+                    if ( 'publish' !== $post_status ) {
+                        continue;
+                    }
+
+                    // Do not add Articles.
+                    if ( $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Article' ) ) {
+                        continue;
+                    }
+
+                    $references_2      = array();
+                    $reference_infos_2 = array();
+                    $relations_2       = new Relations();
+                    $jsonld[]          = $entity_to_jsonld_converter->convert( $object_id, $references_2, $reference_infos_2, $relations_2 );
+                    $this->add_location( $jsonld, $object );
+                } elseif ( $object_type === Object_Type_Enum::TERM && 1 !== $object_id ) { // Skip the Uncategorized term.
+                    $jsonld[] = $this->term_jsonld_adapter->get( $object_id, $context );
+                } else {
+                    continue;
+                }
+
+                // Add the `mentions`/`about` prop.
+                $this->add_mention_or_about( $jsonld, $post_id, $relation );
+            }
+            $graph->set_main_jsonld( $jsonld );
+        }
+
+        $jsonld_arr = $graph->add_references( $references )
+                            ->add_relations( $relations )
+                            ->add_required_reference_infos( $references_infos )
+                            ->render( $context );
+
+        /**
+         * Filter name: wl_after_get_jsonld
+         *
+         * @return array
+         * @since 3.27.2
+         * @var $jsonld array The final jsonld before outputting to page.
+         * @var $post_id int The post id for which the jsonld is generated.
+         */
+        $jsonld_arr = apply_filters( 'wl_after_get_jsonld', $jsonld_arr, $post_id, $context );
+
+        return $jsonld_arr;
+    }
+
+    private function add_location( &$jsonld, $content_id ) {
+        /*
 		 * Add the locations to the references.
 		 *
 		 * @since 3.19.5
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/858.
 		 */
-		// We do support only post targets here, because of the Entity_Type_Service limitation.
-		if ( $content_id->get_type() !== Object_Type_Enum::POST ) {
-			return;
-		}
-
-		$object_id = $content_id->get_id();
-		if ( $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Action' )
-			 || $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Event' )
-			 || $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Organization' ) ) {
-
-			$post_ids = get_post_meta( $object_id, Wordlift_Schema_Service::FIELD_LOCATION );
-			foreach ( $post_ids as $post_id ) {
-				$references      = array();
-				$reference_infos = array();
-				$relations       = new Relations();
-				$jsonld[]        = $this->converter->convert( $post_id, $references, $reference_infos, $relations );
-			}
-		}
-	}
-
-	/**
-	 * Write the JSON-LD in the head.
-	 *
-	 * This function isn't actually used, but may be used to quickly enable writing the JSON-LD synchronously to the
-	 * document head, using the `wp_head` hook.
-	 *
-	 * @since 3.18.5
-	 */
-	public function wp_head() {
-
-		// Determine whether this is the home page or whether we're displaying a single post.
-		$is_homepage = is_home() || is_front_page();
-		$post_id     = is_singular() ? get_the_ID() : null;
-
-		$jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
-		?>
+        // We do support only post targets here, because of the Entity_Type_Service limitation.
+        if ( $content_id->get_type() !== Object_Type_Enum::POST ) {
+            return;
+        }
+
+        $object_id = $content_id->get_id();
+        if ( $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Action' )
+             || $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Event' )
+             || $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Organization' ) ) {
+
+            $post_ids = get_post_meta( $object_id, Wordlift_Schema_Service::FIELD_LOCATION );
+            foreach ( $post_ids as $post_id ) {
+                $references      = array();
+                $reference_infos = array();
+                $relations       = new Relations();
+                $jsonld[]        = $this->converter->convert( $post_id, $references, $reference_infos, $relations );
+            }
+        }
+    }
+
+    /**
+     * Write the JSON-LD in the head.
+     *
+     * This function isn't actually used, but may be used to quickly enable writing the JSON-LD synchronously to the
+     * document head, using the `wp_head` hook.
+     *
+     * @since 3.18.5
+     */
+    public function wp_head() {
+
+        // Determine whether this is the home page or whether we're displaying a single post.
+        $is_homepage = is_home() || is_front_page();
+        $post_id     = is_singular() ? get_the_ID() : null;
+
+        $jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+        ?>
 		<script type="application/ld+json"><?php echo esc_html( $jsonld ); ?></script>
 		<?php
-	}
-
-	/**
-	 * @param array    $jsonld
-	 * @param Relation $relation
-	 *
-	 * @return void
-	 */
-	private function add_mention_or_about( &$jsonld, $post_id, $relation ) {
-		$content_service = Wordpress_Content_Service::get_instance();
-		$entity_service  = Wordlift_Entity_Service::get_instance();
-
-		$object     = $relation->get_object();
-		$entity_uri = $content_service->get_entity_id( $object );
-		$labels     = $entity_service->get_labels( $object->get_id(), $object->get_type() );
-
-		$escaped_labels = array_map(
-			function ( $value ) {
-				return preg_quote( $value, '/' );
-			},
-			$labels
-		);
-
-		$matches = false;
-
-		// When the title is empty, then we shouldn't yield a match to about section.
-		if ( array_filter( $escaped_labels ) ) {
-			// Check if the labels match any part of the title.
-			$post    = get_post( $post_id );
-			$matches = $this->check_title_match( $escaped_labels, $post->post_title );
-		}
-
-		if ( $entity_uri ) {
-			// If the title matches, assign the entity to the about, otherwise to the mentions.
-			$property_name              = $matches ? 'about' : 'mentions';
-			$jsonld[ $property_name ]   = isset( $jsonld[ $property_name ] ) ? (array) $jsonld[ $property_name ] : array();
-			$jsonld[ $property_name ][] = array( '@id' => $entity_uri );
-		}
-
-	}
-
-	/**
-	 * Check if the labels match any part of the title.
-	 *
-	 * @param $labels array The labels to check.
-	 * @param $title string The title to check.
-	 *
-	 * @return boolean
-	 */
-	public function check_title_match( $labels, $title ) {
-
-		// If the title is empty, then we shouldn't yield a match to about section.
-		if ( empty( $title ) ) {
-			return false;
-		}
-
-		// Check if the labels match any part of the title.
-		return 1 === preg_match( '/\b(' . implode( '|', $labels ) . ')\b/iu', $title );
-
-	}
+    }
+
+    /**
+     * @param array    $jsonld
+     * @param Relation $relation
+     *
+     * @return void
+     */
+    private function add_mention_or_about( &$jsonld, $post_id, $relation ) {
+        $content_service = Wordpress_Content_Service::get_instance();
+        $entity_service  = Wordlift_Entity_Service::get_instance();
+
+        $object     = $relation->get_object();
+        $entity_uri = $content_service->get_entity_id( $object );
+        $labels     = $entity_service->get_labels( $object->get_id(), $object->get_type() );
+
+        $escaped_labels = array_map(
+            function ( $value ) {
+                return preg_quote( $value, '/' );
+            },
+            $labels
+        );
+
+        $matches = false;
+
+        // When the title is empty, then we shouldn't yield a match to about section.
+        if ( array_filter( $escaped_labels ) ) {
+            // Check if the labels match any part of the title.
+            $post    = get_post( $post_id );
+            $matches = $this->check_title_match( $escaped_labels, $post->post_title );
+        }
+
+        if ( $entity_uri ) {
+            // If the title matches, assign the entity to the about, otherwise to the mentions.
+            $property_name              = $matches ? 'about' : 'mentions';
+            $jsonld[ $property_name ]   = isset( $jsonld[ $property_name ] ) ? (array) $jsonld[ $property_name ] : array();
+            $jsonld[ $property_name ][] = array( '@id' => $entity_uri );
+        }
+
+    }
+
+    /**
+     * Check if the labels match any part of the title.
+     *
+     * @param $labels array The labels to check.
+     * @param $title string The title to check.
+     *
+     * @return boolean
+     */
+    public function check_title_match( $labels, $title ) {
+
+        // If the title is empty, then we shouldn't yield a match to about section.
+        if ( empty( $title ) ) {
+            return false;
+        }
+
+        // Check if the labels match any part of the title.
+        return 1 === preg_match( '/\b(' . implode( '|', $labels ) . ')\b/iu', $title );
+
+    }
 
 }

Spacing +56 added lines, -56 removed lines

@@ -256,7 +256,7 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
+	public function __construct($entity_service, $converter, $website_converter, $term_jsonld_adapter) {
 
 		$this->entity_service      = $entity_service;
 		$this->converter           = $converter;
@@ -292,11 +292,11 @@ 
 		@ob_clean();
 
 		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$is_homepage = isset($_REQUEST['homepage']); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$post_id     = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? intval($_REQUEST['id']) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		// Send the generated JSON-LD.
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
+		$this->send_jsonld($this->get_jsonld($is_homepage, $post_id));
 
 	}
 
@@ -308,11 +308,11 @@ 
 	 *
 	 * @since 3.18.5
 	 */
-	private function send_jsonld( $response ) {
+	private function send_jsonld($response) {
 		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
-		echo wp_json_encode( $response );
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+		@header('Content-Type: application/ld+json; charset='.get_option('blog_charset'));
+		echo wp_json_encode($response);
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
 			wp_die();
 		} else {
 			die;
@@ -329,7 +329,7 @@ 
 	 * @return array A JSON-LD structure.
 	 * @since 3.15.1
 	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+	public function get_jsonld($is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN) {
 		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
 		// e-mails with a low apdex score.
 		//
@@ -337,14 +337,14 @@ 
 		Wordlift_NewRelic_Adapter::ignore_apdex();
 
 		// Switch to Website converter if is home page.
-		if ( $is_homepage ) {
+		if ($is_homepage) {
 			/**
 			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
 			 *
 			 * @since  3.14.0
 			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
 			 */
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
+			if (apply_filters('wordlift_disable_website_json_ld', false)) {
 				return array();
 			}
 
@@ -356,7 +356,7 @@ 
 		}
 
 		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return array();
 		}
 
@@ -369,53 +369,53 @@ 
 		$entity_to_jsonld_converter = $this->converter;
 
 		$relations = new Relations();
-		$jsonld    = $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
+		$jsonld    = $entity_to_jsonld_converter->convert($post_id, $references, $references_infos, $relations);
 
-		$graph = new Graph( $jsonld, $entity_to_jsonld_converter, Wordlift_Term_JsonLd_Adapter::get_instance() );
+		$graph = new Graph($jsonld, $entity_to_jsonld_converter, Wordlift_Term_JsonLd_Adapter::get_instance());
 
-		$schema_type = is_array( $jsonld['@type'] ) ? $jsonld['@type'] : array( $jsonld['@type'] );
+		$schema_type = is_array($jsonld['@type']) ? $jsonld['@type'] : array($jsonld['@type']);
 		// Add `about`/`mentions` only for `CreativeWork` and descendants.
-		if ( array_intersect( $schema_type, self::$creative_work_types ) ) {
+		if (array_intersect($schema_type, self::$creative_work_types)) {
 
-			foreach ( $relations->toArray() as $relation ) {
+			foreach ($relations->toArray() as $relation) {
 				$object      = $relation->get_object();
 				$object_id   = $object->get_id();
 				$object_type = $object->get_type();
 
-				if ( $object_type === Object_Type_Enum::POST ) {
-					$post_status = get_post_status( $object_id );
+				if ($object_type === Object_Type_Enum::POST) {
+					$post_status = get_post_status($object_id);
 
 					// Do not add unpublished posts.
-					if ( 'publish' !== $post_status ) {
+					if ('publish' !== $post_status) {
 						continue;
 					}
 
 					// Do not add Articles.
-					if ( $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Article' ) ) {
+					if ($this->entity_type_service->has_entity_type($object_id, 'http://schema.org/Article')) {
 						continue;
 					}
 
 					$references_2      = array();
 					$reference_infos_2 = array();
 					$relations_2       = new Relations();
-					$jsonld[]          = $entity_to_jsonld_converter->convert( $object_id, $references_2, $reference_infos_2, $relations_2 );
-					$this->add_location( $jsonld, $object );
-				} elseif ( $object_type === Object_Type_Enum::TERM && 1 !== $object_id ) { // Skip the Uncategorized term.
-					$jsonld[] = $this->term_jsonld_adapter->get( $object_id, $context );
+					$jsonld[]          = $entity_to_jsonld_converter->convert($object_id, $references_2, $reference_infos_2, $relations_2);
+					$this->add_location($jsonld, $object);
+				} elseif ($object_type === Object_Type_Enum::TERM && 1 !== $object_id) { // Skip the Uncategorized term.
+					$jsonld[] = $this->term_jsonld_adapter->get($object_id, $context);
 				} else {
 					continue;
 				}
 
 				// Add the `mentions`/`about` prop.
-				$this->add_mention_or_about( $jsonld, $post_id, $relation );
+				$this->add_mention_or_about($jsonld, $post_id, $relation);
 			}
-			$graph->set_main_jsonld( $jsonld );
+			$graph->set_main_jsonld($jsonld);
 		}
 
-		$jsonld_arr = $graph->add_references( $references )
-							->add_relations( $relations )
-							->add_required_reference_infos( $references_infos )
-							->render( $context );
+		$jsonld_arr = $graph->add_references($references)
+							->add_relations($relations)
+							->add_required_reference_infos($references_infos)
+							->render($context);
 
 		/**
 		 * Filter name: wl_after_get_jsonld
@@ -425,12 +425,12 @@ 
 		 * @var $jsonld array The final jsonld before outputting to page.
 		 * @var $post_id int The post id for which the jsonld is generated.
 		 */
-		$jsonld_arr = apply_filters( 'wl_after_get_jsonld', $jsonld_arr, $post_id, $context );
+		$jsonld_arr = apply_filters('wl_after_get_jsonld', $jsonld_arr, $post_id, $context);
 
 		return $jsonld_arr;
 	}
 
-	private function add_location( &$jsonld, $content_id ) {
+	private function add_location(&$jsonld, $content_id) {
 		/*
 		 * Add the locations to the references.
 		 *
@@ -439,21 +439,21 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/858.
 		 */
 		// We do support only post targets here, because of the Entity_Type_Service limitation.
-		if ( $content_id->get_type() !== Object_Type_Enum::POST ) {
+		if ($content_id->get_type() !== Object_Type_Enum::POST) {
 			return;
 		}
 
 		$object_id = $content_id->get_id();
-		if ( $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Action' )
-			 || $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Event' )
-			 || $this->entity_type_service->has_entity_type( $object_id, 'http://schema.org/Organization' ) ) {
+		if ($this->entity_type_service->has_entity_type($object_id, 'http://schema.org/Action')
+			 || $this->entity_type_service->has_entity_type($object_id, 'http://schema.org/Event')
+			 || $this->entity_type_service->has_entity_type($object_id, 'http://schema.org/Organization')) {
 
-			$post_ids = get_post_meta( $object_id, Wordlift_Schema_Service::FIELD_LOCATION );
-			foreach ( $post_ids as $post_id ) {
+			$post_ids = get_post_meta($object_id, Wordlift_Schema_Service::FIELD_LOCATION);
+			foreach ($post_ids as $post_id) {
 				$references      = array();
 				$reference_infos = array();
 				$relations       = new Relations();
-				$jsonld[]        = $this->converter->convert( $post_id, $references, $reference_infos, $relations );
+				$jsonld[]        = $this->converter->convert($post_id, $references, $reference_infos, $relations);
 			}
 		}
 	}
@@ -472,9 +472,9 @@ 
 		$is_homepage = is_home() || is_front_page();
 		$post_id     = is_singular() ? get_the_ID() : null;
 
-		$jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+		$jsonld = wp_json_encode($this->get_jsonld($is_homepage, $post_id, Jsonld_Context_Enum::PAGE));
 		?>
-		<script type="application/ld+json"><?php echo esc_html( $jsonld ); ?></script>
+		<script type="application/ld+json"><?php echo esc_html($jsonld); ?></script>
 		<?php
 	}
 
@@ -484,17 +484,17 @@ 
 	 *
 	 * @return void
 	 */
-	private function add_mention_or_about( &$jsonld, $post_id, $relation ) {
+	private function add_mention_or_about(&$jsonld, $post_id, $relation) {
 		$content_service = Wordpress_Content_Service::get_instance();
 		$entity_service  = Wordlift_Entity_Service::get_instance();
 
 		$object     = $relation->get_object();
-		$entity_uri = $content_service->get_entity_id( $object );
-		$labels     = $entity_service->get_labels( $object->get_id(), $object->get_type() );
+		$entity_uri = $content_service->get_entity_id($object);
+		$labels     = $entity_service->get_labels($object->get_id(), $object->get_type());
 
 		$escaped_labels = array_map(
-			function ( $value ) {
-				return preg_quote( $value, '/' );
+			function($value) {
+				return preg_quote($value, '/');
 			},
 			$labels
 		);
@@ -502,17 +502,17 @@ 
 		$matches = false;
 
 		// When the title is empty, then we shouldn't yield a match to about section.
-		if ( array_filter( $escaped_labels ) ) {
+		if (array_filter($escaped_labels)) {
 			// Check if the labels match any part of the title.
-			$post    = get_post( $post_id );
-			$matches = $this->check_title_match( $escaped_labels, $post->post_title );
+			$post    = get_post($post_id);
+			$matches = $this->check_title_match($escaped_labels, $post->post_title);
 		}
 
-		if ( $entity_uri ) {
+		if ($entity_uri) {
 			// If the title matches, assign the entity to the about, otherwise to the mentions.
 			$property_name              = $matches ? 'about' : 'mentions';
-			$jsonld[ $property_name ]   = isset( $jsonld[ $property_name ] ) ? (array) $jsonld[ $property_name ] : array();
-			$jsonld[ $property_name ][] = array( '@id' => $entity_uri );
+			$jsonld[$property_name]   = isset($jsonld[$property_name]) ? (array) $jsonld[$property_name] : array();
+			$jsonld[$property_name][] = array('@id' => $entity_uri);
 		}
 
 	}
@@ -525,15 +525,15 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function check_title_match( $labels, $title ) {
+	public function check_title_match($labels, $title) {
 
 		// If the title is empty, then we shouldn't yield a match to about section.
-		if ( empty( $title ) ) {
+		if (empty($title)) {
 			return false;
 		}
 
 		// Check if the labels match any part of the title.
-		return 1 === preg_match( '/\b(' . implode( '|', $labels ) . ')\b/iu', $title );
+		return 1 === preg_match('/\b('.implode('|', $labels).')\b/iu', $title);
 
 	}
 

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

Indentation +15 added lines, -15 removed lines

@@ -16,21 +16,21 @@
 
 interface  Relation_Service_Interface {
 
-	/**
-	 * Get the relations for the provided {@link Wordpress_Content_Id}
-	 *
-	 * @param Wordpress_Content_Id $content_id
-	 *
-	 * @return Relations_Interface
-	 */
-	public function get_relations( $content_id );
+    /**
+     * Get the relations for the provided {@link Wordpress_Content_Id}
+     *
+     * @param Wordpress_Content_Id $content_id
+     *
+     * @return Relations_Interface
+     */
+    public function get_relations( $content_id );
 
-	/**
-	 * Add the relations for the provided {@link Wordpress_Content_Id} to the provided {@link Relations_Interface}
-	 *
-	 * @param Wordpress_Content_Id $content_id
-	 * @param Relations            $relations
-	 */
-	public function add_relations( $content_id, $relations );
+    /**
+     * Add the relations for the provided {@link Wordpress_Content_Id} to the provided {@link Relations_Interface}
+     *
+     * @param Wordpress_Content_Id $content_id
+     * @param Relations            $relations
+     */
+    public function add_relations( $content_id, $relations );
 
 }

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	 *
 	 * @return Relations_Interface
 	 */
-	public function get_relations( $content_id );
+	public function get_relations($content_id);
 
 	/**
 	 * Add the relations for the provided {@link Wordpress_Content_Id} to the provided {@link Relations_Interface}
@@ -31,6 +31,6 @@ 
 	 * @param Wordpress_Content_Id $content_id
 	 * @param Relations            $relations
 	 */
-	public function add_relations( $content_id, $relations );
+	public function add_relations($content_id, $relations);
 
 }