insideout10 / wordlift-plugin

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

Indentation +328 added lines, -328 removed lines

@@ -18,334 +18,334 @@ 
  */
 class Wordlift_Relation_Service {
 
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * The relation table name in MySQL, set during instantiation.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var string $relation_table The relation table name.
-	 */
-	private $relation_table;
-
-	/**
-	 * Create a {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since 3.15.0
-	 */
-	public function __construct() {
-		global $wpdb;
-
-		// The relations table.
-		$this->relation_table = "{$wpdb->prefix}wl_relation_instances";
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access public
-	 * @return \Wordlift_Relation_Service The {@link Wordlift_Relation_Service}
-	 *                                    singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the articles referencing the specified entity {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array   $object_id The entity {@link WP_Post}'s id.
-	 * @param string      $fields    The fields to return, 'ids' to only return ids or
-	 *                               '*' to return all fields, by default '*'.
-	 * @param null|string $predicate The predicate (who|what|...), by default all.
-	 * @param null|string $status    The status, by default all.
-	 * @param array       $excludes  An array of ids to exclude from the results.
-	 * @param null|int    $limit     The maximum number of results, by default
-	 *                               no limit.
-	 * @param null|array  $include   The {@link WP_Post}s' ids to include.
-	 *
-	 * @return array|object|null Database query results
-	 */
-	public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$objects = $this->article_id_to_entity_id( $object_id );
-
-		$sql =
-			"
+    /**
+     * The singleton instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * The relation table name in MySQL, set during instantiation.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var string $relation_table The relation table name.
+     */
+    private $relation_table;
+
+    /**
+     * Create a {@link Wordlift_Relation_Service} instance.
+     *
+     * @since 3.15.0
+     */
+    public function __construct() {
+        global $wpdb;
+
+        // The relations table.
+        $this->relation_table = "{$wpdb->prefix}wl_relation_instances";
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since  3.15.0
+     * @access public
+     * @return \Wordlift_Relation_Service The {@link Wordlift_Relation_Service}
+     *                                    singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the articles referencing the specified entity {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int|array   $object_id The entity {@link WP_Post}'s id.
+     * @param string      $fields    The fields to return, 'ids' to only return ids or
+     *                               '*' to return all fields, by default '*'.
+     * @param null|string $predicate The predicate (who|what|...), by default all.
+     * @param null|string $status    The status, by default all.
+     * @param array       $excludes  An array of ids to exclude from the results.
+     * @param null|int    $limit     The maximum number of results, by default
+     *                               no limit.
+     * @param null|array  $include   The {@link WP_Post}s' ids to include.
+     *
+     * @return array|object|null Database query results
+     */
+    public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $objects = $this->article_id_to_entity_id( $object_id );
+
+        $sql =
+            "
 			SELECT DISTINCT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.subject_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_article()
-			. self::where_object_id( $objects )
-			// Since `object_id` can be an article ID we need to exclude it from
-			// the results.
-			. self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
-			. self::and_article_in( $include )
-			. " AND p.post_type IN ( 'post', 'page', 'entity' ) "
-			. self::and_predicate( $predicate )
-			. self::limit( $limit );
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Add the limit clause if specified.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|int $limit The maximum number of results.
-	 *
-	 * @return string The limit clause (empty if no limit has been specified).
-	 */
-	private static function limit( $limit = null ) {
-
-		if ( null === $limit ) {
-			return '';
-		}
-
-		return "LIMIT $limit";
-	}
-
-	/**
-	 * Map the provided ids into entities (i.e. return the id if it's an entity
-	 * or get the entities if it's a post).
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array $object_id An array of posts/entities' ids.
-	 *
-	 * @return array An array of entities' ids.
-	 */
-	private function article_id_to_entity_id( $object_id ) {
-
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		$relation_service = $this;
-
-		return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
-			if ( $entity_service->is_entity( $item ) ) {
-				return array_merge( $carry, (array) $item );
-			}
-
-			return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
-		}, array() );
-
-	}
-
-	/**
-	 * Add the WHERE clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array $object_id An array of {@link WP_Post}s' ids.
-	 *
-	 * @return string The WHERE clause.
-	 */
-	private static function where_object_id( $object_id ) {
-
-		return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
-	}
-
-	/**
-	 * Add the exclude clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array $exclude An array of {@link WP_Post}s' ids to exclude.
-	 *
-	 * @return string The exclude clause.
-	 */
-	private static function and_article_not_in( $exclude ) {
-
-		return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
-	}
-
-	/**
-	 * Add the include clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|int|array $include An array of {@link WP_Post}s' ids.
-	 *
-	 * @return string An empty string if $include is null otherwise the include
-	 *                clause.
-	 */
-	private static function and_article_in( $include = null ) {
-
-		if ( null === $include ) {
-			return '';
-		}
-
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
-	}
-
-	/**
-	 * Get the entities' {@link WP_Post}s' ids referencing the specified {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int         $object_id The object {@link WP_Post}'s id.
-	 * @param string      $fields    The fields to return, 'ids' to only return ids or
-	 *                               '*' to return all fields, by default '*'.
-	 * @param null|string $status    The status, by default all.
-	 *
-	 * @return array|object|null Database query results
-	 */
-	public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$sql = $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_article()
+            . self::where_object_id( $objects )
+            // Since `object_id` can be an article ID we need to exclude it from
+            // the results.
+            . self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
+            . self::and_article_in( $include )
+            . " AND p.post_type IN ( 'post', 'page', 'entity' ) "
+            . self::and_predicate( $predicate )
+            . self::limit( $limit );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Add the limit clause if specified.
+     *
+     * @since 3.15.0
+     *
+     * @param null|int $limit The maximum number of results.
+     *
+     * @return string The limit clause (empty if no limit has been specified).
+     */
+    private static function limit( $limit = null ) {
+
+        if ( null === $limit ) {
+            return '';
+        }
+
+        return "LIMIT $limit";
+    }
+
+    /**
+     * Map the provided ids into entities (i.e. return the id if it's an entity
+     * or get the entities if it's a post).
+     *
+     * @since 3.15.0
+     *
+     * @param int|array $object_id An array of posts/entities' ids.
+     *
+     * @return array An array of entities' ids.
+     */
+    private function article_id_to_entity_id( $object_id ) {
+
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        $relation_service = $this;
+
+        return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
+            if ( $entity_service->is_entity( $item ) ) {
+                return array_merge( $carry, (array) $item );
+            }
+
+            return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
+        }, array() );
+
+    }
+
+    /**
+     * Add the WHERE clause.
+     *
+     * @since 3.15.0
+     *
+     * @param int|array $object_id An array of {@link WP_Post}s' ids.
+     *
+     * @return string The WHERE clause.
+     */
+    private static function where_object_id( $object_id ) {
+
+        return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
+    }
+
+    /**
+     * Add the exclude clause.
+     *
+     * @since 3.15.0
+     *
+     * @param int|array $exclude An array of {@link WP_Post}s' ids to exclude.
+     *
+     * @return string The exclude clause.
+     */
+    private static function and_article_not_in( $exclude ) {
+
+        return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
+    }
+
+    /**
+     * Add the include clause.
+     *
+     * @since 3.15.0
+     *
+     * @param null|int|array $include An array of {@link WP_Post}s' ids.
+     *
+     * @return string An empty string if $include is null otherwise the include
+     *                clause.
+     */
+    private static function and_article_in( $include = null ) {
+
+        if ( null === $include ) {
+            return '';
+        }
+
+        return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
+    }
+
+    /**
+     * Get the entities' {@link WP_Post}s' ids referencing the specified {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int         $object_id The object {@link WP_Post}'s id.
+     * @param string      $fields    The fields to return, 'ids' to only return ids or
+     *                               '*' to return all fields, by default '*'.
+     * @param null|string $status    The status, by default all.
+     *
+     * @return array|object|null Database query results
+     */
+    public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $sql = $wpdb->prepare(
+            "
 			SELECT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.subject_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_not_article() .
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_not_article() .
+            "
 			WHERE r.object_id = %d
 				AND p.post_type IN ( 'post', 'page', 'entity' )
 			"
-			,
-			$object_id
-		);
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Get the entities referenced by the specified {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int         $subject_id The {@link WP_Post}'s id.
-	 * @param string      $fields     The fields to return, 'ids' to only return ids or
-	 *                                '*' to return all fields, by default '*'.
-	 * @param null|string $predicate  The predicate (who|what|...), by default all.
-	 * @param null|string $status     The status, by default all.
-	 *
-	 * @return array|object|null Database query results
-	 */
-	public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$sql = $wpdb->prepare(
-			"
+            ,
+            $object_id
+        );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Get the entities referenced by the specified {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int         $subject_id The {@link WP_Post}'s id.
+     * @param string      $fields     The fields to return, 'ids' to only return ids or
+     *                                '*' to return all fields, by default '*'.
+     * @param null|string $predicate  The predicate (who|what|...), by default all.
+     * @param null|string $status     The status, by default all.
+     *
+     * @return array|object|null Database query results
+     */
+    public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $sql = $wpdb->prepare(
+            "
 			SELECT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.object_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_not_article()
-			. "
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_not_article()
+            . "
 			WHERE r.subject_id = %d
 				AND p.post_type IN ( 'post', 'page', 'entity' )
 			"
-			. self::and_predicate( $predicate )
-			,
-			$subject_id
-		);
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Add the `post_status` clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|string|array $status The status values.
-	 *
-	 * @return string An empty string if $status is null, otherwise the status clause.
-	 */
-	private static function and_status( $status = null ) {
-
-		if ( null === $status ) {
-			return '';
-		}
-
-		return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
-	}
-
-	/**
-	 * Add the `predicate` clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|string|array $predicate An array of predicates.
-	 *
-	 * @return string An empty string if $predicate is null otherwise the predicate
-	 *                clause.
-	 */
-	private static function and_predicate( $predicate = null ) {
-
-		if ( null === $predicate ) {
-			return '';
-		}
-
-		return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
-	}
-
-	/**
-	 * The select fields.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $fields Either 'ids' or '*', by default '*'.
-	 *
-	 * @return string The `id` field if `ids` otherwise `*`.
-	 */
-	private static function fields( $fields = '*' ) {
-
-		// The output fields.
-		return 'ids' === $fields ? 'id' : '*';
-	}
-
-	/**
-	 * The inner join clause for articles.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return string The articles inner join clause.
-	 */
-	private static function inner_join_is_article() {
-		global $wpdb;
-
-		return $wpdb->prepare(
-			"
+            . self::and_predicate( $predicate )
+            ,
+            $subject_id
+        );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Add the `post_status` clause.
+     *
+     * @since 3.15.0
+     *
+     * @param null|string|array $status The status values.
+     *
+     * @return string An empty string if $status is null, otherwise the status clause.
+     */
+    private static function and_status( $status = null ) {
+
+        if ( null === $status ) {
+            return '';
+        }
+
+        return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
+    }
+
+    /**
+     * Add the `predicate` clause.
+     *
+     * @since 3.15.0
+     *
+     * @param null|string|array $predicate An array of predicates.
+     *
+     * @return string An empty string if $predicate is null otherwise the predicate
+     *                clause.
+     */
+    private static function and_predicate( $predicate = null ) {
+
+        if ( null === $predicate ) {
+            return '';
+        }
+
+        return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
+    }
+
+    /**
+     * The select fields.
+     *
+     * @since 3.15.0
+     *
+     * @param string $fields Either 'ids' or '*', by default '*'.
+     *
+     * @return string The `id` field if `ids` otherwise `*`.
+     */
+    private static function fields( $fields = '*' ) {
+
+        // The output fields.
+        return 'ids' === $fields ? 'id' : '*';
+    }
+
+    /**
+     * The inner join clause for articles.
+     *
+     * @since 3.15.0
+     *
+     * @return string The articles inner join clause.
+     */
+    private static function inner_join_is_article() {
+        global $wpdb;
+
+        return $wpdb->prepare(
+            "
 			INNER JOIN $wpdb->term_relationships tr
 			 ON p.id = tr.object_id
 			INNER JOIN $wpdb->term_taxonomy tt
@@ -355,23 +355,23 @@ 
 			 ON t.term_id = tt.term_id
 			  AND t.slug = %s
 			",
-			'wl_entity_type',
-			'article'
-		);
-	}
-
-	/**
-	 * The inner join clause for non-articles.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return string The non-articles inner join clause.
-	 */
-	private static function inner_join_is_not_article() {
-		global $wpdb;
-
-		return $wpdb->prepare(
-			"
+            'wl_entity_type',
+            'article'
+        );
+    }
+
+    /**
+     * The inner join clause for non-articles.
+     *
+     * @since 3.15.0
+     *
+     * @return string The non-articles inner join clause.
+     */
+    private static function inner_join_is_not_article() {
+        global $wpdb;
+
+        return $wpdb->prepare(
+            "
 			INNER JOIN $wpdb->term_relationships tr
 			 ON p.id = tr.object_id
 			INNER JOIN $wpdb->term_taxonomy tt
@@ -381,9 +381,9 @@ 
 			 ON t.term_id = tt.term_id
 			  AND NOT t.slug = %s
 			",
-			'wl_entity_type',
-			'article'
-		);
-	}
+            'wl_entity_type',
+            'article'
+        );
+    }
 
 }

src/public/class-wordlift-public.php

Indentation +102 added lines, -102 removed lines

@@ -22,107 +22,107 @@
  */
 class Wordlift_Public {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @param      string $plugin_name The name of the plugin.
-	 * @param      string $version     The version of this plugin.
-	 */
-	public function __construct( $plugin_name, $version ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		// Prepare a settings array for client-side functions.
-		$settings = array(
-			'ajaxUrl' => admin_url( 'admin-ajax.php' ),
-		);
-
-		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
-			$settings['postId'] = get_the_ID();
-		}
-
-		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
-			$settings['isHome'] = true;
-		}
-
-		// Add the JSON-LD enabled flag, when set to false, the JSON-lD won't
-		// be loaded.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/642.
-		$settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', true );
-
-		// Note that we switched the js to be loaded in footer, since it is loading
-		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-public.js', array( 'jquery' ), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
-
-	}
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since    1.0.0
+     *
+     * @param      string $plugin_name The name of the plugin.
+     * @param      string $version     The version of this plugin.
+     */
+    public function __construct( $plugin_name, $version ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        // Prepare a settings array for client-side functions.
+        $settings = array(
+            'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+        );
+
+        // If we're in a single page, then print out the post id.
+        if ( is_singular() ) {
+            $settings['postId'] = get_the_ID();
+        }
+
+        // Add flag that we are on home/blog page.
+        if ( is_home() || is_front_page() ) {
+            $settings['isHome'] = true;
+        }
+
+        // Add the JSON-LD enabled flag, when set to false, the JSON-lD won't
+        // be loaded.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/642.
+        $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', true );
+
+        // Note that we switched the js to be loaded in footer, since it is loading
+        // the json-ld representation.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-public.js', array( 'jquery' ), $this->version, true );
+        wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param      string $plugin_name The name of the plugin.
 	 * @param      string $version     The version of this plugin.
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -74,7 +74,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-public.css', array(), $this->version, 'all');
 
 	}
 
@@ -99,16 +99,16 @@ 
 
 		// Prepare a settings array for client-side functions.
 		$settings = array(
-			'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+			'ajaxUrl' => admin_url('admin-ajax.php'),
 		);
 
 		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
+		if (is_singular()) {
 			$settings['postId'] = get_the_ID();
 		}
 
 		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
+		if (is_home() || is_front_page()) {
 			$settings['isHome'] = true;
 		}
 
@@ -116,12 +116,12 @@ 
 		// be loaded.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/642.
-		$settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', true );
+		$settings['jsonld_enabled'] = apply_filters('wl_jsonld_enabled', true);
 
 		// Note that we switched the js to be loaded in footer, since it is loading
 		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-public.js', array( 'jquery' ), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/wordlift-public.js', array('jquery'), $this->version, true);
