insideout10 / wordlift-plugin

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

Indentation +251 added lines, -251 removed lines

@@ -19,256 +19,256 @@
  */
 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;
-
-	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 ) {
-
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-
-		$this->entity_uri_service = $entity_uri_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, Jsonld_Context_Enum::PAGE );
-
-		// Bail out if the JSON-LD is empty.
-		if ( empty( $jsonld ) ) {
-			return;
-		}
-
-		$jsonld_string = wp_json_encode( $jsonld );
-
-		echo "<script type=\"application/ld+json\" id=\"wl-jsonld-term\">$jsonld_string</script>";
-
-	}
-
-	public function get( $id, $context ) {
-		/**
-		 * 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
-		 */
-		$jsonld_array  = array();
-
-		if ( Jsonld_Context_Enum::PAGE === $context ) {
-			$carousel_data = $this->get_carousel_jsonld( $id );
-			if ( $carousel_data ) {
-				$jsonld_array[] = $carousel_data;
-			}
-		}
-
-		$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 );
-		/**
-		 * @since 3.32.0
-		 * Expand the references returned by this filter.
-		 */
-		$references = $this->expand_references( $arr['references'] );
-
-		$jsonld_array = array_merge( $arr['jsonld'], $references );
-
-		return $jsonld_array;
-	}
-
-	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 ) {
-		$jsonld_service = Wordlift_Jsonld_Service::get_instance();
-		// 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 = $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;
-	}
-
-
-	/**
-	 * @param $references
-	 *
-	 * @return array
-	 */
-	private function expand_references( $references ) {
-		$jsonld_service = Wordlift_Jsonld_Service::get_instance();
-		// @TODO: we are assuming all the references are posts
-		// in this method, since now terms are getting converted to
-		// entities, this might not be true in all cases.
-		if ( ! is_array( $references ) ) {
-			return array();
-		}
-		$references_jsonld = array();
-		// Expand the references.
-		foreach ( $references as $reference ) {
-
-			$post_id = $reference;
-			if ( $reference instanceof Reference) {
-				$post_id = $reference->get_id();
-			}
-
-			$references_jsonld[] = $jsonld_service->get_jsonld( false, $post_id );
-		}
-
-		return $references_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;
+
+    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 ) {
+
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+
+        $this->entity_uri_service = $entity_uri_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, Jsonld_Context_Enum::PAGE );
+
+        // Bail out if the JSON-LD is empty.
+        if ( empty( $jsonld ) ) {
+            return;
+        }
+
+        $jsonld_string = wp_json_encode( $jsonld );
+
+        echo "<script type=\"application/ld+json\" id=\"wl-jsonld-term\">$jsonld_string</script>";
+
+    }
+
+    public function get( $id, $context ) {
+        /**
+         * 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
+         */
+        $jsonld_array  = array();
+
+        if ( Jsonld_Context_Enum::PAGE === $context ) {
+            $carousel_data = $this->get_carousel_jsonld( $id );
+            if ( $carousel_data ) {
+                $jsonld_array[] = $carousel_data;
+            }
+        }
+
+        $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 );
+        /**
+         * @since 3.32.0
+         * Expand the references returned by this filter.
+         */
+        $references = $this->expand_references( $arr['references'] );
+
+        $jsonld_array = array_merge( $arr['jsonld'], $references );
+
+        return $jsonld_array;
+    }
+
+    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 ) {
+        $jsonld_service = Wordlift_Jsonld_Service::get_instance();
+        // 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 = $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;
+    }
+
+
+    /**
+     * @param $references
+     *
+     * @return array
+     */
+    private function expand_references( $references ) {
+        $jsonld_service = Wordlift_Jsonld_Service::get_instance();
+        // @TODO: we are assuming all the references are posts
+        // in this method, since now terms are getting converted to
+        // entities, this might not be true in all cases.
+        if ( ! is_array( $references ) ) {
+            return array();
+        }
+        $references_jsonld = array();
+        // Expand the references.
+        foreach ( $references as $reference ) {
+
+            $post_id = $reference;
+            if ( $reference instanceof Reference) {
+                $post_id = $reference->get_id();
+            }
+
+            $references_jsonld[] = $jsonld_service->get_jsonld( false, $post_id );
+        }
+
+        return $references_jsonld;
+
+    }
 
 }

