insideout10 / wordlift-plugin

src/public/class-wordlift-term-jsonld-adapter.php

Indentation +220 added lines, -220 removed lines

@@ -18,225 +18,225 @@
  */
 class Wordlift_Term_JsonLd_Adapter {
 
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Jsonld_Service $jsonld_service The {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-
-	private static $instance;
-
-	/**
-	 * Wordlift_Term_JsonLd_Adapter constructor.
-	 *
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 * @param \Wordlift_Jsonld_Service $jsonld_service The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 */
-	public function __construct( $entity_uri_service, $jsonld_service ) {
-
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-
-		$this->entity_uri_service = $entity_uri_service;
-		$this->jsonld_service     = $jsonld_service;
-
-		self::$instance = $this;
-	}
-
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Adds carousel json ld data to term page if the conditions match
-	 *
-	 * @return array|boolean
-	 */
-	public function get_carousel_jsonld( $id = null ) {
-		$posts       = $this->get_posts( $id );
-		$post_jsonld = array();
-		if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
-			// Bail out if no posts are present.
-			return false;
-		}
-
-		if ( ! is_null( $id ) ) {
-			$term                       = get_term( $id );
-			$post_jsonld['description'] = strip_tags( strip_shortcodes( $term->description ) );
-			$thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
-			if ( ! empty( $thumbnail_id ) ) {
-				$post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
-			}
-		}
-
-		// More than 2 items are present, so construct the post_jsonld data
-		$post_jsonld['@context']        = 'https://schema.org';
-		$post_jsonld['@type']           = 'ItemList';
-		$post_jsonld['url']             = $this->get_term_url( $id );
-		$post_jsonld['itemListElement'] = array();
-		$position                       = 1;
-
-		foreach ( $posts as $post_id ) {
-			$result = array(
-				'@type'    => 'ListItem',
-				'position' => $position,
-				/**
-				 * We can't use `item` here unless we change the URL for the item to point to the current page.
-				 *
-				 * See https://developers.google.com/search/docs/data-types/carousel
-				 */
-				'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
-			);
-			array_push( $post_jsonld['itemListElement'], $result );
-			$position += 1;
-		}
-
-		return $post_jsonld;
-	}
-
-	private function get_posts( $id ) {
-		global $wp_query;
-
-		if ( ! is_null( $wp_query->posts ) ) {
-			return array_map( function ( $post ) {
-				return $post->ID;
-			}, $wp_query->posts );
-		}
-
-		if ( is_null( $id ) ) {
-			return null;
-		}
-
-		$term = get_term( $id );
-
-		return get_objects_in_term( $id, $term->taxonomy );
-	}
-
-	/**
-	 * Hook to `wp_head` to print the JSON-LD.
-	 *
-	 * @since 3.20.0
-	 */
-	public function wp_head() {
-		$query_object = get_queried_object();
-
-		// Check if it is a term page.
-		if ( ! $query_object instanceof WP_Term ) {
-			return;
-		}
-
-		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
-			return;
-		}
-
-		$term_id = $query_object->term_id;
-
-		$jsonld = $this->get( $term_id );
-
-		// Bail out if the JSON-LD is empty.
-		if ( empty( $jsonld ) || empty( $jsonld['jsonld'] ) ) {
-			return;
-		}
-
-		$jsonld_string = wp_json_encode( $jsonld['jsonld'] );
-
-		echo "<script type=\"application/ld+json\" id=\"wl-jsonld-term\">$jsonld_string</script>";
-
-	}
-
-	public function get( $id ) {
-
-		/**
-		 * Support for carousel rich snippet, get jsonld data present
-		 * for all the posts shown in the term page, and add the jsonld data
-		 * to list
-		 *
-		 * see here: https://developers.google.com/search/docs/data-types/carousel
-		 *
-		 * @since 3.26.0
-		 */
-		$carousel_data = $this->get_carousel_jsonld( $id );
-		$jsonld_array  = array();
-		if ( $carousel_data ) {
-			$jsonld_array[] = $carousel_data;
-		}
-		$context               = empty( $carousel_data ) ? Jsonld_Context_Enum::PAGE : Jsonld_Context_Enum::CAROUSEL;
-		$entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
-
-		$result = array(
-			'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
-			'references' => array()
-		);
-
-		/**
-		 * @since 3.26.3
-		 * Filter: wl_term_jsonld_array
-		 * @var $id int Term id
-		 * @var $jsonld_array array An array containing jsonld for term and entities.
-		 */
-		$arr = apply_filters( 'wl_term_jsonld_array', $result, $id );
-
-		return $arr['jsonld'];
-	}
-
-	private function get_term_url( $id ) {
-
-		if ( is_null( $id ) ) {
-			return $_SERVER['REQUEST_URI'];
-		}
-
-		$maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
-		if ( ! empty( $maybe_url ) ) {
-			return $maybe_url;
-		}
-
-		return get_term_link( $id );
-	}
-
-	/**
-	 * Return jsonld for entities bound to terms.
-	 *
-	 * @param int $term_id Term ID.
-	 * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
-	 *
-	 * @return array
-	 */
-	private function get_entity_jsonld( $term_id, $context ) {
-		// The `_wl_entity_id` are URIs.
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
-		$entity_uri_service = $this->entity_uri_service;
-
-		$local_entity_ids = array_filter( $entity_ids, function ( $uri ) use ( $entity_uri_service ) {
-			return $entity_uri_service->is_internal( $uri );
-		} );
-
-		// Bail out if there are no entities.
-		if ( empty( $local_entity_ids ) ) {
-			return array();
-		}
-
-		$post   = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
-		$jsonld = $this->jsonld_service->get_jsonld( false, $post->ID, $context );
-		// Reset the `url` to the term page.
-		$jsonld[0]['url'] = get_term_link( $term_id );
-
-		return $jsonld;
-	}
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    /**
+     * The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Jsonld_Service $jsonld_service The {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+
+    private static $instance;
+
+    /**
+     * Wordlift_Term_JsonLd_Adapter constructor.
+     *
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     * @param \Wordlift_Jsonld_Service $jsonld_service The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since 3.20.0
+     *
+     */
+    public function __construct( $entity_uri_service, $jsonld_service ) {
+
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+
+        $this->entity_uri_service = $entity_uri_service;
+        $this->jsonld_service     = $jsonld_service;
+
+        self::$instance = $this;
+    }
+
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Adds carousel json ld data to term page if the conditions match
+     *
+     * @return array|boolean
+     */
+    public function get_carousel_jsonld( $id = null ) {
+        $posts       = $this->get_posts( $id );
+        $post_jsonld = array();
+        if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
+            // Bail out if no posts are present.
+            return false;
+        }
+
+        if ( ! is_null( $id ) ) {
+            $term                       = get_term( $id );
+            $post_jsonld['description'] = strip_tags( strip_shortcodes( $term->description ) );
+            $thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
+            if ( ! empty( $thumbnail_id ) ) {
+                $post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
+            }
+        }
+
+        // More than 2 items are present, so construct the post_jsonld data
+        $post_jsonld['@context']        = 'https://schema.org';
+        $post_jsonld['@type']           = 'ItemList';
+        $post_jsonld['url']             = $this->get_term_url( $id );
+        $post_jsonld['itemListElement'] = array();
+        $position                       = 1;
+
+        foreach ( $posts as $post_id ) {
+            $result = array(
+                '@type'    => 'ListItem',
+                'position' => $position,
+                /**
+                 * We can't use `item` here unless we change the URL for the item to point to the current page.
+                 *
+                 * See https://developers.google.com/search/docs/data-types/carousel
+                 */
+                'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
+            );
+            array_push( $post_jsonld['itemListElement'], $result );
+            $position += 1;
+        }
+
+        return $post_jsonld;
+    }
+
+    private function get_posts( $id ) {
+        global $wp_query;
+
+        if ( ! is_null( $wp_query->posts ) ) {
+            return array_map( function ( $post ) {
+                return $post->ID;
+            }, $wp_query->posts );
+        }
+
+        if ( is_null( $id ) ) {
+            return null;
+        }
+
+        $term = get_term( $id );
+
+        return get_objects_in_term( $id, $term->taxonomy );
+    }
+
+    /**
+     * Hook to `wp_head` to print the JSON-LD.
+     *
+     * @since 3.20.0
+     */
+    public function wp_head() {
+        $query_object = get_queried_object();
+
+        // Check if it is a term page.
+        if ( ! $query_object instanceof WP_Term ) {
+            return;
+        }
+
+        // Bail out if `wl_jsonld_enabled` isn't enabled.
+        if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+            return;
+        }
+
+        $term_id = $query_object->term_id;
+
+        $jsonld = $this->get( $term_id );
+
+        // Bail out if the JSON-LD is empty.
+        if ( empty( $jsonld ) || empty( $jsonld['jsonld'] ) ) {
+            return;
+        }
+
+        $jsonld_string = wp_json_encode( $jsonld['jsonld'] );
+
+        echo "<script type=\"application/ld+json\" id=\"wl-jsonld-term\">$jsonld_string</script>";
+
+    }
+
+    public function get( $id ) {
+
+        /**
+         * Support for carousel rich snippet, get jsonld data present
+         * for all the posts shown in the term page, and add the jsonld data
+         * to list
+         *
+         * see here: https://developers.google.com/search/docs/data-types/carousel
+         *
+         * @since 3.26.0
+         */
+        $carousel_data = $this->get_carousel_jsonld( $id );
+        $jsonld_array  = array();
+        if ( $carousel_data ) {
+            $jsonld_array[] = $carousel_data;
+        }
+        $context               = empty( $carousel_data ) ? Jsonld_Context_Enum::PAGE : Jsonld_Context_Enum::CAROUSEL;
+        $entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
+
+        $result = array(
+            'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
+            'references' => array()
+        );
+
+        /**
+         * @since 3.26.3
+         * Filter: wl_term_jsonld_array
+         * @var $id int Term id
+         * @var $jsonld_array array An array containing jsonld for term and entities.
+         */
+        $arr = apply_filters( 'wl_term_jsonld_array', $result, $id );
+
+        return $arr['jsonld'];
+    }
+
+    private function get_term_url( $id ) {
+
+        if ( is_null( $id ) ) {
+            return $_SERVER['REQUEST_URI'];
+        }
+
+        $maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
+        if ( ! empty( $maybe_url ) ) {
+            return $maybe_url;
+        }
+
+        return get_term_link( $id );
+    }
+
+    /**
+     * Return jsonld for entities bound to terms.
+     *
+     * @param int $term_id Term ID.
+     * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
+     *
+     * @return array
+     */
+    private function get_entity_jsonld( $term_id, $context ) {
+        // The `_wl_entity_id` are URIs.
+        $entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
+        $entity_uri_service = $this->entity_uri_service;
+
+        $local_entity_ids = array_filter( $entity_ids, function ( $uri ) use ( $entity_uri_service ) {
+            return $entity_uri_service->is_internal( $uri );
+        } );
+
+        // Bail out if there are no entities.
+        if ( empty( $local_entity_ids ) ) {
+            return array();
+        }
+
+        $post   = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
+        $jsonld = $this->jsonld_service->get_jsonld( false, $post->ID, $context );
+        // Reset the `url` to the term page.
+        $jsonld[0]['url'] = get_term_link( $term_id );
+
+        return $jsonld;
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -47,9 +47,9 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function __construct( $entity_uri_service, $jsonld_service ) {
+	public function __construct($entity_uri_service, $jsonld_service) {
 
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
+		add_action('wp_head', array($this, 'wp_head'));
 
 		$this->entity_uri_service = $entity_uri_service;
 		$this->jsonld_service     = $jsonld_service;
@@ -67,31 +67,31 @@ 
 	 *
 	 * @return array|boolean
 	 */
-	public function get_carousel_jsonld( $id = null ) {
-		$posts       = $this->get_posts( $id );
+	public function get_carousel_jsonld($id = null) {
+		$posts       = $this->get_posts($id);
 		$post_jsonld = array();
-		if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
+		if ( ! is_array($posts) || count($posts) < 2) {
 			// Bail out if no posts are present.
 			return false;
 		}
 
-		if ( ! is_null( $id ) ) {
-			$term                       = get_term( $id );
-			$post_jsonld['description'] = strip_tags( strip_shortcodes( $term->description ) );
-			$thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
-			if ( ! empty( $thumbnail_id ) ) {
-				$post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
+		if ( ! is_null($id)) {
+			$term                       = get_term($id);
+			$post_jsonld['description'] = strip_tags(strip_shortcodes($term->description));
+			$thumbnail_id               = get_term_meta($id, 'thumbnail_id', true);
+			if ( ! empty($thumbnail_id)) {
+				$post_jsonld['image'] = wp_get_attachment_url($thumbnail_id);
 			}
 		}
 
 		// More than 2 items are present, so construct the post_jsonld data
 		$post_jsonld['@context']        = 'https://schema.org';
 		$post_jsonld['@type']           = 'ItemList';
-		$post_jsonld['url']             = $this->get_term_url( $id );
+		$post_jsonld['url']             = $this->get_term_url($id);
 		$post_jsonld['itemListElement'] = array();
 		$position                       = 1;
 
-		foreach ( $posts as $post_id ) {
+		foreach ($posts as $post_id) {
 			$result = array(
 				'@type'    => 'ListItem',
 				'position' => $position,
@@ -100,31 +100,31 @@ 
 				 *
 				 * See https://developers.google.com/search/docs/data-types/carousel
 				 */
-				'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
+				'url'      => apply_filters('wl_carousel_post_list_item_url', get_permalink($post_id), $post_id),
 			);
-			array_push( $post_jsonld['itemListElement'], $result );
+			array_push($post_jsonld['itemListElement'], $result);
 			$position += 1;
 		}
 
 		return $post_jsonld;
 	}
 
-	private function get_posts( $id ) {
+	private function get_posts($id) {
 		global $wp_query;
 
-		if ( ! is_null( $wp_query->posts ) ) {
-			return array_map( function ( $post ) {
+		if ( ! is_null($wp_query->posts)) {
+			return array_map(function($post) {
 				return $post->ID;
-			}, $wp_query->posts );
+			}, $wp_query->posts);
 		}
 
-		if ( is_null( $id ) ) {
+		if (is_null($id)) {
 			return null;
 		}
 
-		$term = get_term( $id );
+		$term = get_term($id);
 
-		return get_objects_in_term( $id, $term->taxonomy );
+		return get_objects_in_term($id, $term->taxonomy);
 	}
 
 	/**
@@ -136,31 +136,31 @@ 
 		$query_object = get_queried_object();
 
 		// Check if it is a term page.
-		if ( ! $query_object instanceof WP_Term ) {
+		if ( ! $query_object instanceof WP_Term) {
 			return;
 		}
 
 		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+		if ( ! apply_filters('wl_jsonld_enabled', true)) {
 			return;
 		}
 
 		$term_id = $query_object->term_id;
 
-		$jsonld = $this->get( $term_id );
+		$jsonld = $this->get($term_id);
 
 		// Bail out if the JSON-LD is empty.
-		if ( empty( $jsonld ) || empty( $jsonld['jsonld'] ) ) {
+		if (empty($jsonld) || empty($jsonld['jsonld'])) {
 			return;
 		}
 
-		$jsonld_string = wp_json_encode( $jsonld['jsonld'] );
+		$jsonld_string = wp_json_encode($jsonld['jsonld']);
 
 		echo "<script type=\"application/ld+json\" id=\"wl-jsonld-term\">$jsonld_string</script>";
 
 	}
 
-	public function get( $id ) {
+	public function get($id) {
 
 		/**
 		 * Support for carousel rich snippet, get jsonld data present
@@ -171,16 +171,16 @@ 
 		 *
 		 * @since 3.26.0
 		 */
-		$carousel_data = $this->get_carousel_jsonld( $id );
+		$carousel_data = $this->get_carousel_jsonld($id);
 		$jsonld_array  = array();
-		if ( $carousel_data ) {
+		if ($carousel_data) {
 			$jsonld_array[] = $carousel_data;
 		}
-		$context               = empty( $carousel_data ) ? Jsonld_Context_Enum::PAGE : Jsonld_Context_Enum::CAROUSEL;
-		$entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
+		$context               = empty($carousel_data) ? Jsonld_Context_Enum::PAGE : Jsonld_Context_Enum::CAROUSEL;
+		$entities_jsonld_array = $this->get_entity_jsonld($id, $context);
 
 		$result = array(
-			'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
+			'jsonld'     => array_merge($jsonld_array, $entities_jsonld_array),
 			'references' => array()
 		);
 
@@ -190,23 +190,23 @@ 
 		 * @var $id int Term id
 		 * @var $jsonld_array array An array containing jsonld for term and entities.
 		 */
-		$arr = apply_filters( 'wl_term_jsonld_array', $result, $id );
+		$arr = apply_filters('wl_term_jsonld_array', $result, $id);
 
 		return $arr['jsonld'];
 	}
 
-	private function get_term_url( $id ) {
+	private function get_term_url($id) {
 
-		if ( is_null( $id ) ) {
+		if (is_null($id)) {
 			return $_SERVER['REQUEST_URI'];
 		}
 
-		$maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
-		if ( ! empty( $maybe_url ) ) {
+		$maybe_url = get_term_meta($id, Wordlift_Url_Property_Service::META_KEY, true);
+		if ( ! empty($maybe_url)) {
 			return $maybe_url;
 		}
 
-		return get_term_link( $id );
+		return get_term_link($id);
 	}
 
 	/**
@@ -217,24 +217,24 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_entity_jsonld( $term_id, $context ) {
+	private function get_entity_jsonld($term_id, $context) {
 		// The `_wl_entity_id` are URIs.
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
+		$entity_ids         = get_term_meta($term_id, '_wl_entity_id');
 		$entity_uri_service = $this->entity_uri_service;
 
-		$local_entity_ids = array_filter( $entity_ids, function ( $uri ) use ( $entity_uri_service ) {
-			return $entity_uri_service->is_internal( $uri );
+		$local_entity_ids = array_filter($entity_ids, function($uri) use ($entity_uri_service) {
+			return $entity_uri_service->is_internal($uri);
 		} );
 
 		// Bail out if there are no entities.
-		if ( empty( $local_entity_ids ) ) {
+		if (empty($local_entity_ids)) {
 			return array();
 		}
 
-		$post   = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
-		$jsonld = $this->jsonld_service->get_jsonld( false, $post->ID, $context );
+		$post   = $this->entity_uri_service->get_entity(array_shift($local_entity_ids));
+		$jsonld = $this->jsonld_service->get_jsonld(false, $post->ID, $context);
 		// Reset the `url` to the term page.
-		$jsonld[0]['url'] = get_term_link( $term_id );
+		$jsonld[0]['url'] = get_term_link($term_id);
 
 		return $jsonld;
 	}

src/wordlift/jsonld/class-jsonld-endpoint.php

Indentation +165 added lines, -165 removed lines

@@ -21,157 +21,157 @@ 
  */
 class Jsonld_Endpoint {
 
-	/**
-	 * The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Endpoint constructor.
-	 *
-	 * @param Jsonld_Service $jsonld_service
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
-	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
-
-		$this->jsonld_service     = $jsonld_service;
-		$this->entity_uri_service = $entity_uri_service;
-
-		// PHP 5.3 compatibility.
-		$that = $this;
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $that, 'jsonld_using_post_id' ),
-				'permission_callback' => '__return_true',
-				'args'                => array(
-					'id' => array(
-						'validate_callback' => function ( $param, $request, $key ) {
-							return is_numeric( $param );
-						},
-						'sanitize_callback' => 'absint',
-					),
-				)
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_item_id' ),
-				'permission_callback' => '__return_true',
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_post_meta' ),
-				'permission_callback' => '__return_true',
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_meta' ),
-				'permission_callback' => '__return_true',
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
-				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_get_page_by_path' ),
-				'permission_callback' => '__return_true',
-			) );
-
-		} );
-
-	}
-
-	/**
-	 * Callback for the JSON-LD request.
-	 *
-	 * @param array $request {
-	 *  The request array.
-	 *
-	 * @type int $id The post id.
-	 * }
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_post_id( $request ) {
-
-		$post_id = $request['id'];
-		$type    = ( 0 === $post_id ? Object_Type_Enum::HOMEPAGE : Object_Type_Enum::POST );
-
-		// Send the generated JSON-LD.
-		$data = $this->jsonld_service->get( $type, $post_id, Jsonld_Context_Enum::REST );
-
-		return Jsonld_Response_Helper::to_response( $data );
-	}
-
-	/**
-	 * Provide a JSON-LD given the itemId.
-	 *
-	 * @param array $request {
-	 *  The request array.
-	 *
-	 * @type string $item_id The entity item id.
-	 * }
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_item_id( $request ) {
-
-		$item_id = 'http://' . $request['item_id'];
-		$post    = $this->entity_uri_service->get_entity( $item_id );
-
-		if ( ! is_a( $post, 'WP_Post' ) ) {
-			return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
-
-		return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
-	}
-
-	public function jsonld_using_get_page_by_path( $request ) {
-
-		$post_name = $request['post_name'];
-		$post_type = $request['post_type'];
-
-		global $wpdb;
-
-		$sql = "
+    /**
+     * The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Endpoint constructor.
+     *
+     * @param Jsonld_Service $jsonld_service
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service
+     */
+    public function __construct( $jsonld_service, $entity_uri_service ) {
+
+        $this->jsonld_service     = $jsonld_service;
+        $this->entity_uri_service = $entity_uri_service;
+
+        // PHP 5.3 compatibility.
+        $that = $this;
+        add_action( 'rest_api_init', function () use ( $that ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
+                'methods'             => WP_REST_Server::READABLE,
+                'callback'            => array( $that, 'jsonld_using_post_id' ),
+                'permission_callback' => '__return_true',
+                'args'                => array(
+                    'id' => array(
+                        'validate_callback' => function ( $param, $request, $key ) {
+                            return is_numeric( $param );
+                        },
+                        'sanitize_callback' => 'absint',
+                    ),
+                )
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_item_id' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_post_meta' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_meta' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
+                'methods'             => 'GET',
+                'callback'            => array( $that, 'jsonld_using_get_page_by_path' ),
+                'permission_callback' => '__return_true',
+            ) );
+
+        } );
+
+    }
+
+    /**
+     * Callback for the JSON-LD request.
+     *
+     * @param array $request {
+     *  The request array.
+     *
+     * @type int $id The post id.
+     * }
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_post_id( $request ) {
+
+        $post_id = $request['id'];
+        $type    = ( 0 === $post_id ? Object_Type_Enum::HOMEPAGE : Object_Type_Enum::POST );
+
+        // Send the generated JSON-LD.
+        $data = $this->jsonld_service->get( $type, $post_id, Jsonld_Context_Enum::REST );
+
+        return Jsonld_Response_Helper::to_response( $data );
+    }
+
+    /**
+     * Provide a JSON-LD given the itemId.
+     *
+     * @param array $request {
+     *  The request array.
+     *
+     * @type string $item_id The entity item id.
+     * }
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_item_id( $request ) {
+
+        $item_id = 'http://' . $request['item_id'];
+        $post    = $this->entity_uri_service->get_entity( $item_id );
+
+        if ( ! is_a( $post, 'WP_Post' ) ) {
+            return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
+
+        return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
+    }
+
+    public function jsonld_using_get_page_by_path( $request ) {
+
+        $post_name = $request['post_name'];
+        $post_type = $request['post_type'];
+
+        global $wpdb;
+
+        $sql = "
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_name = %s
 			 AND post_type = %s
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
+        $post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
+        if ( is_null( $post_id ) ) {
+            return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
-	}
+        return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+    }
 
-	/**
-	 * @param WP_REST_Request $request
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_post_meta( $request ) {
+    /**
+     * @param WP_REST_Request $request
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_post_meta( $request ) {
 
-		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+        $meta_key   = $request['meta_key'];
+        $meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
 
-		global $wpdb;
+        global $wpdb;
 
-		$sql = "
+        $sql = "
 			SELECT post_id AS ID
 			FROM $wpdb->postmeta
 			WHERE meta_key = %s
@@ -179,24 +179,24 @@ 
 			LIMIT 1
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $meta_key, $meta_value ) );
+        $post_id = $wpdb->get_var( $wpdb->prepare( $sql, $meta_key, $meta_value ) );
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "Post with meta key $meta_key and value $meta_value not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
+        if ( is_null( $post_id ) ) {
+            return new WP_REST_Response( esc_html( "Post with meta key $meta_key and value $meta_value not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
-	}
+        return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+    }
 
-	public function jsonld_using_meta( $request ) {
+    public function jsonld_using_meta( $request ) {
 
-		global $wpdb;
+        global $wpdb;
 
-		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+        $meta_key   = $request['meta_key'];
+        $meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
 
-		$results = $wpdb->get_results( $wpdb->prepare(
-			"
+        $results = $wpdb->get_results( $wpdb->prepare(
+            "
 			SELECT pm.post_id AS id, %s AS type
 			 FROM {$wpdb->postmeta} pm
 			 	INNER JOIN {$wpdb->posts} p
@@ -207,23 +207,23 @@ 
 			 FROM {$wpdb->termmeta}
 			 WHERE meta_key = %s AND meta_value = %s
 			",
-			Object_Type_Enum::POST,
-			$meta_key,
-			$meta_value,
-			Object_Type_Enum::TERM,
-			$meta_key,
-			$meta_value
-		) );
+            Object_Type_Enum::POST,
+            $meta_key,
+            $meta_value,
+            Object_Type_Enum::TERM,
+            $meta_key,
+            $meta_value
+        ) );
 
-		$jsonld_service = $this->jsonld_service;
+        $jsonld_service = $this->jsonld_service;
 
-		$data = array_reduce( $results, function ( $carry, $result ) use ( $jsonld_service ) {
-			$jsonld = $jsonld_service->get( $result->type, $result->id, Jsonld_Context_Enum::REST );
+        $data = array_reduce( $results, function ( $carry, $result ) use ( $jsonld_service ) {
+            $jsonld = $jsonld_service->get( $result->type, $result->id, Jsonld_Context_Enum::REST );
 
-			return array_merge( $carry, $jsonld );
-		}, array() );
+            return array_merge( $carry, $jsonld );
+        }, array() );
 
-		return Jsonld_Response_Helper::to_response( $data );
-	}
+        return Jsonld_Response_Helper::to_response( $data );
+    }
 
 }

Spacing +49 added lines, -49 removed lines

@@ -38,51 +38,51 @@ 
 	 * @param Jsonld_Service $jsonld_service
 	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
 	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
+	public function __construct($jsonld_service, $entity_uri_service) {
 
 		$this->jsonld_service     = $jsonld_service;
 		$this->entity_uri_service = $entity_uri_service;
 
 		// PHP 5.3 compatibility.
 		$that = $this;
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
+		add_action('rest_api_init', function() use ($that) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
 				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $that, 'jsonld_using_post_id' ),
+				'callback'            => array($that, 'jsonld_using_post_id'),
 				'permission_callback' => '__return_true',
 				'args'                => array(
 					'id' => array(
-						'validate_callback' => function ( $param, $request, $key ) {
-							return is_numeric( $param );
+						'validate_callback' => function($param, $request, $key) {
+							return is_numeric($param);
 						},
 						'sanitize_callback' => 'absint',
 					),
 				)
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_item_id' ),
+				'callback'            => array($that, 'jsonld_using_item_id'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/post-meta/(?P<meta_key>[^/]+)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_post_meta' ),
+				'callback'            => array($that, 'jsonld_using_post_meta'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/meta/(?P<meta_key>[^/]+)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_meta' ),
+				'callback'            => array($that, 'jsonld_using_meta'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
 				'methods'             => 'GET',
-				'callback'            => array( $that, 'jsonld_using_get_page_by_path' ),
+				'callback'            => array($that, 'jsonld_using_get_page_by_path'),
 				'permission_callback' => '__return_true',
-			) );
+			));
 
 		} );
 
@@ -100,15 +100,15 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_post_id( $request ) {
+	public function jsonld_using_post_id($request) {
 
 		$post_id = $request['id'];
-		$type    = ( 0 === $post_id ? Object_Type_Enum::HOMEPAGE : Object_Type_Enum::POST );
+		$type    = (0 === $post_id ? Object_Type_Enum::HOMEPAGE : Object_Type_Enum::POST);
 
 		// Send the generated JSON-LD.
-		$data = $this->jsonld_service->get( $type, $post_id, Jsonld_Context_Enum::REST );
+		$data = $this->jsonld_service->get($type, $post_id, Jsonld_Context_Enum::REST);
 
-		return Jsonld_Response_Helper::to_response( $data );
+		return Jsonld_Response_Helper::to_response($data);
 	}
 
 	/**
@@ -123,19 +123,19 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_item_id( $request ) {
+	public function jsonld_using_item_id($request) {
 
-		$item_id = 'http://' . $request['item_id'];
-		$post    = $this->entity_uri_service->get_entity( $item_id );
+		$item_id = 'http://'.$request['item_id'];
+		$post    = $this->entity_uri_service->get_entity($item_id);
 
-		if ( ! is_a( $post, 'WP_Post' ) ) {
-			return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if ( ! is_a($post, 'WP_Post')) {
+			return new WP_REST_Response(esc_html("$item_id not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
+		return $this->jsonld_using_post_id(array('id' => $post->ID,));
 	}
 
-	public function jsonld_using_get_page_by_path( $request ) {
+	public function jsonld_using_get_page_by_path($request) {
 
 		$post_name = $request['post_name'];
 		$post_type = $request['post_type'];
@@ -149,13 +149,13 @@ 
 			 AND post_type = %s
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
+		$post_id = $wpdb->get_var($wpdb->prepare($sql, $post_name, $post_type));
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if (is_null($post_id)) {
+			return new WP_REST_Response(esc_html("$post_name of type $post_type not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+		return $this->jsonld_using_post_id(array('id' => $post_id,));
 	}
 
 	/**
@@ -164,10 +164,10 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_post_meta( $request ) {
+	public function jsonld_using_post_meta($request) {
 
 		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+		$meta_value = urldecode(current($request->get_query_params('meta_value')));
 
 		global $wpdb;
 
@@ -179,23 +179,23 @@ 
 			LIMIT 1
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $meta_key, $meta_value ) );
+		$post_id = $wpdb->get_var($wpdb->prepare($sql, $meta_key, $meta_value));
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "Post with meta key $meta_key and value $meta_value not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if (is_null($post_id)) {
+			return new WP_REST_Response(esc_html("Post with meta key $meta_key and value $meta_value not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+		return $this->jsonld_using_post_id(array('id' => $post_id,));
 	}
 
-	public function jsonld_using_meta( $request ) {
+	public function jsonld_using_meta($request) {
 
 		global $wpdb;
 
 		$meta_key   = $request['meta_key'];
-		$meta_value = urldecode( current( $request->get_query_params( 'meta_value' ) ) );
+		$meta_value = urldecode(current($request->get_query_params('meta_value')));
 
-		$results = $wpdb->get_results( $wpdb->prepare(
+		$results = $wpdb->get_results($wpdb->prepare(
 			"
 			SELECT pm.post_id AS id, %s AS type
 			 FROM {$wpdb->postmeta} pm
@@ -213,17 +213,17 @@ 
 			Object_Type_Enum::TERM,
 			$meta_key,
 			$meta_value
-		) );
+		));
 
 		$jsonld_service = $this->jsonld_service;
 
-		$data = array_reduce( $results, function ( $carry, $result ) use ( $jsonld_service ) {
-			$jsonld = $jsonld_service->get( $result->type, $result->id, Jsonld_Context_Enum::REST );
+		$data = array_reduce($results, function($carry, $result) use ($jsonld_service) {
+			$jsonld = $jsonld_service->get($result->type, $result->id, Jsonld_Context_Enum::REST);
 
-			return array_merge( $carry, $jsonld );
-		}, array() );
+			return array_merge($carry, $jsonld);
+		}, array());
 
-		return Jsonld_Response_Helper::to_response( $data );
+		return Jsonld_Response_Helper::to_response($data);
 	}
 
 }

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

Indentation +74 added lines, -74 removed lines

@@ -6,79 +6,79 @@
 
 class Jsonld_Article_Wrapper {
 
-	private static $article_types = array(
-		'Article',
-		'AdvertiserContentArticle',
-		'NewsArticle',
-		'AnalysisNewsArticle',
-		'AskPublicNewsArticle',
-		'BackgroundNewsArticle',
-		'OpinionNewsArticle',
-		'ReportageNewsArticle',
-		'ReviewNewsArticle',
-		'Report',
-		'SatiricalArticle',
-		'ScholarlyArticle',
-		'MedicalScholarlyArticle',
-		'SocialMediaPosting',
-		'BlogPosting',
-		'LiveBlogPosting',
-		'DiscussionForumPosting',
-		'TechArticle',
-		'APIReference'
-	);
-
-	/**
-	 * @var Wordlift_Post_To_Jsonld_Converter
-	 */
-	private $post_to_jsonld_converter;
-
-	public function __construct( $post_to_jsonld_converter ) {
-
-		$this->post_to_jsonld_converter = $post_to_jsonld_converter;
-
-		add_filter( 'wl_after_get_jsonld', array( $this, 'after_get_jsonld' ), 10, 3 );
-
-	}
-
-	public function after_get_jsonld( $jsonld, $post_id, $context ) {
-
-		if ( Jsonld_Context_Enum::PAGE !== $context || ! is_array( $jsonld ) || ! isset( $jsonld[0] )
-		     || ! is_array( $jsonld[0] ) ) {
-			return $jsonld;
-		}
-
-		// Copy the 1st array element
-		$post_jsonld = $jsonld[0];
-
-		// Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
-		// in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
-		if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
-			return $jsonld;
-		}
-
-		// Convert the post as Article.
-		$article_jsonld        = $this->post_to_jsonld_converter->convert( $post_id );
-		$article_jsonld['@id'] = $post_jsonld['@id'] . '/wrapper';
-		// Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
-		$article_jsonld['@type'] = 'Article';
-		$article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
-
-		// Copy over the URLs.
-		if ( isset( $post_jsonld['url'] ) ) {
-			$article_jsonld['url'] = $post_jsonld['url'];
-		}
-
-		array_unshift( $jsonld, $article_jsonld );
-
-		return $jsonld;
-	}
-
-	private function is_article( $schema_types ) {
-
-		$array_intersect = array_intersect( self::$article_types, ( array ) $schema_types );
-
-		return ! empty( $array_intersect );
-	}
+    private static $article_types = array(
+        'Article',
+        'AdvertiserContentArticle',
+        'NewsArticle',
+        'AnalysisNewsArticle',
+        'AskPublicNewsArticle',
+        'BackgroundNewsArticle',
+        'OpinionNewsArticle',
+        'ReportageNewsArticle',
+        'ReviewNewsArticle',
+        'Report',
+        'SatiricalArticle',
+        'ScholarlyArticle',
+        'MedicalScholarlyArticle',
+        'SocialMediaPosting',
+        'BlogPosting',
+        'LiveBlogPosting',
+        'DiscussionForumPosting',
+        'TechArticle',
+        'APIReference'
+    );
+
+    /**
+     * @var Wordlift_Post_To_Jsonld_Converter
+     */
+    private $post_to_jsonld_converter;
+
+    public function __construct( $post_to_jsonld_converter ) {
+
+        $this->post_to_jsonld_converter = $post_to_jsonld_converter;
+
+        add_filter( 'wl_after_get_jsonld', array( $this, 'after_get_jsonld' ), 10, 3 );
+
+    }
+
+    public function after_get_jsonld( $jsonld, $post_id, $context ) {
+
+        if ( Jsonld_Context_Enum::PAGE !== $context || ! is_array( $jsonld ) || ! isset( $jsonld[0] )
+             || ! is_array( $jsonld[0] ) ) {
+            return $jsonld;
+        }
+
+        // Copy the 1st array element
+        $post_jsonld = $jsonld[0];
+
+        // Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
+        // in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
+        if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
+            return $jsonld;
+        }
+
+        // Convert the post as Article.
+        $article_jsonld        = $this->post_to_jsonld_converter->convert( $post_id );
+        $article_jsonld['@id'] = $post_jsonld['@id'] . '/wrapper';
+        // Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
+        $article_jsonld['@type'] = 'Article';
+        $article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
+
+        // Copy over the URLs.
+        if ( isset( $post_jsonld['url'] ) ) {
+            $article_jsonld['url'] = $post_jsonld['url'];
+        }
+
+        array_unshift( $jsonld, $article_jsonld );
+
+        return $jsonld;
+    }
+
+    private function is_article( $schema_types ) {
+
+        $array_intersect = array_intersect( self::$article_types, ( array ) $schema_types );
+
+        return ! empty( $array_intersect );
+    }
 
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -33,18 +33,18 @@ 
 	 */
 	private $post_to_jsonld_converter;
 
-	public function __construct( $post_to_jsonld_converter ) {
+	public function __construct($post_to_jsonld_converter) {
 
 		$this->post_to_jsonld_converter = $post_to_jsonld_converter;
 
-		add_filter( 'wl_after_get_jsonld', array( $this, 'after_get_jsonld' ), 10, 3 );
+		add_filter('wl_after_get_jsonld', array($this, 'after_get_jsonld'), 10, 3);
 
 	}
 
-	public function after_get_jsonld( $jsonld, $post_id, $context ) {
+	public function after_get_jsonld($jsonld, $post_id, $context) {
 
-		if ( Jsonld_Context_Enum::PAGE !== $context || ! is_array( $jsonld ) || ! isset( $jsonld[0] )
-		     || ! is_array( $jsonld[0] ) ) {
+		if (Jsonld_Context_Enum::PAGE !== $context || ! is_array($jsonld) || ! isset($jsonld[0])
+		     || ! is_array($jsonld[0])) {
 			return $jsonld;
 		}
 
@@ -53,32 +53,32 @@ 
 
 		// Don't wrap in article if the json-ld is already about an Article (or its descendants). `@type` must be
 		// in the schema.org context, i.e. `Article`, not `http://schema.org/Article`.
-		if ( ! isset( $post_jsonld['@id'] ) || ! isset( $post_jsonld['@type'] ) || $this->is_article( $post_jsonld['@type'] ) ) {
+		if ( ! isset($post_jsonld['@id']) || ! isset($post_jsonld['@type']) || $this->is_article($post_jsonld['@type'])) {
 			return $jsonld;
 		}
 
 		// Convert the post as Article.
-		$article_jsonld        = $this->post_to_jsonld_converter->convert( $post_id );
-		$article_jsonld['@id'] = $post_jsonld['@id'] . '/wrapper';
+		$article_jsonld        = $this->post_to_jsonld_converter->convert($post_id);
+		$article_jsonld['@id'] = $post_jsonld['@id'].'/wrapper';
 		// Reset the type, since by default the type assigned via the Entity Type taxonomy is used.
 		$article_jsonld['@type'] = 'Article';
-		$article_jsonld['about'] = array( '@id' => $post_jsonld['@id'] );
+		$article_jsonld['about'] = array('@id' => $post_jsonld['@id']);
 
 		// Copy over the URLs.
-		if ( isset( $post_jsonld['url'] ) ) {
+		if (isset($post_jsonld['url'])) {
 			$article_jsonld['url'] = $post_jsonld['url'];
 		}
 
-		array_unshift( $jsonld, $article_jsonld );
+		array_unshift($jsonld, $article_jsonld);
 
 		return $jsonld;
 	}
 
-	private function is_article( $schema_types ) {
+	private function is_article($schema_types) {
 
-		$array_intersect = array_intersect( self::$article_types, ( array ) $schema_types );
+		$array_intersect = array_intersect(self::$article_types, (array) $schema_types);
 
-		return ! empty( $array_intersect );
+		return ! empty($array_intersect);
 	}
 
 }
\ No newline at end of file

src/wordlift/jsonld/class-jsonld-context-enum.php

Indentation +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@
 
 class Jsonld_Context_Enum {
 
-	const UNKNOWN = 0;
-	/** Web Page output (typically in the head). */
-	const PAGE = 1;
-	/** Carousel. */
-	const CAROUSEL = 2;
-	const FAQ = 3;
-	/** REST services. */
-	const REST = 3;
+    const UNKNOWN = 0;
+    /** Web Page output (typically in the head). */
+    const PAGE = 1;
+    /** Carousel. */
+    const CAROUSEL = 2;
+    const FAQ = 3;
+    /** REST services. */
+    const REST = 3;
 
 }

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

Indentation +73 added lines, -73 removed lines

@@ -10,78 +10,78 @@
 
 class Jsonld_Service {
 
-	/**
-	 * @var Jsonld_Service
-	 */
-	private static $instance;
-
-	/**
-	 * @var Wordlift_Jsonld_Service
-	 */
-	private $legacy_jsonld_service;
-
-	/**
-	 * @var Wordlift_Term_JsonLd_Adapter
-	 */
-	private $term_jsonld_service;
-
-	/**
-	 * @var Jsonld_User_Service
-	 */
-	private $jsonld_user_service;
-
-	/**
-	 * Jsonld_Service constructor.
-	 *
-	 * @param Wordlift_Jsonld_Service $legacy_jsonld_service
-	 * @param Wordlift_Term_JsonLd_Adapter $term_jsonld_adapter
-	 * @param Jsonld_User_Service $jsonld_user_service
-	 *
-	 * @throws Exception
-	 */
-	public function __construct( $legacy_jsonld_service, $term_jsonld_adapter, $jsonld_user_service ) {
-
-		Assertions::assert_of_type( $legacy_jsonld_service, 'Wordlift_Jsonld_Service' );
-		Assertions::assert_of_type( $term_jsonld_adapter, 'Wordlift_Term_JsonLd_Adapter' );
-		Assertions::assert_of_type( $jsonld_user_service, 'Wordlift\Jsonld\Jsonld_User_Service' );
-
-		$this->legacy_jsonld_service = $legacy_jsonld_service;
-		$this->term_jsonld_service   = $term_jsonld_adapter;
-		$this->jsonld_user_service   = $jsonld_user_service;
-		$this->jsonld_user_service->set_jsonld_service( $this );
-
-		self::$instance = $this;
-	}
-
-	public static function get_instance() {
-		return self::$instance;
-	}
-
-	/**
-	 * Get the JSON-LD structure for the specified type and id.
-	 *
-	 * @param int $type The requested type, one of 'HOMEPAGE', 'POST' or 'TERM'. Default 'POST'.
-	 * @param int|null $id The id. Default `null`.
-	 * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
-	 *
-	 * @return array The JSON-LD structure.
-	 * @throws Exception Throws an exception if the type isn't recognized.
-	 */
-	public function get( $type = Object_Type_Enum::POST, $id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
-
-		switch ( $type ) {
-			case Object_Type_Enum::HOMEPAGE:
-				return $this->legacy_jsonld_service->get_jsonld( true, $id, $context );
-			case Object_Type_Enum::POST:
-				return $this->legacy_jsonld_service->get_jsonld( false, $id, $context );
-			case Object_Type_Enum::TERM:
-				return $this->term_jsonld_service->get( $id );
-			case Object_Type_Enum::USER:
-				return $this->jsonld_user_service->get( $id );
-			default:
-				throw new Exception( "Unknown type $type. Allowed types: 'HOMEPAGE', 'POST', 'TERM', 'USER'." );
-		}
-
-	}
+    /**
+     * @var Jsonld_Service
+     */
+    private static $instance;
+
+    /**
+     * @var Wordlift_Jsonld_Service
+     */
+    private $legacy_jsonld_service;
+
+    /**
+     * @var Wordlift_Term_JsonLd_Adapter
+     */
+    private $term_jsonld_service;
+
+    /**
+     * @var Jsonld_User_Service
+     */
+    private $jsonld_user_service;
+
+    /**
+     * Jsonld_Service constructor.
+     *
+     * @param Wordlift_Jsonld_Service $legacy_jsonld_service
+     * @param Wordlift_Term_JsonLd_Adapter $term_jsonld_adapter
+     * @param Jsonld_User_Service $jsonld_user_service
+     *
+     * @throws Exception
+     */
+    public function __construct( $legacy_jsonld_service, $term_jsonld_adapter, $jsonld_user_service ) {
+
+        Assertions::assert_of_type( $legacy_jsonld_service, 'Wordlift_Jsonld_Service' );
+        Assertions::assert_of_type( $term_jsonld_adapter, 'Wordlift_Term_JsonLd_Adapter' );
+        Assertions::assert_of_type( $jsonld_user_service, 'Wordlift\Jsonld\Jsonld_User_Service' );
+
+        $this->legacy_jsonld_service = $legacy_jsonld_service;
+        $this->term_jsonld_service   = $term_jsonld_adapter;
+        $this->jsonld_user_service   = $jsonld_user_service;
+        $this->jsonld_user_service->set_jsonld_service( $this );
+
+        self::$instance = $this;
+    }
+
+    public static function get_instance() {
+        return self::$instance;
+    }
+
+    /**
+     * Get the JSON-LD structure for the specified type and id.
+     *
+     * @param int $type The requested type, one of 'HOMEPAGE', 'POST' or 'TERM'. Default 'POST'.
+     * @param int|null $id The id. Default `null`.
+     * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
+     *
+     * @return array The JSON-LD structure.
+     * @throws Exception Throws an exception if the type isn't recognized.
+     */
+    public function get( $type = Object_Type_Enum::POST, $id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+
+        switch ( $type ) {
+            case Object_Type_Enum::HOMEPAGE:
+                return $this->legacy_jsonld_service->get_jsonld( true, $id, $context );
+            case Object_Type_Enum::POST:
+                return $this->legacy_jsonld_service->get_jsonld( false, $id, $context );
+            case Object_Type_Enum::TERM:
+                return $this->term_jsonld_service->get( $id );
+            case Object_Type_Enum::USER:
+                return $this->jsonld_user_service->get( $id );
+            default:
+                throw new Exception( "Unknown type $type. Allowed types: 'HOMEPAGE', 'POST', 'TERM', 'USER'." );
+        }
+
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -39,16 +39,16 @@ 
 	 *
 	 * @throws Exception
 	 */
-	public function __construct( $legacy_jsonld_service, $term_jsonld_adapter, $jsonld_user_service ) {
+	public function __construct($legacy_jsonld_service, $term_jsonld_adapter, $jsonld_user_service) {
 
-		Assertions::assert_of_type( $legacy_jsonld_service, 'Wordlift_Jsonld_Service' );
-		Assertions::assert_of_type( $term_jsonld_adapter, 'Wordlift_Term_JsonLd_Adapter' );
-		Assertions::assert_of_type( $jsonld_user_service, 'Wordlift\Jsonld\Jsonld_User_Service' );
+		Assertions::assert_of_type($legacy_jsonld_service, 'Wordlift_Jsonld_Service');
+		Assertions::assert_of_type($term_jsonld_adapter, 'Wordlift_Term_JsonLd_Adapter');
+		Assertions::assert_of_type($jsonld_user_service, 'Wordlift\Jsonld\Jsonld_User_Service');
 
 		$this->legacy_jsonld_service = $legacy_jsonld_service;
 		$this->term_jsonld_service   = $term_jsonld_adapter;
 		$this->jsonld_user_service   = $jsonld_user_service;
-		$this->jsonld_user_service->set_jsonld_service( $this );
+		$this->jsonld_user_service->set_jsonld_service($this);
 
 		self::$instance = $this;
 	}
@@ -67,19 +67,19 @@ 
 	 * @return array The JSON-LD structure.
 	 * @throws Exception Throws an exception if the type isn't recognized.
 	 */
-	public function get( $type = Object_Type_Enum::POST, $id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+	public function get($type = Object_Type_Enum::POST, $id = null, $context = Jsonld_Context_Enum::UNKNOWN) {
 
-		switch ( $type ) {
+		switch ($type) {
 			case Object_Type_Enum::HOMEPAGE:
-				return $this->legacy_jsonld_service->get_jsonld( true, $id, $context );
+				return $this->legacy_jsonld_service->get_jsonld(true, $id, $context);
 			case Object_Type_Enum::POST:
-				return $this->legacy_jsonld_service->get_jsonld( false, $id, $context );
+				return $this->legacy_jsonld_service->get_jsonld(false, $id, $context);
 			case Object_Type_Enum::TERM:
-				return $this->term_jsonld_service->get( $id );
+				return $this->term_jsonld_service->get($id);
 			case Object_Type_Enum::USER:
-				return $this->jsonld_user_service->get( $id );
+				return $this->jsonld_user_service->get($id);
 			default:
-				throw new Exception( "Unknown type $type. Allowed types: 'HOMEPAGE', 'POST', 'TERM', 'USER'." );
+				throw new Exception("Unknown type $type. Allowed types: 'HOMEPAGE', 'POST', 'TERM', 'USER'.");
 		}
 
 	}

src/wordlift.php

Indentation +241 added lines, -241 removed lines

@@ -51,7 +51,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
@@ -74,7 +74,7 @@ 
  */
 function wl_write_log( $log ) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+    Wordlift_Log_Service::get_instance()->debug( $log );
 
 }
 
@@ -91,7 +91,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -99,21 +99,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array(),
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array(),
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // add allowed post tags.
@@ -124,18 +124,18 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
 
-	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
-	}
+    // Disable auto-save for custom entity posts only
+    if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
+        wp_dequeue_script( 'autosave' );
+    }
 
 }
 
@@ -151,18 +151,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => true,
-			'itemtype'  => true,
-			'itemid'    => true,
-			'itemprop'  => true,
-		),
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => true,
+            'itemtype'  => true,
+            'itemid'    => true,
+            'itemprop'  => true,
+        ),
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -176,16 +176,16 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
-	// place on the globe:"The zero/zero point of this system is located in the
-	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific
+    // place on the globe:"The zero/zero point of this system is located in the
+    // Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+    );
 }
 
 /**
@@ -199,9 +199,9 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	return Wordlift_Storage_Factory::get_instance()
-	                               ->post_images()
-	                               ->get( $post_id );
+    return Wordlift_Storage_Factory::get_instance()
+                                    ->post_images()
+                                    ->get( $post_id );
 
 }
 
@@ -215,24 +215,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url,
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url,
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return null;
+    // Return null.
+    return null;
 }
 
 /**
@@ -243,8 +243,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 /**
@@ -261,7 +261,7 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+    return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
 }
 
 /**
@@ -273,47 +273,47 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
+    $log->trace( 'Replacing item IDs with URIs...' );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()
+                                            ->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( null === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( ! empty( $uri ) && $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( ! empty( $uri ) && $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -376,29 +376,29 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
-
-	$log->info( 'Activating WordLift...' );
-
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
-
-	/**
-	 * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 * @since 3.19.2
-	 */
-	Wordlift_Http_Api::activate();
-
-	// Ensure the post type is registered before flushing the rewrite rules.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-	flush_rewrite_rules();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::activate();
+    $log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+
+    $log->info( 'Activating WordLift...' );
+
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
+
+    /**
+     * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     * @since 3.19.2
+     */
+    Wordlift_Http_Api::activate();
+
+    // Ensure the post type is registered before flushing the rewrite rules.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+    flush_rewrite_rules();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::activate();
 }
 
 /**
@@ -407,21 +407,21 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
-	Wordlift_Http_Api::deactivate();
-	Ttl_Cache_Cleaner::deactivate();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::deactivate();
-	/**
-	 * @since 3.27.8
-	 * Remove notification flag on deactivation.
-	 */
-	Key_Validation_Notice::remove_notification_flag();
-	flush_rewrite_rules();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
+    Wordlift_Http_Api::deactivate();
+    Ttl_Cache_Cleaner::deactivate();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::deactivate();
+    /**
+     * @since 3.27.8
+     * Remove notification flag on deactivation.
+     */
+    Key_Validation_Notice::remove_notification_flag();
+    flush_rewrite_rules();
 
 }
 
@@ -444,104 +444,104 @@ 
  * @since    1.0.0
  */
 function run_wordlift() {
-	/**
-	 * Filter: wl_feature__enable__widgets.
-	 *
-	 * @param bool whether the widgets needed to be registered, defaults to true.
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
-	}
-	add_filter( 'widget_text', 'do_shortcode' );
-
-
-	/**
-	 * Filter: wl_feature__enable__analysis
-	 *
-	 * @param bool Whether to send api request to analysis or not
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
-	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
-	}
-
-	/*
+    /**
+     * Filter: wl_feature__enable__widgets.
+     *
+     * @param bool whether the widgets needed to be registered, defaults to true.
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
+        add_action( 'widgets_init', 'wl_register_chord_widget' );
+        add_action( 'widgets_init', 'wl_register_geo_widget' );
+        add_action( 'widgets_init', 'wl_register_timeline_widget' );
+    }
+    add_filter( 'widget_text', 'do_shortcode' );
+
+
+    /**
+     * Filter: wl_feature__enable__analysis
+     *
+     * @param bool Whether to send api request to analysis or not
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+    } else {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+    }
+
+    /*
 	 * We introduce the WordLift autoloader, since we start using classes in namespaces, i.e. Wordlift\Http.
 	 *
 	 * @since 3.21.2
 	 */
-	wordlift_plugin_autoload_register();
+    wordlift_plugin_autoload_register();
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
-	// Initialize the TTL Cache Cleaner.
-	new Ttl_Cache_Cleaner();
+    // Initialize the TTL Cache Cleaner.
+    new Ttl_Cache_Cleaner();
 
-	// Load the new Post Adapter.
-	new Post_Adapter();
+    // Load the new Post Adapter.
+    new Post_Adapter();
 
-	// Load the API Data Hooks.
-	new Api_Data_Hooks();
+    // Load the API Data Hooks.
+    new Api_Data_Hooks();
 
-	add_action( 'plugins_loaded', function () {
-		// Load early. **PLEASE NOTE** that features are applied only to calls that happen **AFTER** the `plugins_loaded`
-		// action.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
-	}, 1 );
+    add_action( 'plugins_loaded', function () {
+        // Load early. **PLEASE NOTE** that features are applied only to calls that happen **AFTER** the `plugins_loaded`
+        // action.
+        require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
+    }, 1 );
 
-	add_action( 'plugins_loaded', function () use ( $plugin ) {
-		// Licenses Images.
-		$user_agent                   = User_Agent::get_user_agent();
-		$wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
-		$api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ), 60, $user_agent, $wordlift_key );
-		$image_license_factory        = new Image_License_Factory();
-		$image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
-		$image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
-		$cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
+    add_action( 'plugins_loaded', function () use ( $plugin ) {
+        // Licenses Images.
+        $user_agent                   = User_Agent::get_user_agent();
+        $wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
+        $api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ), 60, $user_agent, $wordlift_key );
+        $image_license_factory        = new Image_License_Factory();
+        $image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
+        $image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
+        $cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
 
-		$image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
-		$image_license_cleanup_service = new Image_License_Cleanup_Service();
+        $image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
+        $image_license_cleanup_service = new Image_License_Cleanup_Service();
 
-		// Get the cached data. If we have cached data, we load the notifier.
-		$image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
-		if ( null !== $image_license_data ) {
-			$image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
-			new Image_License_Notifier( $image_license_data, $image_license_page );
-		}
+        // Get the cached data. If we have cached data, we load the notifier.
+        $image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
+        if ( null !== $image_license_data ) {
+            $image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
+            new Image_License_Notifier( $image_license_data, $image_license_page );
+        }
 
-		$remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
-		$remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
+        $remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
+        $remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
 
-		$reload_data_task         = new Reload_Data_Task();
-		$reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
+        $reload_data_task         = new Reload_Data_Task();
+        $reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
 
-		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
-		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
+        $add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
+        $add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
 
-		$remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
-		$reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
-		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
+        $remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
+        $reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
+        $add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
 
-		new Wordlift_Products_Navigator_Shortcode_REST();
+        new Wordlift_Products_Navigator_Shortcode_REST();
 
-		if ( apply_filters( 'wl_feature__enable__article-wrapper', false ) ) {
-			new Jsonld_Article_Wrapper( Wordlift_Post_To_Jsonld_Converter::get_instance() );
-		}
+        if ( apply_filters( 'wl_feature__enable__article-wrapper', false ) ) {
+            new Jsonld_Article_Wrapper( Wordlift_Post_To_Jsonld_Converter::get_instance() );
+        }
 
-		// Register the Dataset module, requires `$api_service`.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+        // Register the Dataset module, requires `$api_service`.
+        require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
 
-	} );
+    } );
 
 }
 
@@ -555,45 +555,45 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register( function ( $class_name ) {
+    spl_autoload_register( function ( $class_name ) {
 
-		// Bail out if these are not our classes.
-		if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
-			return false;
-		}
+        // Bail out if these are not our classes.
+        if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+            return false;
+        }
 
-		$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+        $class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
 
-		preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+        preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
 
-		$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-		$file = 'class-' . $matches[2] . '.php';
+        $path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
+        $file = 'class-' . $matches[2] . '.php';
 
-		$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+        $full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
 
-		if ( ! file_exists( $full_path ) ) {
-			echo( "Class $class_name not found at $full_path." );
+        if ( ! file_exists( $full_path ) ) {
+            echo( "Class $class_name not found at $full_path." );
 
-			return false;
-		}
+            return false;
+        }
 
-		require_once $full_path;
+        require_once $full_path;
 
-		return true;
-	} );
+        return true;
+    } );
 
 }
 
 function wl_block_categories( $categories, $post ) {
-	return array_merge(
-		$categories,
-		array(
-			array(
-				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
-			),
-		)
-	);
+    return array_merge(
+        $categories,
+        array(
+            array(
+                'slug'  => 'wordlift',
+                'title' => __( 'WordLift', 'wordlift' ),
+            ),
+        )
+    );
 }
 
 add_filter( 'block_categories', 'wl_block_categories', 10, 2 );

Spacing +132 added lines, -132 removed lines

@@ -50,17 +50,17 @@ 
 use Wordlift\Tasks\Task_Ajax_Adapters_Registry;
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
+require_once plugin_dir_path(__FILE__).'vendor/autoload.php';
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules.
-require_once( 'modules/core/wordlift_core.php' );
+require_once('modules/core/wordlift_core.php');
 
 /**
  * Log to the debug.log file.
@@ -72,9 +72,9 @@ 
  * @deprecated use Wordlift_Log_Service::get_instance()->info( $log );
  *
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+	Wordlift_Log_Service::get_instance()->debug($log);
 
 }
 
@@ -89,9 +89,9 @@ 
  * @since 3.0.0
  *
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -101,7 +101,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -109,15 +109,15 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 /**
  * Register additional scripts for the admin UI.
@@ -125,21 +125,21 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+	wp_enqueue_script('jquery-ui-autocomplete');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -149,23 +149,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -174,17 +174,17 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
 	// place on the globe:"The zero/zero point of this system is located in the
 	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : '',
 	);
 }
 
@@ -197,11 +197,11 @@ 
  * @deprecated use Wordlift_Storage_Factory::get_instance()->post_images()->get( $post_id )
  *
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	return Wordlift_Storage_Factory::get_instance()
 	                               ->post_images()
-	                               ->get( $post_id );
+	                               ->get($post_id);
 
 }
 
@@ -213,21 +213,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -241,10 +241,10 @@ 
  * @param int $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 /**
@@ -259,9 +259,9 @@ 
  * @see        https://codex.wordpress.org/Function_Reference/sanitize_title
  *
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -271,104 +271,104 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+	$log = Wordlift_Log_Service::get_logger('wl_replace_item_id_with_uri');
+	$log->trace('Replacing item IDs with URIs...');
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( ! empty( $uri ) && $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ( ! empty($uri) && $item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
+require_once('wordlift_entity_type.php');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/class-wordlift-shortcode-rest.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/class-wordlift-products-navigator-shortcode-rest.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/class-wordlift-shortcode-rest.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/class-wordlift-products-navigator-shortcode-rest.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/class-wordlift-chord-widget.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/class-wordlift-chord-widget.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 /**
  * The code that runs during plugin activation.
@@ -376,11 +376,11 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+	$log = Wordlift_Log_Service::get_logger('activate_wordlift');
 
-	$log->info( 'Activating WordLift...' );
+	$log->info('Activating WordLift...');
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 
 	/**
@@ -407,7 +407,7 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 	Wordlift_Http_Api::deactivate();
 	Ttl_Cache_Cleaner::deactivate();
@@ -425,14 +425,14 @@ 
 
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.
@@ -452,12 +452,12 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
+	if (apply_filters('wl_feature__enable__widgets', true)) {
+		add_action('widgets_init', 'wl_register_chord_widget');
+		add_action('widgets_init', 'wl_register_geo_widget');
+		add_action('widgets_init', 'wl_register_timeline_widget');
 	}
-	add_filter( 'widget_text', 'do_shortcode' );
+	add_filter('widget_text', 'do_shortcode');
 
 
 	/**
@@ -468,10 +468,10 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+	if (apply_filters('wl_feature__enable__analysis', true)) {
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action');
 	}
 
 	/*
@@ -493,53 +493,53 @@ 
 	// Load the API Data Hooks.
 	new Api_Data_Hooks();
 
-	add_action( 'plugins_loaded', function () {
+	add_action('plugins_loaded', function() {
 		// Load early. **PLEASE NOTE** that features are applied only to calls that happen **AFTER** the `plugins_loaded`
 		// action.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
-	}, 1 );
+		require_once plugin_dir_path(__FILE__).'wordlift/features/index.php';
+	}, 1);
 
-	add_action( 'plugins_loaded', function () use ( $plugin ) {
+	add_action('plugins_loaded', function() use ($plugin) {
 		// Licenses Images.
 		$user_agent                   = User_Agent::get_user_agent();
 		$wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
-		$api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ), 60, $user_agent, $wordlift_key );
+		$api_service                  = new Default_Api_Service(apply_filters('wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE), 60, $user_agent, $wordlift_key);
 		$image_license_factory        = new Image_License_Factory();
-		$image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
-		$image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
-		$cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
+		$image_license_service        = new Image_License_Service($api_service, $image_license_factory);
+		$image_license_cache          = new Ttl_Cache('image-license', 86400 * 30); // 30 days.
+		$cached_image_license_service = new Cached_Image_License_Service($image_license_service, $image_license_cache);
 
-		$image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
+		$image_license_scheduler       = new Image_License_Scheduler($image_license_service, $image_license_cache);
 		$image_license_cleanup_service = new Image_License_Cleanup_Service();
 
 		// Get the cached data. If we have cached data, we load the notifier.
-		$image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
-		if ( null !== $image_license_data ) {
-			$image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
-			new Image_License_Notifier( $image_license_data, $image_license_page );
+		$image_license_data = $image_license_cache->get(Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES);
+		if (null !== $image_license_data) {
+			$image_license_page = new Image_License_Page($image_license_data, Wordlift::get_instance()->get_version());
+			new Image_License_Notifier($image_license_data, $image_license_page);
 		}
 
-		$remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
-		$remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
+		$remove_all_images_task         = new Remove_All_Images_Task($cached_image_license_service);
+		$remove_all_images_task_adapter = new Task_Ajax_Adapter($remove_all_images_task);
 
 		$reload_data_task         = new Reload_Data_Task();
-		$reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
+		$reload_data_task_adapter = new Task_Ajax_Adapter($reload_data_task);
 
-		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
-		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
+		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task($cached_image_license_service);
+		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter($add_license_caption_or_remove_task);
 
-		$remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
-		$reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
-		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
+		$remove_all_images_task_page             = new Remove_All_Images_Page(new Task_Ajax_Adapters_Registry($remove_all_images_task_adapter), $plugin->get_version());
+		$reload_data_task_page                   = new Reload_Data_Page(new Task_Ajax_Adapters_Registry($reload_data_task_adapter), $plugin->get_version());
+		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page(new Task_Ajax_Adapters_Registry($add_license_caption_or_remove_task_adapter), $plugin->get_version());
 
 		new Wordlift_Products_Navigator_Shortcode_REST();
 
-		if ( apply_filters( 'wl_feature__enable__article-wrapper', false ) ) {
-			new Jsonld_Article_Wrapper( Wordlift_Post_To_Jsonld_Converter::get_instance() );
+		if (apply_filters('wl_feature__enable__article-wrapper', false)) {
+			new Jsonld_Article_Wrapper(Wordlift_Post_To_Jsonld_Converter::get_instance());
 		}
 
 		// Register the Dataset module, requires `$api_service`.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+		require_once plugin_dir_path(__FILE__).'wordlift/dataset/index.php';
 
 	} );
 
@@ -555,24 +555,24 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register( function ( $class_name ) {
+	spl_autoload_register(function($class_name) {
 
 		// Bail out if these are not our classes.
-		if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+		if (0 !== strpos($class_name, 'Wordlift\\')) {
 			return false;
 		}
 
-		$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+		$class_name_lc = strtolower(str_replace('_', '-', $class_name));
 
-		preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+		preg_match('|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches);
 
-		$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-		$file = 'class-' . $matches[2] . '.php';
+		$path = str_replace('\\', DIRECTORY_SEPARATOR, $matches[1]);
+		$file = 'class-'.$matches[2].'.php';
 
-		$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+		$full_path = plugin_dir_path(__FILE__).$path.DIRECTORY_SEPARATOR.$file;
 
-		if ( ! file_exists( $full_path ) ) {
-			echo( "Class $class_name not found at $full_path." );
+		if ( ! file_exists($full_path)) {
+			echo("Class $class_name not found at $full_path.");
 
 			return false;
 		}
@@ -584,16 +584,16 @@ 
 
 }
 
-function wl_block_categories( $categories, $post ) {
+function wl_block_categories($categories, $post) {
 	return array_merge(
 		$categories,
 		array(
 			array(
 				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
+				'title' => __('WordLift', 'wordlift'),
 			),
 		)
 	);
 }
 
-add_filter( 'block_categories', 'wl_block_categories', 10, 2 );
+add_filter('block_categories', 'wl_block_categories', 10, 2);

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

Indentation +231 added lines, -231 removed lines

@@ -15,237 +15,237 @@
  */
 class Wordlift_Jsonld_Service {
 
-	/**
-	 * 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_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;
-
-	/**
-	 * 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.
-	 *
-	 * @since 3.8.0
-	 *
-	 */
-	public function __construct( $entity_service, $converter, $website_converter ) {
-
-		$this->entity_service    = $entity_service;
-		$this->converter         = $converter;
-		$this->website_converter = $website_converter;
-
-		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.
-		@ob_clean();
-
-		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] );
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null;
-
-		// 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.
-	 * @param int $status_code The HTTP status code to output.
-	 *
-	 * @since 3.18.5
-	 *
-	 */
-	private function send_jsonld( $response, $status_code = null ) {
-		@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;
-
-		// Convert each URI to a JSON-LD array, while gathering referenced entities.
-		// in the references array.
-		$jsonld = array_merge(
-			array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) ),
-			// Convert each URI in the references array to JSON-LD. We don't output
-			// entities already output above (hence the array_diff).
-			array_filter( array_map( function ( $item ) use ( $entity_to_jsonld_converter, &$references_infos ) {
-
-				// "2nd level properties" may not output here, e.g. a post
-				// mentioning an event, located in a place: the place is referenced
-				// via the `@id` but no other properties are loaded.
-				$ignored = array();
-
-				return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
-			}, array_unique( $references ) ) ) );
-
-		$required_references = array_filter( $references_infos, function ( $item ) use ( $references ) {
-			return isset( $item['reference'] ) &&
-			       // Check that the reference is required
-			       $item['reference']->get_required() &&
-			       // Check that the reference isn't being output already.
-			       ! in_array( $item['reference']->get_id(), $references );
-		} );
-
-		$jsonld = array_merge( $jsonld, array_filter( array_map( function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
-
-			if ( ! isset( $item['reference'] ) ) {
-				return null;
-			}
-
-			$post_id = $item['reference']->get_id();
-			if ( in_array( $post_id, $references ) ) {
-				return null;
-			}
-
-			$references[] = $post_id;
-
-			return $entity_to_jsonld_converter->convert( $post_id, $references );
-		}, $required_references ) ) );
-
-		/**
-		 * 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 = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
-
-		return $jsonld;
-	}
-
-	/**
-	 * 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 = json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
-		?>
+    /**
+     * 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_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;
+
+    /**
+     * 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.
+     *
+     * @since 3.8.0
+     *
+     */
+    public function __construct( $entity_service, $converter, $website_converter ) {
+
+        $this->entity_service    = $entity_service;
+        $this->converter         = $converter;
+        $this->website_converter = $website_converter;
+
+        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.
+        @ob_clean();
+
+        // Get the parameter from the request.
+        $is_homepage = isset( $_REQUEST['homepage'] );
+        $post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null;
+
+        // 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.
+     * @param int $status_code The HTTP status code to output.
+     *
+     * @since 3.18.5
+     *
+     */
+    private function send_jsonld( $response, $status_code = null ) {
+        @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;
+
+        // Convert each URI to a JSON-LD array, while gathering referenced entities.
+        // in the references array.
+        $jsonld = array_merge(
+            array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) ),
+            // Convert each URI in the references array to JSON-LD. We don't output
+            // entities already output above (hence the array_diff).
+            array_filter( array_map( function ( $item ) use ( $entity_to_jsonld_converter, &$references_infos ) {
+
+                // "2nd level properties" may not output here, e.g. a post
+                // mentioning an event, located in a place: the place is referenced
+                // via the `@id` but no other properties are loaded.
+                $ignored = array();
+
+                return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
+            }, array_unique( $references ) ) ) );
+
+        $required_references = array_filter( $references_infos, function ( $item ) use ( $references ) {
+            return isset( $item['reference'] ) &&
+                   // Check that the reference is required
+                   $item['reference']->get_required() &&
+                   // Check that the reference isn't being output already.
+                   ! in_array( $item['reference']->get_id(), $references );
+        } );
+
+        $jsonld = array_merge( $jsonld, array_filter( array_map( function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
+
+            if ( ! isset( $item['reference'] ) ) {
+                return null;
+            }
+
+            $post_id = $item['reference']->get_id();
+            if ( in_array( $post_id, $references ) ) {
+                return null;
+            }
+
+            $references[] = $post_id;
+
+            return $entity_to_jsonld_converter->convert( $post_id, $references );
+        }, $required_references ) ) );
+
+        /**
+         * 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 = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+
+        return $jsonld;
+    }
+
+    /**
+     * 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 = json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+        ?>
         <script type="application/ld+json"><?php echo $jsonld; ?></script><?php
-	}
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -62,7 +62,7 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	public function __construct( $entity_service, $converter, $website_converter ) {
+	public function __construct($entity_service, $converter, $website_converter) {
 
 		$this->entity_service    = $entity_service;
 		$this->converter         = $converter;
@@ -97,11 +97,11 @@ 
 		@ob_clean();
 
 		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] );
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null;
+		$is_homepage = isset($_REQUEST['homepage']);
+		$post_id     = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
 
 		// 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));
 
 	}
 
@@ -115,10 +115,10 @@ 
 	 * @since 3.18.5
 	 *
 	 */
-	private function send_jsonld( $response, $status_code = null ) {
-		@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 ) ) {
+	private function send_jsonld($response, $status_code = null) {
+		@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;
@@ -136,7 +136,7 @@ 
 	 * @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.
@@ -145,14 +145,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();
 			}
 
@@ -164,7 +164,7 @@ 
 		}
 
 		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return array();
 		}
 