+		wp_localize_script($this->plugin_name, 'wlSettings', $settings);
 
 	}
 

src/admin/class-wordlift-admin-publisher-element.php

Indentation +120 added lines, -120 removed lines

@@ -19,122 +19,122 @@ 
  */
 class Wordlift_Admin_Publisher_Element extends Wordlift_Admin_Author_Element {
 
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
-
-	/**
-	 * @var Wordlift_Admin_Tabs_Element
-	 */
-	private $tabs_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Publisher_Element} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_Publisher_Service     $publisher_service     The {@link Wordlift_Publisher_Service} instance.
-	 * @param \Wordlift_Admin_Tabs_Element    $tabs_element          The {@link Wordlift_Admin_Tabs_Element} instance.
-	 * @param \Wordlift_Admin_Select2_Element $select_element        The {@link Wordlift_Admin_Select_Element} instance.
-	 */
-	function __construct( $configuration_service, $publisher_service, $tabs_element, $select_element ) {
-		parent::__construct( $publisher_service, $select_element );
-
-		$this->configuration_service = $configuration_service;
-		$this->publisher_service     = $publisher_service;
-
-		// Child elements.
-		$this->tabs_element = $tabs_element;
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
-
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'   => uniqid( 'wl-input-' ),
-			'name' => uniqid( 'wl-input-' ),
-		) );
-
-		// Get the number of potential candidates as publishers.
-		$count = $this->publisher_service->count();
-
-		$this->tabs_element->render( array(
-			'tabs'   => array(
-				array(
-					'label'    => __( 'Select an Existing Publisher', 'wordlift' ),
-					'callback' => array( $this, 'select' ),
-					'args'     => $params,
-				),
-				array(
-					'label'    => __( 'Create a New Publisher', 'wordlift' ),
-					'callback' => array( $this, 'create' ),
-					'args'     => $params,
-				),
-			),
-			// Set the default tab according to the number of potential publishers
-			// configured in WP: 0 = select, 1 = create.
-			'active' => 0 === $count ? 1 : 0,
-		) );
-
-		// Finally return the element instance.
-		return $this;
-	}
-
-	/**
-	 * Render the publisher's select.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $params An array of parameters.
-	 */
-	public function select( $params ) {
-
-		// Get the configured publisher id. In case a publisher id is already configured
-		// this must be pre-loaded in the options.
-		$publisher_id = $this->configuration_service->get_publisher_id();
-
-		// Get the publisher data.
-		$data = $this->publisher_service->query();
-		array_unshift( $data, array(
-			'id'            => '',
-			'text'          => _x( '(none)', 'Publisher Select in Settings Screen.', 'wordlift' ),
-			'type'          => '',
-			'thumbnail_url' => false,
-		) );
-
-		// Call the select internal render.
-		$this->do_render( $params, $publisher_id, $data );
-
-	}
-
-	/**
-	 * Render the 'create publisher' form.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $params An array of parameters.
-	 */
-	public function create( $params ) {
-		?>
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
+
+    /**
+     * @var Wordlift_Admin_Tabs_Element
+     */
+    private $tabs_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Publisher_Element} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_Publisher_Service     $publisher_service     The {@link Wordlift_Publisher_Service} instance.
+     * @param \Wordlift_Admin_Tabs_Element    $tabs_element          The {@link Wordlift_Admin_Tabs_Element} instance.
+     * @param \Wordlift_Admin_Select2_Element $select_element        The {@link Wordlift_Admin_Select_Element} instance.
+     */
+    function __construct( $configuration_service, $publisher_service, $tabs_element, $select_element ) {
+        parent::__construct( $publisher_service, $select_element );
+
+        $this->configuration_service = $configuration_service;
+        $this->publisher_service     = $publisher_service;
+
+        // Child elements.
+        $this->tabs_element = $tabs_element;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
+
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'   => uniqid( 'wl-input-' ),
+            'name' => uniqid( 'wl-input-' ),
+        ) );
+
+        // Get the number of potential candidates as publishers.
+        $count = $this->publisher_service->count();
+
+        $this->tabs_element->render( array(
+            'tabs'   => array(
+                array(
+                    'label'    => __( 'Select an Existing Publisher', 'wordlift' ),
+                    'callback' => array( $this, 'select' ),
+                    'args'     => $params,
+                ),
+                array(
+                    'label'    => __( 'Create a New Publisher', 'wordlift' ),
+                    'callback' => array( $this, 'create' ),
+                    'args'     => $params,
+                ),
+            ),
+            // Set the default tab according to the number of potential publishers
+            // configured in WP: 0 = select, 1 = create.
+            'active' => 0 === $count ? 1 : 0,
+        ) );
+
+        // Finally return the element instance.
+        return $this;
+    }
+
+    /**
+     * Render the publisher's select.
+     *
+     * @since 3.11.0
+     *
+     * @param array $params An array of parameters.
+     */
+    public function select( $params ) {
+
+        // Get the configured publisher id. In case a publisher id is already configured
+        // this must be pre-loaded in the options.
+        $publisher_id = $this->configuration_service->get_publisher_id();
+
+        // Get the publisher data.
+        $data = $this->publisher_service->query();
+        array_unshift( $data, array(
+            'id'            => '',
+            'text'          => _x( '(none)', 'Publisher Select in Settings Screen.', 'wordlift' ),
+            'type'          => '',
+            'thumbnail_url' => false,
+        ) );
+
+        // Call the select internal render.
+        $this->do_render( $params, $publisher_id, $data );
+
+    }
+
+    /**
+     * Render the 'create publisher' form.
+     *
+     * @since 3.11.0
+     *
+     * @param array $params An array of parameters.
+     */
+    public function create( $params ) {
+        ?>
 		<p>
 			<strong><?php esc_html_e( 'Are you publishing as an individual or as a company?', 'wordlift' ) ?></strong>
 		</p>
@@ -144,13 +144,13 @@ 
 				       name="wl_publisher[type]" value="person"
 				       checked="checked">
 				<label for="wl-publisher-person"><?php
-					esc_html_e( 'Person', 'wordlift' ) ?></label>
+                    esc_html_e( 'Person', 'wordlift' ) ?></label>
 			</span>
 			<span>
 				<input id="wl-publisher-company" type="radio"
 				       name="wl_publisher[type]" value="organization"">
 				<label for="wl-publisher-company"><?php
-					esc_html_e( 'Company', 'wordlift' ) ?></label>
+                    esc_html_e( 'Company', 'wordlift' ) ?></label>
 			</span>
 		</p>
 		<p id="wl-publisher-name">
@@ -167,10 +167,10 @@ 
 				<img id="wl-publisher-media-uploader-preview" />
 				<button type="button" class="button"
 				        id="wl-publisher-media-uploader"><?php
-					esc_html_e( 'Select an existing image or upload a new one', 'wordlift' ); ?></button>
+                    esc_html_e( 'Select an existing image or upload a new one', 'wordlift' ); ?></button>
 			</p>
 		</div>
 		<?php
-	}
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -52,8 +52,8 @@ 
 	 * @param \Wordlift_Admin_Tabs_Element    $tabs_element          The {@link Wordlift_Admin_Tabs_Element} instance.
 	 * @param \Wordlift_Admin_Select2_Element $select_element        The {@link Wordlift_Admin_Select_Element} instance.
 	 */