Spacing +55 added lines, -55 removed lines

@@ -39,9 +39,9 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function __construct( $entity_uri_service ) {
+	public function __construct($entity_uri_service) {
 
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
+		add_action('wp_head', array($this, 'wp_head'));
 
 		$this->entity_uri_service = $entity_uri_service;
 
@@ -58,31 +58,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,
@@ -91,31 +91,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);
 	}
 
 	/**
@@ -128,31 +128,31 @@ 
 
 
 		// 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_Context_Enum::PAGE );
+		$jsonld = $this->get($term_id, Jsonld_Context_Enum::PAGE);
 
 		// Bail out if the JSON-LD is empty.
-		if ( empty( $jsonld ) ) {
+		if (empty($jsonld)) {
 			return;
 		}
 
-		$jsonld_string = wp_json_encode( $jsonld );
+		$jsonld_string = wp_json_encode($jsonld);
 
 		echo "<script type=\"application/ld+json\" id=\"wl-jsonld-term\">$jsonld_string</script>";
 
 	}
 
-	public function get( $id, $context ) {
+	public function get($id, $context) {
 		/**
 		 * Support for carousel rich snippet, get jsonld data present
 		 * for all the posts shown in the term page, and add the jsonld data
@@ -162,19 +162,19 @@ 
 		 *
 		 * @since 3.26.0
 		 */
-		$jsonld_array  = array();
+		$jsonld_array = array();
 
-		if ( Jsonld_Context_Enum::PAGE === $context ) {
-			$carousel_data = $this->get_carousel_jsonld( $id );
-			if ( $carousel_data ) {
+		if (Jsonld_Context_Enum::PAGE === $context) {
+			$carousel_data = $this->get_carousel_jsonld($id);
+			if ($carousel_data) {
 				$jsonld_array[] = $carousel_data;
 			}
 		}
 
-		$entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
+		$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()
 		);
 
@@ -185,29 +185,29 @@ 
 		 * @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);
 		/**
 		 * @since 3.32.0
 		 * Expand the references returned by this filter.
 		 */
-		$references = $this->expand_references( $arr['references'] );
+		$references = $this->expand_references($arr['references']);
 
-		$jsonld_array = array_merge( $arr['jsonld'], $references );
+		$jsonld_array = array_merge($arr['jsonld'], $references);
 
 		return $jsonld_array;
 	}
 
-	private function get_term_url( $id ) {
-		if ( is_null( $id ) ) {
+	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 ) ) {
+		$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);
 	}
 
 	/**
@@ -218,25 +218,25 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_entity_jsonld( $term_id, $context ) {
+	private function get_entity_jsonld($term_id, $context) {
 		$jsonld_service = Wordlift_Jsonld_Service::get_instance();
 		// 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 = $jsonld_service->get_jsonld( false, $post->ID, $context );
+		$post   = $this->entity_uri_service->get_entity(array_shift($local_entity_ids));
+		$jsonld = $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;
 	}
@@ -247,24 +247,24 @@ 
 	 *
 	 * @return array
 	 */