@@ -179,42 +179,42 @@ 
 		// Convert each URI to a JSON-LD array, while gathering referenced entities.
 		// in the references array.
 		$jsonld = array_merge(
-			array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) ),
+			array($entity_to_jsonld_converter->convert($post_id, $references, $references_infos)),
 			// Convert each URI in the references array to JSON-LD. We don't output
 			// entities already output above (hence the array_diff).
-			array_filter( array_map( function ( $item ) use ( $entity_to_jsonld_converter, &$references_infos ) {
+			array_filter(array_map(function($item) use ($entity_to_jsonld_converter, &$references_infos) {
 
 				// "2nd level properties" may not output here, e.g. a post
 				// mentioning an event, located in a place: the place is referenced
 				// via the `@id` but no other properties are loaded.
 				$ignored = array();
 
-				return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
-			}, array_unique( $references ) ) ) );
+				return $entity_to_jsonld_converter->convert($item, $ignored, $references_infos);
+			}, array_unique($references))) );
 
-		$required_references = array_filter( $references_infos, function ( $item ) use ( $references ) {
-			return isset( $item['reference'] ) &&
+		$required_references = array_filter($references_infos, function($item) use ($references) {
+			return isset($item['reference']) &&
 			       // Check that the reference is required
 			       $item['reference']->get_required() &&
 			       // Check that the reference isn't being output already.
-			       ! in_array( $item['reference']->get_id(), $references );
+			       ! in_array($item['reference']->get_id(), $references);
 		} );
 
-		$jsonld = array_merge( $jsonld, array_filter( array_map( function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
+		$jsonld = array_merge($jsonld, array_filter(array_map(function($item) use ($references, $entity_to_jsonld_converter) {
 
-			if ( ! isset( $item['reference'] ) ) {
+			if ( ! isset($item['reference'])) {
 				return null;
 			}
 
 			$post_id = $item['reference']->get_id();
-			if ( in_array( $post_id, $references ) ) {
+			if (in_array($post_id, $references)) {
 				return null;
 			}
 
 			$references[] = $post_id;
 
-			return $entity_to_jsonld_converter->convert( $post_id, $references );
-		}, $required_references ) ) );
+			return $entity_to_jsonld_converter->convert($post_id, $references);
+		}, $required_references)));
 
 		/**
 		 * Filter name: wl_after_get_jsonld
@@ -224,7 +224,7 @@ 
 		 * @var $post_id int The post id for which the jsonld is generated.
 		 *
 		 */
-		$jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+		$jsonld = apply_filters('wl_after_get_jsonld', $jsonld, $post_id, $context);
 
 		return $jsonld;
 	}
@@ -243,7 +243,7 @@ 
 		$is_homepage = is_home() || is_front_page();
 		$post_id     = is_singular() ? get_the_ID() : null;
 
-		$jsonld = json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+		$jsonld = json_encode($this->get_jsonld($is_homepage, $post_id, Jsonld_Context_Enum::PAGE));
 		?>
         <script type="application/ld+json"><?php echo $jsonld; ?></script><?php
 	}

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

Indentation +428 added lines, -428 removed lines

@@ -15,452 +15,452 @@
  */
 class Wordlift_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * @var Wordlift_Post_To_Jsonld_Converter
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Post_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_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_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.10.0
-	 *
-	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
-
-		$this->configuration_service = $configuration_service;
-
-		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
-
-		self::$instance = $this;
-
-	}
-
-	public static function get_instance() {
-
-		return self::$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 $references_infos
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
-
-		// Get the post instance.
-		if ( null === $post = get_post( $post_id ) ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references, $references_infos );
-
-		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
-			$jsonld['@type'] = 'WebPage';
-		}
-
-		// Get the entity name.
-		$jsonld['headline'] = $post->post_title;
-
-		// Set the published and modified dates.
-		/*
+    /**
+     * @var Wordlift_Post_To_Jsonld_Converter
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Wordlift_Post_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_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_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.10.0
+     *
+     */
+    public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
+        parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+
+        $this->configuration_service = $configuration_service;
+
+        // Set a reference to the logger.
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+
+        self::$instance = $this;
+
+    }
+
+    public static function get_instance() {
+
+        return self::$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 $references_infos
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
+
+        // Get the post instance.
+        if ( null === $post = get_post( $post_id ) ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the base JSON-LD and the list of entities referenced by this entity.
+        $jsonld = parent::convert( $post_id, $references, $references_infos );
+
+        // Set WebPage by default.
+        if ( empty( $jsonld['@type'] ) ) {
+            $jsonld['@type'] = 'WebPage';
+        }
+
+        // Get the entity name.
+        $jsonld['headline'] = $post->post_title;
+
+        // Set the published and modified dates.
+        /*
 		 * Set the `datePublished` and `dateModified` using the local timezone.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/887
 		 *
 		 * @since 3.20.0
 		 */
-		try {
-			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone );
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone );
-			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-		}
-
-		// Get the word count for the post.
-		/*
+        try {
+            $default_timezone = date_default_timezone_get();
+            $timezone         = get_option( 'timezone_string' );
+            if ( ! empty( $timezone ) ) {
+                date_default_timezone_set( $timezone );
+                $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
+                $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
+                date_default_timezone_set( $default_timezone );
+            } else {
+                $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+                $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+            }
+        } catch ( Exception $e ) {
+            $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+            $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+        }
+
+        // Get the word count for the post.
+        /*
 		 * Do not display the `wordCount` on a `WebPage`.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/888
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
-			$jsonld['wordCount'] = $post_adapter->word_count();
-		}
+        if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter        = new Wordlift_Post_Adapter( $post_id );
+            $jsonld['wordCount'] = $post_adapter->word_count();
+        }
 
-		/*
+        /*
 		 * Add keywords, articleSection, commentCount and inLanguage properties to `Article` JSON-LD
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1140
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
-			$keywords        = $post_adapter->keywords();
-			$article_section = $post_adapter->article_section();
-			$comment_count   = $post_adapter->comment_count();
-			$locale          = $post_adapter->locale();
-
-			if ( isset( $keywords ) ) {
-				$jsonld['keywords'] = $keywords;
-			}
-			if ( isset( $article_section ) ) {
-				$jsonld['articleSection'] = $article_section;
-			}
-			$jsonld['commentCount'] = $comment_count;
-			$jsonld['inLanguage']   = $locale;
-			$post_adapter->add_mentions( $post_id, $references );
-		}
-
-		// Set the publisher.
-		$this->set_publisher( $jsonld );
-
-		// Process the references if any.
-		if ( 0 < count( $references ) ) {
-
-			// Prepare the `about` and `mentions` array.
-			$about = $mentions = array();
-
-			// If the entity is in the title, then it should be an `about`.
-			foreach ( $references as $reference ) {
-
-				// Get the entity labels.
-				$labels = $this->entity_service->get_labels( $reference );
-
-				// Get the entity URI.
-				$item = array(
-					'@id' => $this->entity_service->get_uri( $reference ),
-				);
-
-				$escaped_labels = array_map( function ( $value ) {
-					return preg_quote( $value, '/' );
-				}, $labels );
-
-				// Check if the labels match any part of the title.
-				$matches = 1 === preg_match( '/' . implode( '|', $escaped_labels ) . '/', $post->post_title );
-
-				// If the title matches, assign the entity to the about, otherwise to the mentions.
-				if ( $matches ) {
-					$about[] = $item;
-				} else {
-					$mentions[] = $item;
-				}
-			}
-
-			// If we have abouts, assign them to the JSON-LD.
-			if ( 0 < count( $about ) ) {
-				$jsonld['about'] = $about;
-			}
-
-			// If we have mentions, assign them to the JSON-LD.
-			if ( 0 < count( $mentions ) ) {
-				$jsonld['mentions'] = $mentions;
-			}
-		}
-
-		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
-
-		/**
-		 * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
-		 *
-		 * @param array $value {
-		 *
-		 * @type array $jsonld The JSON-LD structure.
-		 * @type int[] $references An array of post IDs.
-		 * }
-		 * @since 3.25.0
-		 *
-		 * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
-		 *
-		 * @api
-		 */
-		$ret_val    = apply_filters( 'wl_post_jsonld_array', array(
-			'jsonld'     => $jsonld,
-			'references' => $references,
-		), $post_id );
-		$jsonld     = $ret_val['jsonld'];
-		$references = $ret_val['references'];
-
-		/**
-		 * Call the `wl_post_jsonld` filter.
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 * @param int $post_id The {@link WP_Post} `id`.
-		 * @param array $references The array of referenced entities.
-		 *
-		 * @since 3.14.0
-		 *
-		 * @api
-		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
-	}
-
-	/**
-	 * Get the author's JSON-LD fragment.
-	 *
-	 * The JSON-LD fragment is generated using the {@link WP_User}'s data or
-	 * the referenced entity if configured for the {@link WP_User}.
-	 *
-	 * @param int $author_id The author {@link WP_User}'s `id`.
-	 * @param array $references An array of referenced entities.
-	 *
-	 * @return string|array A JSON-LD structure.
-	 * @since 3.14.0
-	 *
-	 */
-	private function get_author( $author_id, &$references ) {
-
-		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
-
-		// If there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
-
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
-
-			return array(
-				'@type'      => 'Person',
-				'@id'        => $author_uri,
-				'name'       => $author,
-				'givenName'  => $author_first_name,
-				'familyName' => $author_last_name
-			);
-		}
-
-		// Add the author to the references.
-		$author_uri   = $this->entity_service->get_uri( $entity_id );
-		$references[] = $entity_id;
-
-		// Return the JSON-LD for the referenced entity.
-		return array(
-			'@id' => $author_uri,
-		);
-	}
-
-	/**
-	 * Enrich the provided params array with publisher data, if available.
-	 *
-	 * @param array $params The parameters array.
-	 *
-	 * @since 3.10.0
-	 *
-	 */
-	protected function set_publisher( &$params ) {
-
-		// If the publisher id isn't set don't do anything.
-		if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
-			return;
-		}
-
-		// Get the post instance.
-		if ( null === $post = get_post( $publisher_id ) ) {
-			// Publisher not found.
-			return;
-		}
-
-		// Get the item id.
-		$id = $this->entity_service->get_uri( $publisher_id );
-
-		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
-
-		// Get the name.
-		$name = $post->post_title;
-
-		// Set the publisher data.
-		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
-			'@id'   => $id,
-			'name'  => $name,
-		);
-
-		// Add the sameAs values associated with the publisher.
-		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
-			$params['publisher']['sameAs'] = $sameas;
-		}
-
-		// Set the logo, only for http://schema.org/Organization as Person doesn't
-		// support the logo property.
-		//
-		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
-			return;
-		}
-
-		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
-
-		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
-			return;
-		}
-
-		// Copy over some useful properties.
-		//
-		// See https://developers.google.com/search/docs/data-types/articles.
-		$params['publisher']['logo']['@type'] = 'ImageObject';
-		$params['publisher']['logo']['url']   = $publisher_logo['url'];
-
-		// 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.
-		$params['publisher']['logo']['width']  = $publisher_logo['width'];
-		$params['publisher']['logo']['height'] = $publisher_logo['height'];
-
-	}
-
-	/**
-	 * Get the publisher logo structure.
-	 *
-	 * The function returns false when the publisher logo cannot be determined, i.e.:
-	 *  - the post has no featured image.
-	 *  - the featured image has no file.
-	 *  - a wp_image_editor instance cannot be instantiated on the original file or on the publisher logo file.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|false Returns an array with the `url`, `width` and `height` for the publisher logo or false in case
-	 *  of errors.
-	 * @since 3.19.2
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
-	 *
-	 */
-	private function get_publisher_logo( $post_id ) {
-
-		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
-
-		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
-
-			return false;
-		}
-
-		// Get the uploads base URL.
-		$uploads_dir = wp_upload_dir();
-
-		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
-
-		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
-
-			return false;
-		}
-
-		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
-
-		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
-
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
-				return array(
-					'url'    => $attachment_image_src[0],
-					'width'  => $attachment_image_src[1],
-					'height' => $attachment_image_src[2],
-				);
-			}
-
-			// Bail out if we cant fetch wp_get_attachment_image_src
-			return false;
-
-		}
-
-		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
-
-			return false;
-		}
-
-		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
-		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
-
-		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
-		}
-
-		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
-
-			return false;
-		}
-
-		// Get the actual size.
-		$size = $publisher_logo_editor->get_size();
-
-		// Finally return the array with data.
-		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
-			'width'  => $size['width'],
-			'height' => $size['height'],
-		);
-	}
+        if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter    = new Wordlift_Post_Adapter( $post_id );
+            $keywords        = $post_adapter->keywords();
+            $article_section = $post_adapter->article_section();
+            $comment_count   = $post_adapter->comment_count();
+            $locale          = $post_adapter->locale();
+
+            if ( isset( $keywords ) ) {
+                $jsonld['keywords'] = $keywords;
+            }
+            if ( isset( $article_section ) ) {
+                $jsonld['articleSection'] = $article_section;
+            }
+            $jsonld['commentCount'] = $comment_count;
+            $jsonld['inLanguage']   = $locale;
+            $post_adapter->add_mentions( $post_id, $references );
+        }
+
+        // Set the publisher.
+        $this->set_publisher( $jsonld );
+
+        // Process the references if any.
+        if ( 0 < count( $references ) ) {
+
+            // Prepare the `about` and `mentions` array.
+            $about = $mentions = array();
+
+            // If the entity is in the title, then it should be an `about`.
+            foreach ( $references as $reference ) {
+
+                // Get the entity labels.
+                $labels = $this->entity_service->get_labels( $reference );
+
+                // Get the entity URI.
+                $item = array(
+                    '@id' => $this->entity_service->get_uri( $reference ),
+                );
+
+                $escaped_labels = array_map( function ( $value ) {
+                    return preg_quote( $value, '/' );
+                }, $labels );
+
+                // Check if the labels match any part of the title.
+                $matches = 1 === preg_match( '/' . implode( '|', $escaped_labels ) . '/', $post->post_title );
+
+                // If the title matches, assign the entity to the about, otherwise to the mentions.
+                if ( $matches ) {
+                    $about[] = $item;
+                } else {
+                    $mentions[] = $item;
+                }
+            }
+
+            // If we have abouts, assign them to the JSON-LD.
+            if ( 0 < count( $about ) ) {
+                $jsonld['about'] = $about;
+            }
+
+            // If we have mentions, assign them to the JSON-LD.
+            if ( 0 < count( $mentions ) ) {
+                $jsonld['mentions'] = $mentions;
+            }
+        }
+
+        // Finally set the author.
+        $jsonld['author'] = $this->get_author( $post->post_author, $references );
+
+        /**
+         * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
+         *
+         * @param array $value {
+         *
+         * @type array $jsonld The JSON-LD structure.
+         * @type int[] $references An array of post IDs.
+         * }
+         * @since 3.25.0
+         *
+         * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
+         *
+         * @api
+         */
+        $ret_val    = apply_filters( 'wl_post_jsonld_array', array(
+            'jsonld'     => $jsonld,
+            'references' => $references,
+        ), $post_id );
+        $jsonld     = $ret_val['jsonld'];
+        $references = $ret_val['references'];
+
+        /**
+         * Call the `wl_post_jsonld` filter.
+         *
+         * @param array $jsonld The JSON-LD structure.
+         * @param int $post_id The {@link WP_Post} `id`.
+         * @param array $references The array of referenced entities.
+         *
+         * @since 3.14.0
+         *
+         * @api
+         */
+        return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+    }
+
+    /**
+     * Get the author's JSON-LD fragment.
+     *
+     * The JSON-LD fragment is generated using the {@link WP_User}'s data or
+     * the referenced entity if configured for the {@link WP_User}.
+     *
+     * @param int $author_id The author {@link WP_User}'s `id`.
+     * @param array $references An array of referenced entities.
+     *
+     * @return string|array A JSON-LD structure.
+     * @since 3.14.0
+     *
+     */
+    private function get_author( $author_id, &$references ) {
+
+        // Get the entity bound to this user.
+        $entity_id = $this->user_service->get_entity( $author_id );
+
+        // If there's no entity bound return a simple author structure.
+        if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+
+            $author            = get_the_author_meta( 'display_name', $author_id );
+            $author_first_name = get_the_author_meta( 'first_name', $author_id );
+            $author_last_name  = get_the_author_meta( 'last_name', $author_id );
+            $author_uri        = $this->user_service->get_uri( $author_id );
+
+            return array(
+                '@type'      => 'Person',
+                '@id'        => $author_uri,
+                'name'       => $author,
+                'givenName'  => $author_first_name,
+                'familyName' => $author_last_name
+            );
+        }
+
+        // Add the author to the references.
+        $author_uri   = $this->entity_service->get_uri( $entity_id );
+        $references[] = $entity_id;
+
+        // Return the JSON-LD for the referenced entity.
+        return array(
+            '@id' => $author_uri,
+        );
+    }
+
+    /**
+     * Enrich the provided params array with publisher data, if available.
+     *
+     * @param array $params The parameters array.
+     *
+     * @since 3.10.0
+     *
+     */
+    protected function set_publisher( &$params ) {
+
+        // If the publisher id isn't set don't do anything.
+        if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
+            return;
+        }
+
+        // Get the post instance.
+        if ( null === $post = get_post( $publisher_id ) ) {
+            // Publisher not found.
+            return;
+        }
+
+        // Get the item id.
+        $id = $this->entity_service->get_uri( $publisher_id );
+
+        // Get the type.
+        $type = $this->entity_type_service->get( $publisher_id );
+
+        // Get the name.
+        $name = $post->post_title;
+
+        // Set the publisher data.
+        $params['publisher'] = array(
+            '@type' => $this->relative_to_context( $type['uri'] ),
+            '@id'   => $id,
+            'name'  => $name,
+        );
+
+        // Add the sameAs values associated with the publisher.
+        $storage_factory = Wordlift_Storage_Factory::get_instance();
+        $sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
+        if ( ! empty( $sameas ) ) {
+            $params['publisher']['sameAs'] = $sameas;
+        }
+
+        // Set the logo, only for http://schema.org/Organization as Person doesn't
+        // support the logo property.
+        //
+        // See http://schema.org/logo.
+        if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+            return;
+        }
+
+        // Get the publisher logo.
+        $publisher_logo = $this->get_publisher_logo( $post->ID );
+
+        // Bail out if the publisher logo isn't set.
+        if ( false === $publisher_logo ) {
+            return;
+        }
+
+        // Copy over some useful properties.
+        //
+        // See https://developers.google.com/search/docs/data-types/articles.
+        $params['publisher']['logo']['@type'] = 'ImageObject';
+        $params['publisher']['logo']['url']   = $publisher_logo['url'];
+
+        // 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.
+        $params['publisher']['logo']['width']  = $publisher_logo['width'];
+        $params['publisher']['logo']['height'] = $publisher_logo['height'];
+
+    }
+
+    /**
+     * Get the publisher logo structure.
+     *
+     * The function returns false when the publisher logo cannot be determined, i.e.:
+     *  - the post has no featured image.
+     *  - the featured image has no file.
+     *  - a wp_image_editor instance cannot be instantiated on the original file or on the publisher logo file.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|false Returns an array with the `url`, `width` and `height` for the publisher logo or false in case
+     *  of errors.
+     * @since 3.19.2
+     * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
+     *
+     */
+    private function get_publisher_logo( $post_id ) {
+
+        // Get the featured image for the post.
+        $thumbnail_id = get_post_thumbnail_id( $post_id );
+
+        // Bail out if thumbnail not available.
+        if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
+            $this->log->info( "Featured image not set for post $post_id." );
+
+            return false;
+        }
+
+        // Get the uploads base URL.
+        $uploads_dir = wp_upload_dir();
+
+        // Get the attachment metadata.
+        $metadata = wp_get_attachment_metadata( $thumbnail_id );
+
+        // Bail out if the file isn't set.
+        if ( ! isset( $metadata['file'] ) ) {
+            $this->log->warn( "Featured image file not found for post $post_id." );
+
+            return false;
+        }
+
+        // Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
+        $path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+
+        // Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
+        if ( ! file_exists( $path ) ) {
+            $this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+
+            $attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
+            if ( $attachment_image_src ) {
+                return array(
+                    'url'    => $attachment_image_src[0],
+                    'width'  => $attachment_image_src[1],
+                    'height' => $attachment_image_src[2],
+                );
+            }
+
+            // Bail out if we cant fetch wp_get_attachment_image_src
+            return false;
+
+        }
+
+        // Try to get the image editor and bail out if the editor cannot be instantiated.
+        $original_file_editor = wp_get_image_editor( $path );
+        if ( is_wp_error( $original_file_editor ) ) {
+            $this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+
+            return false;
+        }
+
+        // Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
+        // and we don't actually know the end values.
+        $publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+
+        // If the file doesn't exist yet, create it.
+        if ( ! file_exists( $publisher_logo_path ) ) {
+            $original_file_editor->resize( 600, 60 );
+            $original_file_editor->save( $publisher_logo_path );
+        }
+
+        // Try to get the image editor and bail out if the editor cannot be instantiated.
+        $publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
+        if ( is_wp_error( $publisher_logo_editor ) ) {
+            $this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+
+            return false;
+        }
+
+        // Get the actual size.
+        $size = $publisher_logo_editor->get_size();
+
+        // Finally return the array with data.
+        return array(
+            'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+            'width'  => $size['width'],
+            'height' => $size['height'],
+        );
+    }
 
 }