-	function __construct( $configuration_service, $publisher_service, $tabs_element, $select_element ) {
-		parent::__construct( $publisher_service, $select_element );
+	function __construct($configuration_service, $publisher_service, $tabs_element, $select_element) {
+		parent::__construct($publisher_service, $select_element);
 
 		$this->configuration_service = $configuration_service;
 		$this->publisher_service     = $publisher_service;
@@ -66,34 +66,34 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'   => uniqid( 'wl-input-' ),
-			'name' => uniqid( 'wl-input-' ),
-		) );
+		$params = wp_parse_args($args, array(
+			'id'   => uniqid('wl-input-'),
+			'name' => uniqid('wl-input-'),
+		));
 
 		// Get the number of potential candidates as publishers.
 		$count = $this->publisher_service->count();
 
-		$this->tabs_element->render( array(
+		$this->tabs_element->render(array(
 			'tabs'   => array(
 				array(
-					'label'    => __( 'Select an Existing Publisher', 'wordlift' ),
-					'callback' => array( $this, 'select' ),
+					'label'    => __('Select an Existing Publisher', 'wordlift'),
+					'callback' => array($this, 'select'),
 					'args'     => $params,
 				),
 				array(
-					'label'    => __( 'Create a New Publisher', 'wordlift' ),
-					'callback' => array( $this, 'create' ),
+					'label'    => __('Create a New Publisher', 'wordlift'),
+					'callback' => array($this, 'create'),
 					'args'     => $params,
 				),
 			),
 			// Set the default tab according to the number of potential publishers
 			// configured in WP: 0 = select, 1 = create.
 			'active' => 0 === $count ? 1 : 0,
-		) );
+		));
 
 		// Finally return the element instance.
 		return $this;