-	private function expand_references( $references ) {
+	private function expand_references($references) {
 		$jsonld_service = Wordlift_Jsonld_Service::get_instance();
 		// @TODO: we are assuming all the references are posts
 		// in this method, since now terms are getting converted to
 		// entities, this might not be true in all cases.
-		if ( ! is_array( $references ) ) {
+		if ( ! is_array($references)) {
 			return array();
 		}
 		$references_jsonld = array();
 		// Expand the references.
-		foreach ( $references as $reference ) {
+		foreach ($references as $reference) {
 
 			$post_id = $reference;
-			if ( $reference instanceof Reference) {
+			if ($reference instanceof Reference) {
 				$post_id = $reference->get_id();
 			}
 
-			$references_jsonld[] = $jsonld_service->get_jsonld( false, $post_id );
+			$references_jsonld[] = $jsonld_service->get_jsonld(false, $post_id);
 		}
 
 		return $references_jsonld;

src/wordlift/term/class-type-service.php

Indentation +82 added lines, -82 removed lines

@@ -16,87 +16,87 @@
  * @package Wordlift\Term
  */
 class Type_Service extends Singleton {
-	/**
-	 * @var \Wordlift_Schema_Service
-	 */
-	private $schema_service;
-
-	/**
-	 * @return Type_Service
-	 */
-	public static function get_instance() {
-		return parent::get_instance();
-	}
-
-	public function __construct() {
-		parent::__construct();
-		$this->schema_service = \Wordlift_Schema_Service::get_instance();
-	}
-
-	public function get_entity_types_labels( $term_id ) {
-		$entity_types = $this->get_entity_types( $term_id );
-		return array_map( function ( $entity_type ) {
-			return $entity_type->name;
-		}, $entity_types );
-	}
-
-	/**
-	 * Returns the entity types selected for the term.
-	 *
-	 * @param $term_id int
-	 *
-	 * @return \WP_Term[]
-	 */
-	public function get_entity_types( $term_id ) {
-
-		$entity_type_slugs = get_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		$types = array_filter( array_map( function ( $type_slug ) {
-			$term = get_term_by( 'slug', $type_slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			if ( ! $term ) {
-				return false;
-			}
-
-			return $term;
-		}, $entity_type_slugs ) );
-
-		$types = array_filter( $types );
-
-		if ( 0 !== count( $types ) ) {
-			return $types;
-		}
-
-		return array( get_term_by( 'slug', 'thing', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) );
-	}
-
-
-	/**
-	 * @param $term_id int
-	 *
-	 * @return array|null
-	 */
-	public function get_schema( $term_id ) {
-		$entity_types = $this->get_entity_types( $term_id );
-		foreach ( $entity_types as $entity_type ) {
-			$schema = $this->schema_service->get_schema( $entity_type->slug );
-			if ( ! $schema ) {
-				break;
-			}
-		}
-
-		return $this->schema_service->get_schema( 'thing' );
-	}
-
-	/**
-	 * Removes all the existing entity types and set the entity types for the term.
-	 * @param $term_id int
-	 * @param $entity_types array
-	 */
-	public function set_entity_types( $term_id, $entity_types ) {
-		delete_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-		foreach ( $entity_types as $entity_type ) {
-			add_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $entity_type );
-		}
-	}
+    /**
+     * @var \Wordlift_Schema_Service
+     */
+    private $schema_service;
+
+    /**
+     * @return Type_Service
+     */
+    public static function get_instance() {
+        return parent::get_instance();
+    }
+
+    public function __construct() {
+        parent::__construct();
+        $this->schema_service = \Wordlift_Schema_Service::get_instance();
+    }
+
+    public function get_entity_types_labels( $term_id ) {
+        $entity_types = $this->get_entity_types( $term_id );
+        return array_map( function ( $entity_type ) {
+            return $entity_type->name;
+        }, $entity_types );
+    }
+
+    /**
+     * Returns the entity types selected for the term.
+     *
+     * @param $term_id int
+     *
+     * @return \WP_Term[]
+     */
+    public function get_entity_types( $term_id ) {
+
+        $entity_type_slugs = get_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        $types = array_filter( array_map( function ( $type_slug ) {
+            $term = get_term_by( 'slug', $type_slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            if ( ! $term ) {
+                return false;
+            }
+
+            return $term;
+        }, $entity_type_slugs ) );
+
+        $types = array_filter( $types );
+
+        if ( 0 !== count( $types ) ) {
+            return $types;
+        }
+
+        return array( get_term_by( 'slug', 'thing', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) );
+    }
+
+
+    /**
+     * @param $term_id int
+     *
+     * @return array|null
+     */
+    public function get_schema( $term_id ) {
+        $entity_types = $this->get_entity_types( $term_id );
+        foreach ( $entity_types as $entity_type ) {
+            $schema = $this->schema_service->get_schema( $entity_type->slug );
+            if ( ! $schema ) {
+                break;
+            }
+        }
+
+        return $this->schema_service->get_schema( 'thing' );
+    }
+
+    /**
+     * Removes all the existing entity types and set the entity types for the term.
+     * @param $term_id int
+     * @param $entity_types array
+     */
+    public function set_entity_types( $term_id, $entity_types ) {
+        delete_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+        foreach ( $entity_types as $entity_type ) {
+            add_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $entity_type );
+        }
+    }
 
 }
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -33,11 +33,11 @@ 
 		$this->schema_service = \Wordlift_Schema_Service::get_instance();
 	}
 
-	public function get_entity_types_labels( $term_id ) {
-		$entity_types = $this->get_entity_types( $term_id );
-		return array_map( function ( $entity_type ) {
+	public function get_entity_types_labels($term_id) {
+		$entity_types = $this->get_entity_types($term_id);
+		return array_map(function($entity_type) {
 			return $entity_type->name;
-		}, $entity_types );
+		}, $entity_types);
 	}
 
 	/**
@@ -47,26 +47,26 @@ 
 	 *
 	 * @return \WP_Term[]
 	 */
-	public function get_entity_types( $term_id ) {
+	public function get_entity_types($term_id) {
 
-		$entity_type_slugs = get_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$entity_type_slugs = get_term_meta($term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
-		$types = array_filter( array_map( function ( $type_slug ) {
-			$term = get_term_by( 'slug', $type_slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			if ( ! $term ) {
+		$types = array_filter(array_map(function($type_slug) {
+			$term = get_term_by('slug', $type_slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+			if ( ! $term) {
 				return false;
 			}
 
 			return $term;
-		}, $entity_type_slugs ) );
+		}, $entity_type_slugs));
 
-		$types = array_filter( $types );
+		$types = array_filter($types);
 
-		if ( 0 !== count( $types ) ) {
+		if (0 !== count($types)) {
 			return $types;
 		}
 
-		return array( get_term_by( 'slug', 'thing', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) );
+		return array(get_term_by('slug', 'thing', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME));
 	}
 
 
@@ -75,16 +75,16 @@ 
 	 *
 	 * @return array|null
 	 */
-	public function get_schema( $term_id ) {
-		$entity_types = $this->get_entity_types( $term_id );
-		foreach ( $entity_types as $entity_type ) {
-			$schema = $this->schema_service->get_schema( $entity_type->slug );
-			if ( ! $schema ) {
+	public function get_schema($term_id) {
+		$entity_types = $this->get_entity_types($term_id);
+		foreach ($entity_types as $entity_type) {
+			$schema = $this->schema_service->get_schema($entity_type->slug);
+			if ( ! $schema) {
 				break;
 			}
 		}
 
-		return $this->schema_service->get_schema( 'thing' );
+		return $this->schema_service->get_schema('thing');
 	}
 
 	/**
@@ -92,10 +92,10 @@ 
 	 * @param $term_id int
 	 * @param $entity_types array
 	 */
-	public function set_entity_types( $term_id, $entity_types ) {
-		delete_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-		foreach ( $entity_types as $entity_type ) {
-			add_term_meta( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $entity_type );
+	public function set_entity_types($term_id, $entity_types) {
+		delete_term_meta($term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+		foreach ($entity_types as $entity_type) {
+			add_term_meta($term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $entity_type);
 		}
 	}
 

src/wordlift/vocabulary-terms/jsonld/class-jsonld-generator.php

Indentation +134 added lines, -134 removed lines

@@ -12,145 +12,145 @@
 
 class Jsonld_Generator {
 
-	/**
-	 * @var \Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-	/**
-	 * @var \Wordlift_Property_Getter
-	 */
-	private $property_getter;
-	/**
-	 * @var Type_Service
-	 */
-	private $term_entity_type_service;
-	/**
-	 * @var \Wordlift_Entity_Service
-	 */
-	private $entity_service;
-
-	public function __construct( $entity_type_service, $property_getter ) {
-		$this->entity_type_service      = $entity_type_service;
-		$this->property_getter          = $property_getter;
-		$this->term_entity_type_service = Type_Service::get_instance();
-		$this->entity_service           = \Wordlift_Entity_Service::get_instance();
-	}
-
-	public function init() {
-		add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
-	}
-
-	public function wl_term_jsonld_array( $data, $term_id ) {
-		$jsonld     = $data['jsonld'];
-		$references = $data['references'];
-
-		$term_jsonld_data = $this->get_jsonld_data_for_term( $term_id );
-
-		// Return early if we dont have the entity data
-		// for the term.
-		if ( ! $term_jsonld_data ) {
-			return $data;
-		}
-
-		$term_jsonld = $term_jsonld_data['jsonld'];
-
-		$references = array_merge( $references, $term_jsonld_data['references'] );
-
-		array_unshift( $jsonld, $term_jsonld );
-
-		return array(
-			'jsonld'     => $jsonld,
-			'references' => $references
-		);
-	}
-
-	private function get_jsonld_data_for_term( $term_id ) {
-
-		$id = wl_get_term_entity_uri( $term_id );
-
-		// If we dont have a dataset  URI, then dont publish the term data
-		// on this page.
-		if ( ! $id ) {
-			return false;
-		}
-
-		$references = array();
-		$term       = get_term( $term_id );
-		$permalink  = get_term_link( $term );
-
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_term( $term_id );
-		$term          = get_term( $term_id );
-		$jsonld        = array(
-			'@context'    => 'http://schema.org',
-			'name'        => $term->name,
-			'@type'       => $this->term_entity_type_service->get_entity_types_labels( $term_id ),
-			'@id'         => $id,
-			'description' => $term->description,
-		);
-
-		if ( ! $custom_fields || ! is_array( $custom_fields ) ) {
-			return $jsonld;
-		}
-
-		foreach ( $custom_fields as $key => $value ) {
-			$name  = $this->relative_to_schema_context( $value['predicate'] );
-			$value = $this->property_getter->get( $term_id, $key, Object_Type_Enum::TERM );
-			$value = $this->process_value( $value, $references );
-			if ( ! $value ) {
-				continue;
-			}
-			$jsonld[ $name ] = $value;
-
-		}
-
-		if ( $permalink ) {
-			$jsonld['url']              = $permalink;
-			$jsonld['mainEntityOfPage'] = $permalink;
-		}
-
-		return apply_filters( 'wl_no_vocabulary_term_jsonld_array', array(
-			'jsonld'     => $jsonld,
-			'references' => $references
-		), $term_id );
-
-
-	}
-
-
-	private function relative_to_schema_context( $predicate ) {
-		return str_replace( 'http://schema.org/', '', $predicate );
-	}
-
-	private function process_value( $value, &$references ) {
-
-		if ( ! $value ) {
-			return false;
-		}
+    /**
+     * @var \Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+    /**
+     * @var \Wordlift_Property_Getter
+     */
+    private $property_getter;
+    /**
+     * @var Type_Service
+     */
+    private $term_entity_type_service;
+    /**
+     * @var \Wordlift_Entity_Service
+     */
+    private $entity_service;
+
+    public function __construct( $entity_type_service, $property_getter ) {
+        $this->entity_type_service      = $entity_type_service;
+        $this->property_getter          = $property_getter;
+        $this->term_entity_type_service = Type_Service::get_instance();
+        $this->entity_service           = \Wordlift_Entity_Service::get_instance();
+    }
+
+    public function init() {
+        add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
+    }
+
+    public function wl_term_jsonld_array( $data, $term_id ) {
+        $jsonld     = $data['jsonld'];
+        $references = $data['references'];
+
+        $term_jsonld_data = $this->get_jsonld_data_for_term( $term_id );
+
+        // Return early if we dont have the entity data
+        // for the term.
+        if ( ! $term_jsonld_data ) {
+            return $data;
+        }
+
+        $term_jsonld = $term_jsonld_data['jsonld'];
+
+        $references = array_merge( $references, $term_jsonld_data['references'] );
+
+        array_unshift( $jsonld, $term_jsonld );
+
+        return array(
+            'jsonld'     => $jsonld,
+            'references' => $references
+        );
+    }
+
+    private function get_jsonld_data_for_term( $term_id ) {
+
+        $id = wl_get_term_entity_uri( $term_id );
+
+        // If we dont have a dataset  URI, then dont publish the term data
+        // on this page.
+        if ( ! $id ) {
+            return false;
+        }
+
+        $references = array();
+        $term       = get_term( $term_id );
+        $permalink  = get_term_link( $term );
+
+        $custom_fields = $this->entity_type_service->get_custom_fields_for_term( $term_id );
+        $term          = get_term( $term_id );
+        $jsonld        = array(
+            '@context'    => 'http://schema.org',
+            'name'        => $term->name,
+            '@type'       => $this->term_entity_type_service->get_entity_types_labels( $term_id ),
+            '@id'         => $id,
+            'description' => $term->description,
+        );
+
+        if ( ! $custom_fields || ! is_array( $custom_fields ) ) {
+            return $jsonld;
+        }
+
+        foreach ( $custom_fields as $key => $value ) {
+            $name  = $this->relative_to_schema_context( $value['predicate'] );
+            $value = $this->property_getter->get( $term_id, $key, Object_Type_Enum::TERM );
+            $value = $this->process_value( $value, $references );
+            if ( ! $value ) {
+                continue;
+            }
+            $jsonld[ $name ] = $value;
+
+        }
+
+        if ( $permalink ) {
+            $jsonld['url']              = $permalink;
+            $jsonld['mainEntityOfPage'] = $permalink;
+        }
+
+        return apply_filters( 'wl_no_vocabulary_term_jsonld_array', array(
+            'jsonld'     => $jsonld,
+            'references' => $references
+        ), $term_id );
+
+
+    }
+
+
+    private function relative_to_schema_context( $predicate ) {
+        return str_replace( 'http://schema.org/', '', $predicate );
+    }
+
+    private function process_value( $value, &$references ) {
+
+        if ( ! $value ) {
+            return false;
+        }
 
-		if ( is_array( $value )
-		     && count( $value ) > 0
-		     && $value[0] instanceof \Wordlift_Property_Entity_Reference ) {
+        if ( is_array( $value )
+             && count( $value ) > 0
+             && $value[0] instanceof \Wordlift_Property_Entity_Reference ) {
 
-			// All of the references from the custom fields are post references.
-			$references = array_merge( $references, array_map( function ( $property_entity_reference ) {
-				/**
-				 * @var $property_entity_reference \Wordlift_Property_Entity_Reference
-				 */
-				return new Post_Reference( $property_entity_reference->get_id() );
-			}, $value ) );
+            // All of the references from the custom fields are post references.
+            $references = array_merge( $references, array_map( function ( $property_entity_reference ) {
+                /**
+                 * @var $property_entity_reference \Wordlift_Property_Entity_Reference
+                 */
+                return new Post_Reference( $property_entity_reference->get_id() );
+            }, $value ) );
 
-			$that = $this;
+            $that = $this;
 
-			return array_map( function ( $reference ) use ( $that ) {
-				/**
-				 * @var $reference \Wordlift_Property_Entity_Reference
-				 */
-				return array( '@id' => $that->entity_service->get_uri( $reference->get_id() ) );
-			}, $value );
+            return array_map( function ( $reference ) use ( $that ) {
+                /**
+                 * @var $reference \Wordlift_Property_Entity_Reference
+                 */
+                return array( '@id' => $that->entity_service->get_uri( $reference->get_id() ) );
+            }, $value );
 
-		}
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 
 }
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	private $entity_service;
 
-	public function __construct( $entity_type_service, $property_getter ) {
+	public function __construct($entity_type_service, $property_getter) {
 		$this->entity_type_service      = $entity_type_service;
 		$this->property_getter          = $property_getter;
 		$this->term_entity_type_service = Type_Service::get_instance();
@@ -37,26 +37,26 @@ 
 	}
 
 	public function init() {
-		add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
+		add_filter('wl_term_jsonld_array', array($this, 'wl_term_jsonld_array'), 10, 2);
 	}
 
-	public function wl_term_jsonld_array( $data, $term_id ) {
+	public function wl_term_jsonld_array($data, $term_id) {
 		$jsonld     = $data['jsonld'];
 		$references = $data['references'];
 
-		$term_jsonld_data = $this->get_jsonld_data_for_term( $term_id );
+		$term_jsonld_data = $this->get_jsonld_data_for_term($term_id);
 
 		// Return early if we dont have the entity data
 		// for the term.
-		if ( ! $term_jsonld_data ) {
+		if ( ! $term_jsonld_data) {
 			return $data;
 		}
 
 		$term_jsonld = $term_jsonld_data['jsonld'];
 
-		$references = array_merge( $references, $term_jsonld_data['references'] );
+		$references = array_merge($references, $term_jsonld_data['references']);
 
-		array_unshift( $jsonld, $term_jsonld );
+		array_unshift($jsonld, $term_jsonld);
 
 		return array(
 			'jsonld'     => $jsonld,
@@ -64,89 +64,89 @@ 
 		);
 	}
 
-	private function get_jsonld_data_for_term( $term_id ) {
+	private function get_jsonld_data_for_term($term_id) {
 
-		$id = wl_get_term_entity_uri( $term_id );
+		$id = wl_get_term_entity_uri($term_id);
 
 		// If we dont have a dataset  URI, then dont publish the term data
 		// on this page.
-		if ( ! $id ) {
+		if ( ! $id) {
 			return false;
 		}
 
 		$references = array();
-		$term       = get_term( $term_id );
-		$permalink  = get_term_link( $term );
+		$term       = get_term($term_id);
+		$permalink  = get_term_link($term);
 
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_term( $term_id );
-		$term          = get_term( $term_id );
+		$custom_fields = $this->entity_type_service->get_custom_fields_for_term($term_id);
+		$term          = get_term($term_id);
 		$jsonld        = array(
 			'@context'    => 'http://schema.org',
 			'name'        => $term->name,
-			'@type'       => $this->term_entity_type_service->get_entity_types_labels( $term_id ),
+			'@type'       => $this->term_entity_type_service->get_entity_types_labels($term_id),
 			'@id'         => $id,
 			'description' => $term->description,
 		);
 
-		if ( ! $custom_fields || ! is_array( $custom_fields ) ) {
+		if ( ! $custom_fields || ! is_array($custom_fields)) {
 			return $jsonld;
 		}
 
-		foreach ( $custom_fields as $key => $value ) {
-			$name  = $this->relative_to_schema_context( $value['predicate'] );
-			$value = $this->property_getter->get( $term_id, $key, Object_Type_Enum::TERM );
-			$value = $this->process_value( $value, $references );
-			if ( ! $value ) {
+		foreach ($custom_fields as $key => $value) {
+			$name  = $this->relative_to_schema_context($value['predicate']);
+			$value = $this->property_getter->get($term_id, $key, Object_Type_Enum::TERM);
+			$value = $this->process_value($value, $references);
+			if ( ! $value) {
 				continue;
 			}
-			$jsonld[ $name ] = $value;
+			$jsonld[$name] = $value;
 
 		}
 
-		if ( $permalink ) {
+		if ($permalink) {
 			$jsonld['url']              = $permalink;
 			$jsonld['mainEntityOfPage'] = $permalink;
 		}
 
-		return apply_filters( 'wl_no_vocabulary_term_jsonld_array', array(
+		return apply_filters('wl_no_vocabulary_term_jsonld_array', array(
 			'jsonld'     => $jsonld,
 			'references' => $references
-		), $term_id );
+		), $term_id);
 
 
 	}
 
 
-	private function relative_to_schema_context( $predicate ) {
-		return str_replace( 'http://schema.org/', '', $predicate );
+	private function relative_to_schema_context($predicate) {
+		return str_replace('http://schema.org/', '', $predicate);
 	}
 
-	private function process_value( $value, &$references ) {
+	private function process_value($value, &$references) {
 
-		if ( ! $value ) {
+		if ( ! $value) {
 			return false;
 		}
 
-		if ( is_array( $value )
-		     && count( $value ) > 0
-		     && $value[0] instanceof \Wordlift_Property_Entity_Reference ) {
+		if (is_array($value)
+		     && count($value) > 0
+		     && $value[0] instanceof \Wordlift_Property_Entity_Reference) {
 
 			// All of the references from the custom fields are post references.
-			$references = array_merge( $references, array_map( function ( $property_entity_reference ) {
+			$references = array_merge($references, array_map(function($property_entity_reference) {
 				/**
 				 * @var $property_entity_reference \Wordlift_Property_Entity_Reference
 				 */
-				return new Post_Reference( $property_entity_reference->get_id() );
-			}, $value ) );
+				return new Post_Reference($property_entity_reference->get_id());
+			}, $value));
 
 			$that = $this;
 
-			return array_map( function ( $reference ) use ( $that ) {
+			return array_map(function($reference) use ($that) {
 				/**
 				 * @var $reference \Wordlift_Property_Entity_Reference
 				 */
-				return array( '@id' => $that->entity_service->get_uri( $reference->get_id() ) );
-			}, $value );
+				return array('@id' => $that->entity_service->get_uri($reference->get_id()));
+			}, $value);
 
 		}