Spacing +83 added lines, -83 removed lines

@@ -50,13 +50,13 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+	public function __construct($entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service) {
+		parent::__construct($entity_type_service, $entity_service, $user_service, $attachment_service);
 
 		$this->configuration_service = $configuration_service;
 
 		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Post_To_Jsonld_Converter');
 
 		self::$instance = $this;
 
@@ -78,19 +78,19 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.10.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array()) {
 
 		// Get the post instance.
-		if ( null === $post = get_post( $post_id ) ) {
+		if (null === $post = get_post($post_id)) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references, $references_infos );
+		$jsonld = parent::convert($post_id, $references, $references_infos);
 
 		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
+		if (empty($jsonld['@type'])) {
 			$jsonld['@type'] = 'WebPage';
 		}
 
@@ -107,19 +107,19 @@ 
 		 */
 		try {
 			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone );
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone );
+			$timezone         = get_option('timezone_string');
+			if ( ! empty($timezone)) {
+				date_default_timezone_set($timezone);
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i:sP', false, $post);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i:sP', false, $post);
+				date_default_timezone_set($default_timezone);
 			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+		} catch (Exception $e) {
+			$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+			$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 		}
 
 		// Get the word count for the post.
@@ -130,8 +130,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter        = new Wordlift_Post_Adapter($post_id);
 			$jsonld['wordCount'] = $post_adapter->word_count();
 		}
 