@@ -106,7 +106,7 @@ 
 	 *
 	 * @param array $params An array of parameters.
 	 */
-	public function select( $params ) {
+	public function select($params) {
 
 		// Get the configured publisher id. In case a publisher id is already configured
 		// this must be pre-loaded in the options.
@@ -114,15 +114,15 @@ 
 
 		// Get the publisher data.
 		$data = $this->publisher_service->query();
-		array_unshift( $data, array(
+		array_unshift($data, array(
 			'id'            => '',
-			'text'          => _x( '(none)', 'Publisher Select in Settings Screen.', 'wordlift' ),
+			'text'          => _x('(none)', 'Publisher Select in Settings Screen.', 'wordlift'),
 			'type'          => '',
 			'thumbnail_url' => false,
-		) );
+		));
 
 		// Call the select internal render.
-		$this->do_render( $params, $publisher_id, $data );
+		$this->do_render($params, $publisher_id, $data);
 
 	}
 
@@ -133,10 +133,10 @@ 
 	 *
 	 * @param array $params An array of parameters.
 	 */
-	public function create( $params ) {
+	public function create($params) {
 		?>
 		<p>
-			<strong><?php esc_html_e( 'Are you publishing as an individual or as a company?', 'wordlift' ) ?></strong>
+			<strong><?php esc_html_e('Are you publishing as an individual or as a company?', 'wordlift') ?></strong>
 		</p>
 		<p id="wl-publisher-type">
 			<span>
@@ -144,30 +144,30 @@ 
 				       name="wl_publisher[type]" value="person"
 				       checked="checked">
 				<label for="wl-publisher-person"><?php
-					esc_html_e( 'Person', 'wordlift' ) ?></label>
+					esc_html_e('Person', 'wordlift') ?></label>
 			</span>
 			<span>
 				<input id="wl-publisher-company" type="radio"
 				       name="wl_publisher[type]" value="organization"">
 				<label for="wl-publisher-company"><?php
-					esc_html_e( 'Company', 'wordlift' ) ?></label>
+					esc_html_e('Company', 'wordlift') ?></label>
 			</span>
 		</p>
 		<p id="wl-publisher-name">
 			<input type="text" name="wl_publisher[name]"
-			       placeholder="<?php echo esc_attr__( "What's your name?", 'wordlift' ) ?>">
+			       placeholder="<?php echo esc_attr__("What's your name?", 'wordlift') ?>">
 		</p>
 		<div id="wl-publisher-logo">
 			<input type="hidden" id="wl-publisher-media-uploader-id"
 			       name="wl_publisher[thumbnail_id]" />
 			<p>
-				<b><?php esc_html_e( "Choose the publisher's Logo", 'wordlift' ) ?></b>
+				<b><?php esc_html_e("Choose the publisher's Logo", 'wordlift') ?></b>
 			</p>
 			<p>
 				<img id="wl-publisher-media-uploader-preview" />
 				<button type="button" class="button"
 				        id="wl-publisher-media-uploader"><?php
-					esc_html_e( 'Select an existing image or upload a new one', 'wordlift' ); ?></button>
+					esc_html_e('Select an existing image or upload a new one', 'wordlift'); ?></button>
 			</p>
 		</div>
 		<?php

src/includes/class-wordlift-content-filter-service.php

Indentation +228 added lines, -228 removed lines

@@ -18,236 +18,236 @@
  */
 class Wordlift_Content_Filter_Service {
 
-	/**
-	 * The pattern to find entities in text.
-	 *
-	 * @since 3.8.0
-	 */
-	const PATTERN = '/<(\\w+)[^<]*class="([^"]*)"\\sitemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
-
-	/**
-	 * 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;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.13.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The `link by default` setting.
-	 *
-	 * @since  3.13.0
-	 * @access private
-	 * @var bool True if link by default is enabled otherwise false.
-	 */
-	private $is_link_by_default;
-
-	/**
-	 * The {@link Wordlift_Content_Filter_Service} singleton instance.
-	 *
-	 * @since  3.14.2
-	 * @access private
-	 * @var \Wordlift_Content_Filter_Service $instance The {@link Wordlift_Content_Filter_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Content_Filter_Service} instance.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param \Wordlift_Entity_Service        $entity_service        The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $entity_service, $configuration_service ) {
-
-		$this->entity_service        = $entity_service;
-		$this->configuration_service = $configuration_service;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the {@link Wordlift_Content_Filter_Service} singleton instance.
-	 *
-	 * @since 3.14.2
-	 * @return \Wordlift_Content_Filter_Service The {@link Wordlift_Content_Filter_Service} singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Mangle the content by adding links to the entity pages. This function is
-	 * hooked to the 'the_content' WP's filter.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param string $content The content being filtered.
-	 *
-	 * @return string The filtered content.
-	 */
-	public function the_content( $content ) {
-
-		// Links should be added only on the front end and not for RSS.
-		if ( is_feed() ) {
-			return $content;
-		}
-
-		// Preload the `link by default` setting.
-		$this->is_link_by_default = $this->configuration_service->is_link_by_default();
-
-		// Replace each match of the entity tag with the entity link. If an error
-		// occurs fail silently returning the original content.
-		return preg_replace_callback( self::PATTERN, array(
-			$this,
-			'link',
-		), $content ) ?: $content;
-	}
-
-	/**
-	 * Get the entity match and replace it with a page link.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param array $matches An array of matches.
-	 *
-	 * @return string The replaced text with the link to the entity page.
-	 */
-	private function link( $matches ) {
-
-		// Get the entity itemid URI and label.
-		$css_class = $matches[2];
-		$uri       = $matches[3];
-		$label     = $matches[4];
-
-		// Get the entity post by URI.
-		$post = $this->entity_service->get_entity_post_by_uri( $uri );
-		if ( null === $post ) {
-
-			// If the entity post is not found return the label w/o the markup
-			// around it.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/461.
-			return $label;
-		}
-
-		$no_link = - 1 < strpos( $css_class, 'wl-no-link' );
-		$link    = - 1 < strpos( $css_class, 'wl-link' );
-
-		// Don't link if links are disabled and the entity is not link or the
-		// entity is do not link.
-		$dont_link = ( ! $this->is_link_by_default && ! $link ) || $no_link;
-
-		// Return the label if it's don't link.
-		if ( $dont_link ) {
-			return $label;
-		}
-
-		// Get the link.
-		$href = get_permalink( $post );
-
-		// Get an alternative title attribute.
-		$title_attribute = $this->get_title_attribute( $post->ID, $label );
-
-		// Return the link.
-		return "<a class='wl-entity-page-link' $title_attribute href='$href'>$label</a>";
-	}
-
-	/**
-	 * Get a `title` attribute with an alternative label for the link.
-	 *
-	 * If an alternative title isn't available an empty string is returned.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int    $post_id The {@link WP_Post}'s id.
-	 * @param string $label   The main link label.
-	 *
-	 * @return string A `title` attribute with an alternative label or an empty
-	 *                string if none available.
-	 */
-	private function get_title_attribute( $post_id, $label ) {
-
-		// Get an alternative title.
-		$title = $this->get_link_title( $post_id, $label );
-		if ( ! empty( $title ) ) {
-			return 'title="' . esc_attr( $title ) . '"';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Get a string to be used as a title attribute in links to a post
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int    $post_id      The post id of the post being linked.
-	 * @param string $ignore_label A label to ignore.
-	 *
-	 * @return string    The title to be used in the link. An empty string when
-	 *                    there is no alternative that is not the $ignore_label.
-	 */
-	function get_link_title( $post_id, $ignore_label ) {
-
-		// Get possible alternative labels we can select from.
-		$labels = $this->entity_service->get_alternative_labels( $post_id );
-
-		/*
+    /**
+     * The pattern to find entities in text.
+     *
+     * @since 3.8.0
+     */
+    const PATTERN = '/<(\\w+)[^<]*class="([^"]*)"\\sitemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
+
+    /**
+     * 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;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.13.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The `link by default` setting.
+     *
+     * @since  3.13.0
+     * @access private
+     * @var bool True if link by default is enabled otherwise false.
+     */
+    private $is_link_by_default;
+
+    /**
+     * The {@link Wordlift_Content_Filter_Service} singleton instance.
+     *
+     * @since  3.14.2
+     * @access private
+     * @var \Wordlift_Content_Filter_Service $instance The {@link Wordlift_Content_Filter_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Content_Filter_Service} instance.
+     *
+     * @since 3.8.0
+     *
+     * @param \Wordlift_Entity_Service        $entity_service        The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $entity_service, $configuration_service ) {
+
+        $this->entity_service        = $entity_service;
+        $this->configuration_service = $configuration_service;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the {@link Wordlift_Content_Filter_Service} singleton instance.
+     *
+     * @since 3.14.2
+     * @return \Wordlift_Content_Filter_Service The {@link Wordlift_Content_Filter_Service} singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Mangle the content by adding links to the entity pages. This function is
+     * hooked to the 'the_content' WP's filter.
+     *
+     * @since 3.8.0
+     *
+     * @param string $content The content being filtered.
+     *
+     * @return string The filtered content.
+     */
+    public function the_content( $content ) {
+
+        // Links should be added only on the front end and not for RSS.
+        if ( is_feed() ) {
+            return $content;
+        }
+
+        // Preload the `link by default` setting.
+        $this->is_link_by_default = $this->configuration_service->is_link_by_default();
+
+        // Replace each match of the entity tag with the entity link. If an error
+        // occurs fail silently returning the original content.
+        return preg_replace_callback( self::PATTERN, array(
+            $this,
+            'link',
+        ), $content ) ?: $content;
+    }
+
+    /**
+     * Get the entity match and replace it with a page link.
+     *
+     * @since 3.8.0
+     *
+     * @param array $matches An array of matches.
+     *
+     * @return string The replaced text with the link to the entity page.
+     */
+    private function link( $matches ) {
+
+        // Get the entity itemid URI and label.
+        $css_class = $matches[2];
+        $uri       = $matches[3];
+        $label     = $matches[4];
+
+        // Get the entity post by URI.
+        $post = $this->entity_service->get_entity_post_by_uri( $uri );
+        if ( null === $post ) {
+
+            // If the entity post is not found return the label w/o the markup
+            // around it.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/461.
+            return $label;
+        }
+
+        $no_link = - 1 < strpos( $css_class, 'wl-no-link' );
+        $link    = - 1 < strpos( $css_class, 'wl-link' );
+
+        // Don't link if links are disabled and the entity is not link or the
+        // entity is do not link.
+        $dont_link = ( ! $this->is_link_by_default && ! $link ) || $no_link;
+
+        // Return the label if it's don't link.
+        if ( $dont_link ) {
+            return $label;
+        }
+
+        // Get the link.
+        $href = get_permalink( $post );
+
+        // Get an alternative title attribute.
+        $title_attribute = $this->get_title_attribute( $post->ID, $label );
+
+        // Return the link.
+        return "<a class='wl-entity-page-link' $title_attribute href='$href'>$label</a>";
+    }
+
+    /**
+     * Get a `title` attribute with an alternative label for the link.
+     *
+     * If an alternative title isn't available an empty string is returned.
+     *
+     * @since 3.15.0
+     *
+     * @param int    $post_id The {@link WP_Post}'s id.
+     * @param string $label   The main link label.
+     *
+     * @return string A `title` attribute with an alternative label or an empty
+     *                string if none available.
+     */
+    private function get_title_attribute( $post_id, $label ) {
+
+        // Get an alternative title.
+        $title = $this->get_link_title( $post_id, $label );
+        if ( ! empty( $title ) ) {
+            return 'title="' . esc_attr( $title ) . '"';
+        }
+
+        return '';
+    }
+
+    /**
+     * Get a string to be used as a title attribute in links to a post
+     *
+     * @since 3.15.0
+     *
+     * @param int    $post_id      The post id of the post being linked.
+     * @param string $ignore_label A label to ignore.
+     *
+     * @return string    The title to be used in the link. An empty string when
+     *                    there is no alternative that is not the $ignore_label.
+     */
+    function get_link_title( $post_id, $ignore_label ) {
+
+        // Get possible alternative labels we can select from.
+        $labels = $this->entity_service->get_alternative_labels( $post_id );
+
+        /*
 		 * Since the original text might use an alternative label than the
 		 * Entity title, add the title itself which is not returned by the api.
 		 */
-		$labels[] = get_the_title( $post_id );
-
-		// Add some randomness to the label selection.
-		shuffle( $labels );
-
-		// Select the first label which is not to be ignored.
-		$title = '';
-		foreach ( $labels as $label ) {
-			if ( 0 !== strcasecmp( $label, $ignore_label ) ) {
-				$title = $label;
-				break;
-			}
-		}
-
-		return $title;
-	}
-
-	/**
-	 * Get the entity URIs (configured in the `itemid` attribute) contained in
-	 * the provided content.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param string $content The content.
-	 *
-	 * @return array An array of URIs.
-	 */
-	public function get_entity_uris( $content ) {
-
-		$matches = array();
-		preg_match_all( Wordlift_Content_Filter_Service::PATTERN, $content, $matches );
-
-		// We need to use `array_values` here in order to avoid further `json_encode`
-		// to turn it into an object (since if the 3rd match isn't found the index
-		// is not sequential.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/646.
-		return array_values( array_unique( $matches[3] ) );
-	}
+        $labels[] = get_the_title( $post_id );
+
+        // Add some randomness to the label selection.
+        shuffle( $labels );
+
+        // Select the first label which is not to be ignored.
+        $title = '';
+        foreach ( $labels as $label ) {
+            if ( 0 !== strcasecmp( $label, $ignore_label ) ) {
+                $title = $label;
+                break;
+            }
+        }
+
+        return $title;
+    }
+
+    /**
+     * Get the entity URIs (configured in the `itemid` attribute) contained in
+     * the provided content.
+     *
+     * @since 3.14.2
+     *
+     * @param string $content The content.
+     *
+     * @return array An array of URIs.
+     */
+    public function get_entity_uris( $content ) {
+
+        $matches = array();
+        preg_match_all( Wordlift_Content_Filter_Service::PATTERN, $content, $matches );
+
+        // We need to use `array_values` here in order to avoid further `json_encode`
+        // to turn it into an object (since if the 3rd match isn't found the index
+        // is not sequential.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/646.
+        return array_values( array_unique( $matches[3] ) );
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -69,7 +69,7 @@ 
 	 * @param \Wordlift_Entity_Service        $entity_service        The {@link Wordlift_Entity_Service} instance.
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $entity_service, $configuration_service ) {
+	public function __construct($entity_service, $configuration_service) {
 
 		$this->entity_service        = $entity_service;
 		$this->configuration_service = $configuration_service;
@@ -99,10 +99,10 @@ 
 	 *
 	 * @return string The filtered content.
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 
 		// Links should be added only on the front end and not for RSS.
-		if ( is_feed() ) {
+		if (is_feed()) {
 			return $content;
 		}
 
@@ -111,10 +111,10 @@ 
 
 		// Replace each match of the entity tag with the entity link. If an error
 		// occurs fail silently returning the original content.
-		return preg_replace_callback( self::PATTERN, array(
+		return preg_replace_callback(self::PATTERN, array(
 			$this,
 			'link',
-		), $content ) ?: $content;
+		), $content) ?: $content;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 *
 	 * @return string The replaced text with the link to the entity page.
 	 */
-	private function link( $matches ) {
+	private function link($matches) {
 
 		// Get the entity itemid URI and label.
 		$css_class = $matches[2];
@@ -134,8 +134,8 @@ 
 		$label     = $matches[4];
 
 		// Get the entity post by URI.
-		$post = $this->entity_service->get_entity_post_by_uri( $uri );
-		if ( null === $post ) {
+		$post = $this->entity_service->get_entity_post_by_uri($uri);
+		if (null === $post) {
 
 			// If the entity post is not found return the label w/o the markup
 			// around it.
@@ -144,23 +144,23 @@ 
 			return $label;
 		}
 
-		$no_link = - 1 < strpos( $css_class, 'wl-no-link' );
-		$link    = - 1 < strpos( $css_class, 'wl-link' );
+		$no_link = - 1 < strpos($css_class, 'wl-no-link');
+		$link    = - 1 < strpos($css_class, 'wl-link');
 
 		// Don't link if links are disabled and the entity is not link or the
 		// entity is do not link.
-		$dont_link = ( ! $this->is_link_by_default && ! $link ) || $no_link;
+		$dont_link = ( ! $this->is_link_by_default && ! $link) || $no_link;
 
 		// Return the label if it's don't link.
-		if ( $dont_link ) {
+		if ($dont_link) {
 			return $label;
 		}
 
 		// Get the link.
-		$href = get_permalink( $post );
+		$href = get_permalink($post);
 
 		// Get an alternative title attribute.
-		$title_attribute = $this->get_title_attribute( $post->ID, $label );
+		$title_attribute = $this->get_title_attribute($post->ID, $label);
 
 		// Return the link.
 		return "<a class='wl-entity-page-link' $title_attribute href='$href'>$label</a>";
@@ -179,12 +179,12 @@ 
 	 * @return string A `title` attribute with an alternative label or an empty
 	 *                string if none available.
 	 */
-	private function get_title_attribute( $post_id, $label ) {
+	private function get_title_attribute($post_id, $label) {
 
 		// Get an alternative title.
-		$title = $this->get_link_title( $post_id, $label );
-		if ( ! empty( $title ) ) {
-			return 'title="' . esc_attr( $title ) . '"';
+		$title = $this->get_link_title($post_id, $label);
+		if ( ! empty($title)) {
+			return 'title="'.esc_attr($title).'"';
 		}
 
 		return '';
@@ -201,24 +201,24 @@ 
 	 * @return string    The title to be used in the link. An empty string when
 	 *                    there is no alternative that is not the $ignore_label.
 	 */
-	function get_link_title( $post_id, $ignore_label ) {
+	function get_link_title($post_id, $ignore_label) {
 
 		// Get possible alternative labels we can select from.
-		$labels = $this->entity_service->get_alternative_labels( $post_id );
+		$labels = $this->entity_service->get_alternative_labels($post_id);
 
 		/*
 		 * Since the original text might use an alternative label than the
 		 * Entity title, add the title itself which is not returned by the api.
 		 */
-		$labels[] = get_the_title( $post_id );
+		$labels[] = get_the_title($post_id);
 
 		// Add some randomness to the label selection.
-		shuffle( $labels );
+		shuffle($labels);
 
 		// Select the first label which is not to be ignored.
 		$title = '';
-		foreach ( $labels as $label ) {
-			if ( 0 !== strcasecmp( $label, $ignore_label ) ) {
+		foreach ($labels as $label) {
+			if (0 !== strcasecmp($label, $ignore_label)) {
 				$title = $label;
 				break;
 			}
@@ -237,17 +237,17 @@ 
 	 *
 	 * @return array An array of URIs.
 	 */
-	public function get_entity_uris( $content ) {
+	public function get_entity_uris($content) {
 
 		$matches = array();
-		preg_match_all( Wordlift_Content_Filter_Service::PATTERN, $content, $matches );
+		preg_match_all(Wordlift_Content_Filter_Service::PATTERN, $content, $matches);
 
 		// We need to use `array_values` here in order to avoid further `json_encode`
 		// to turn it into an object (since if the 3rd match isn't found the index
 		// is not sequential.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/646.
-		return array_values( array_unique( $matches[3] ) );
+		return array_values(array_unique($matches[3]));
 	}
 
 }

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

Indentation +153 added lines, -153 removed lines

@@ -13,158 +13,158 @@
  */
 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.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @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.
-	 */
-	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.
-	 *
-	 * @since 3.15.1
-	 *
-	 * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
-	 */
-	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.
-		wp_send_json( $this->get_jsonld( $is_homepage, $post_id ) );
-
-	}
-
-	/**
-	 * Get the JSON-LD.
-	 *
-	 * @since 3.15.1
-	 *
-	 * @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.
-	 *
-	 * @return array A JSON-LD structure.
-	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null ) {
-
-		// 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 ) ) {
-				// 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();
-
-		// 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 ) ),
-			// Convert each URI in the references array to JSON-LD. We don't output
-			// entities already output above (hence the array_diff).
-			array_map( function ( $item ) use ( $entity_to_jsonld_converter, $references ) {
-
-				// "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.
-				return $entity_to_jsonld_converter->convert( $item, $references );
-			}, $references ) );
-
-		// Finally send the JSON-LD.
-		return $jsonld;
-	}
+    /**
+     * 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.
+     *
+     * @since 3.8.0
+     *
+     * @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.
+     */
+    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.
+     *
+     * @since 3.15.1
+     *
+     * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
+     */
+    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.
+        wp_send_json( $this->get_jsonld( $is_homepage, $post_id ) );
+
+    }
+
+    /**
+     * Get the JSON-LD.
+     *
+     * @since 3.15.1
+     *
+     * @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.
+     *
+     * @return array A JSON-LD structure.
+     */
+    public function get_jsonld( $is_homepage = false, $post_id = null ) {
+
+        // 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 ) ) {
+                // 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();
+
+        // 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 ) ),
+            // Convert each URI in the references array to JSON-LD. We don't output
+            // entities already output above (hence the array_diff).
+            array_map( function ( $item ) use ( $entity_to_jsonld_converter, $references ) {
+
+                // "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.
+                return $entity_to_jsonld_converter->convert( $item, $references );
+            }, $references ) );
+
+        // Finally send the JSON-LD.
+        return $jsonld;
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -59,7 +59,7 @@ 
 	 * @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.
 	 */
-	public function __construct( $entity_service, $converter, $website_converter ) {
+	public function __construct($entity_service, $converter, $website_converter) {
 
 		$this->entity_service    = $entity_service;
 		$this->converter         = $converter;
@@ -94,11 +94,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.
-		wp_send_json( $this->get_jsonld( $is_homepage, $post_id ) );
+		wp_send_json($this->get_jsonld($is_homepage, $post_id));
 
 	}
 
@@ -112,7 +112,7 @@ 
 	 *
 	 * @return array A JSON-LD structure.
 	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null ) {
+	public function get_jsonld($is_homepage = false, $post_id = null) {
 
 		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
 		// e-mails with a low apdex score.
@@ -121,14 +121,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)) {
 				// Set a reference to the website_converter.
 				$website_converter = $this->website_converter;
 
@@ -138,7 +138,7 @@ 
 		}
 
 		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return array();
 		}
 
@@ -152,16 +152,16 @@ 
 		// 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 ) ),
+			array($entity_to_jsonld_converter->convert($post_id, $references)),
 			// Convert each URI in the references array to JSON-LD. We don't output
 			// entities already output above (hence the array_diff).
-			array_map( function ( $item ) use ( $entity_to_jsonld_converter, $references ) {
+			array_map(function($item) use ($entity_to_jsonld_converter, $references) {
 
 				// "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.
-				return $entity_to_jsonld_converter->convert( $item, $references );
-			}, $references ) );
+				return $entity_to_jsonld_converter->convert($item, $references);
+			}, $references) );
 
 		// Finally send the JSON-LD.
 		return $jsonld;