@@ -142,53 +142,53 @@ 
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter    = new Wordlift_Post_Adapter($post_id);
 			$keywords        = $post_adapter->keywords();
 			$article_section = $post_adapter->article_section();
 			$comment_count   = $post_adapter->comment_count();
 			$locale          = $post_adapter->locale();
 
-			if ( isset( $keywords ) ) {
+			if (isset($keywords)) {
 				$jsonld['keywords'] = $keywords;
 			}
-			if ( isset( $article_section ) ) {
+			if (isset($article_section)) {
 				$jsonld['articleSection'] = $article_section;
 			}
 			$jsonld['commentCount'] = $comment_count;
 			$jsonld['inLanguage']   = $locale;
-			$post_adapter->add_mentions( $post_id, $references );
+			$post_adapter->add_mentions($post_id, $references);
 		}
 
 		// Set the publisher.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Process the references if any.
-		if ( 0 < count( $references ) ) {
+		if (0 < count($references)) {
 
 			// Prepare the `about` and `mentions` array.
 			$about = $mentions = array();
 
 			// If the entity is in the title, then it should be an `about`.
-			foreach ( $references as $reference ) {
+			foreach ($references as $reference) {
 
 				// Get the entity labels.
-				$labels = $this->entity_service->get_labels( $reference );
+				$labels = $this->entity_service->get_labels($reference);
 
 				// Get the entity URI.
 				$item = array(
-					'@id' => $this->entity_service->get_uri( $reference ),
+					'@id' => $this->entity_service->get_uri($reference),
 				);
 
-				$escaped_labels = array_map( function ( $value ) {
-					return preg_quote( $value, '/' );
-				}, $labels );
+				$escaped_labels = array_map(function($value) {
+					return preg_quote($value, '/');
+				}, $labels);
 
 				// Check if the labels match any part of the title.
-				$matches = 1 === preg_match( '/' . implode( '|', $escaped_labels ) . '/', $post->post_title );
+				$matches = 1 === preg_match('/'.implode('|', $escaped_labels).'/', $post->post_title);
 
 				// If the title matches, assign the entity to the about, otherwise to the mentions.
-				if ( $matches ) {
+				if ($matches) {
 					$about[] = $item;
 				} else {
 					$mentions[] = $item;
@@ -196,18 +196,18 @@ 
 			}
 
 			// If we have abouts, assign them to the JSON-LD.
-			if ( 0 < count( $about ) ) {
+			if (0 < count($about)) {
 				$jsonld['about'] = $about;
 			}
 
 			// If we have mentions, assign them to the JSON-LD.
-			if ( 0 < count( $mentions ) ) {
+			if (0 < count($mentions)) {
 				$jsonld['mentions'] = $mentions;
 			}
 		}
 
 		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
+		$jsonld['author'] = $this->get_author($post->post_author, $references);
 
 		/**
 		 * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
@@ -223,10 +223,10 @@ 
 		 *
 		 * @api
 		 */
-		$ret_val    = apply_filters( 'wl_post_jsonld_array', array(
+		$ret_val = apply_filters('wl_post_jsonld_array', array(
 			'jsonld'     => $jsonld,
 			'references' => $references,
-		), $post_id );
+		), $post_id);
 		$jsonld     = $ret_val['jsonld'];
 		$references = $ret_val['references'];
 
@@ -241,7 +241,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+		return apply_filters('wl_post_jsonld', $jsonld, $post_id, $references);
 	}
 
 	/**
@@ -257,18 +257,18 @@ 
 	 * @since 3.14.0
 	 *
 	 */
-	private function get_author( $author_id, &$references ) {
+	private function get_author($author_id, &$references) {
 
 		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
+		$entity_id = $this->user_service->get_entity($author_id);
 
 		// If there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+		if (empty($entity_id) || 'publish' !== get_post_status($entity_id)) {
 
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
+			$author            = get_the_author_meta('display_name', $author_id);
+			$author_first_name = get_the_author_meta('first_name', $author_id);
+			$author_last_name  = get_the_author_meta('last_name', $author_id);
+			$author_uri        = $this->user_service->get_uri($author_id);
 
 			return array(
 				'@type'      => 'Person',
@@ -280,7 +280,7 @@ 
 		}
 
 		// Add the author to the references.
-		$author_uri   = $this->entity_service->get_uri( $entity_id );
+		$author_uri   = $this->entity_service->get_uri($entity_id);
 		$references[] = $entity_id;
 
 		// Return the JSON-LD for the referenced entity.
@@ -297,39 +297,39 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	protected function set_publisher( &$params ) {
+	protected function set_publisher(&$params) {
 
 		// If the publisher id isn't set don't do anything.
-		if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
+		if (null === $publisher_id = $this->configuration_service->get_publisher_id()) {
 			return;
 		}
 
 		// Get the post instance.
-		if ( null === $post = get_post( $publisher_id ) ) {
+		if (null === $post = get_post($publisher_id)) {
 			// Publisher not found.
 			return;
 		}
 
 		// Get the item id.
-		$id = $this->entity_service->get_uri( $publisher_id );
+		$id = $this->entity_service->get_uri($publisher_id);
 
 		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
+		$type = $this->entity_type_service->get($publisher_id);
 
 		// Get the name.
 		$name = $post->post_title;
 
 		// Set the publisher data.
 		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
+			'@type' => $this->relative_to_context($type['uri']),
 			'@id'   => $id,
 			'name'  => $name,
 		);
 
 		// Add the sameAs values associated with the publisher.
 		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
+		$sameas          = $storage_factory->post_meta(Wordlift_Schema_Service::FIELD_SAME_AS)->get($publisher_id);
+		if ( ! empty($sameas)) {
 			$params['publisher']['sameAs'] = $sameas;
 		}
 
@@ -337,15 +337,15 @@ 
 		// support the logo property.
 		//
 		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+		if (1 !== preg_match('~Organization$~', $type['uri'])) {
 			return;
 		}
 
 		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
+		$publisher_logo = $this->get_publisher_logo($post->ID);
 
 		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
+		if (false === $publisher_logo) {
 			return;
 		}
 
@@ -380,14 +380,14 @@ 
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
 	 *
 	 */
-	private function get_publisher_logo( $post_id ) {
+	private function get_publisher_logo($post_id) {
 
 		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
+		$thumbnail_id = get_post_thumbnail_id($post_id);
 
 		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
+		if (empty($thumbnail_id) || 0 === $thumbnail_id) {
+			$this->log->info("Featured image not set for post $post_id.");
 
 			return false;
 		}
@@ -396,24 +396,24 @@ 
 		$uploads_dir = wp_upload_dir();
 
 		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
+		$metadata = wp_get_attachment_metadata($thumbnail_id);
 
 		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
+		if ( ! isset($metadata['file'])) {
+			$this->log->warn("Featured image file not found for post $post_id.");
 
 			return false;
 		}
 
 		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+		$path = $uploads_dir['basedir'].DIRECTORY_SEPARATOR.$metadata['file'];
 
 		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+		if ( ! file_exists($path)) {
+			$this->log->warn("Featured image file $path doesn't exist for post $post_id.");
 
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
+			$attachment_image_src = wp_get_attachment_image_src($thumbnail_id, '');
+			if ($attachment_image_src) {
 				return array(
 					'url'    => $attachment_image_src[0],
 					'width'  => $attachment_image_src[1],
@@ -427,27 +427,27 @@ 
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+		$original_file_editor = wp_get_image_editor($path);
+		if (is_wp_error($original_file_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $path for post $post_id.");
 
 			return false;
 		}
 
 		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
 		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+		$publisher_logo_path = $original_file_editor->generate_filename('-publisher-logo');
 
 		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
+		if ( ! file_exists($publisher_logo_path)) {
+			$original_file_editor->resize(600, 60);
+			$original_file_editor->save($publisher_logo_path);
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+		$publisher_logo_editor = wp_get_image_editor($publisher_logo_path);
+		if (is_wp_error($publisher_logo_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id.");
 
 			return false;
 		}
@@ -457,7 +457,7 @@ 
 
 		// Finally return the array with data.
 		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+			'url'    => $uploads_dir['baseurl'].substr($publisher_logo_path, strlen($uploads_dir['basedir'])),
 			'width'  => $size['width'],
 			'height' => $size['height'],
 		);