insideout10 / wordlift-plugin

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

Indentation +75 added lines, -75 removed lines

@@ -9,80 +9,80 @@
 
 class Relation_Service extends Abstract_Relation_Service {
 
-	/**
-	 * @var Relation_Service_Interface[]
-	 */
-	private $delegates = array();
-
-	protected function __construct() {
-
-	}
-
-	private static $instance = null;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @return Relation_Service_Interface
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-
-			self::$instance->register_delegate( Relation_Instances_Relation_Service::get_instance() );
-			self::$instance->register_delegate( Post_Terms_Relation_Service::get_instance() );
-			self::$instance->register_delegate( Post_Content_Relation_Service::get_instance() );
-		}
-
-		return self::$instance;
-	}
-
-	public function register_delegate( $delegate ) {
-		Assertions::is_a( $delegate, 'Wordlift\Relation\Relation_Service_Interface', 'A `delegate` must implement the `Wordlift\Relation\Relation_Service_Interface` interface.' );
-
-		$this->delegates[] = $delegate;
-	}
-
-	public function add_relations( $content_id, $relations ) {
-		Assertions::is_set( $relations, '`$relations` should be set to a `Relations` instance.' );
-
-		foreach ( $this->delegates as $delegate ) {
-			$delegate->add_relations( $content_id, $relations );
-		}
-	}
-
-	/**
-	 * This helper method is used to create relations from entity_uris.
-	 * Its only purpose as of now is to process the entity_uris emitted
-	 * from disambiguation widget.
-	 *
-	 * @param $subject Wordpress_Content_Id
-	 * @param $uris
-	 *
-	 * @return array<Relation>
-	 */
-	public static function get_relations_from_uris( $subject, $uris ) {
-
-		$entity_service = \Wordlift_Entity_Service::get_instance();
-
-		return array_filter(
-			array_map(
-				function ( $uri ) use ( $entity_service, $subject ) {
-					/**
-					 * @var $content Content|null
-					 */
-					$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
-					$bag     = $content->get_bag();
-					if ( $bag instanceof \WP_Post || $bag instanceof \WP_Term ) {
-						$predicate = $bag instanceof \WP_Term ? WL_WHAT_RELATION : $entity_service->get_classification_scope_for( $content->get_id() );
-						return new Relation( $subject, new Wordpress_Content_Id( $content->get_id(), $content->get_object_type_enum() ), $predicate );
-					}
-					return false;
-				},
-				$uris
-			)
-		);
-
-	}
+    /**
+     * @var Relation_Service_Interface[]
+     */
+    private $delegates = array();
+
+    protected function __construct() {
+
+    }
+
+    private static $instance = null;
+
+    /**
+     * The singleton instance.
+     *
+     * @return Relation_Service_Interface
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+
+            self::$instance->register_delegate( Relation_Instances_Relation_Service::get_instance() );
+            self::$instance->register_delegate( Post_Terms_Relation_Service::get_instance() );
+            self::$instance->register_delegate( Post_Content_Relation_Service::get_instance() );
+        }
+
+        return self::$instance;
+    }
+
+    public function register_delegate( $delegate ) {
+        Assertions::is_a( $delegate, 'Wordlift\Relation\Relation_Service_Interface', 'A `delegate` must implement the `Wordlift\Relation\Relation_Service_Interface` interface.' );
+
+        $this->delegates[] = $delegate;
+    }
+
+    public function add_relations( $content_id, $relations ) {
+        Assertions::is_set( $relations, '`$relations` should be set to a `Relations` instance.' );
+
+        foreach ( $this->delegates as $delegate ) {
+            $delegate->add_relations( $content_id, $relations );
+        }
+    }
+
+    /**
+     * This helper method is used to create relations from entity_uris.
+     * Its only purpose as of now is to process the entity_uris emitted
+     * from disambiguation widget.
+     *
+     * @param $subject Wordpress_Content_Id
+     * @param $uris
+     *
+     * @return array<Relation>
+     */
+    public static function get_relations_from_uris( $subject, $uris ) {
+
+        $entity_service = \Wordlift_Entity_Service::get_instance();
+
+        return array_filter(
+            array_map(
+                function ( $uri ) use ( $entity_service, $subject ) {
+                    /**
+                     * @var $content Content|null
+                     */
+                    $content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
+                    $bag     = $content->get_bag();
+                    if ( $bag instanceof \WP_Post || $bag instanceof \WP_Term ) {
+                        $predicate = $bag instanceof \WP_Term ? WL_WHAT_RELATION : $entity_service->get_classification_scope_for( $content->get_id() );
+                        return new Relation( $subject, new Wordpress_Content_Id( $content->get_id(), $content->get_object_type_enum() ), $predicate );
+                    }
+                    return false;
+                },
+                $uris
+            )
+        );
+
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -26,28 +26,28 @@ 
 	 * @return Relation_Service_Interface
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 
-			self::$instance->register_delegate( Relation_Instances_Relation_Service::get_instance() );
-			self::$instance->register_delegate( Post_Terms_Relation_Service::get_instance() );
-			self::$instance->register_delegate( Post_Content_Relation_Service::get_instance() );
+			self::$instance->register_delegate(Relation_Instances_Relation_Service::get_instance());
+			self::$instance->register_delegate(Post_Terms_Relation_Service::get_instance());
+			self::$instance->register_delegate(Post_Content_Relation_Service::get_instance());
 		}
 
 		return self::$instance;
 	}
 
-	public function register_delegate( $delegate ) {
-		Assertions::is_a( $delegate, 'Wordlift\Relation\Relation_Service_Interface', 'A `delegate` must implement the `Wordlift\Relation\Relation_Service_Interface` interface.' );
+	public function register_delegate($delegate) {
+		Assertions::is_a($delegate, 'Wordlift\Relation\Relation_Service_Interface', 'A `delegate` must implement the `Wordlift\Relation\Relation_Service_Interface` interface.');
 
 		$this->delegates[] = $delegate;
 	}
 
-	public function add_relations( $content_id, $relations ) {
-		Assertions::is_set( $relations, '`$relations` should be set to a `Relations` instance.' );
+	public function add_relations($content_id, $relations) {
+		Assertions::is_set($relations, '`$relations` should be set to a `Relations` instance.');
 
-		foreach ( $this->delegates as $delegate ) {
-			$delegate->add_relations( $content_id, $relations );
+		foreach ($this->delegates as $delegate) {
+			$delegate->add_relations($content_id, $relations);
 		}
 	}
 
@@ -61,21 +61,21 @@ 
 	 *
 	 * @return array<Relation>
 	 */
-	public static function get_relations_from_uris( $subject, $uris ) {
+	public static function get_relations_from_uris($subject, $uris) {
 
 		$entity_service = \Wordlift_Entity_Service::get_instance();
 
 		return array_filter(
 			array_map(
-				function ( $uri ) use ( $entity_service, $subject ) {
+				function($uri) use ($entity_service, $subject) {
 					/**
 					 * @var $content Content|null
 					 */
-					$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
+					$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as($uri);
 					$bag     = $content->get_bag();
-					if ( $bag instanceof \WP_Post || $bag instanceof \WP_Term ) {
-						$predicate = $bag instanceof \WP_Term ? WL_WHAT_RELATION : $entity_service->get_classification_scope_for( $content->get_id() );
-						return new Relation( $subject, new Wordpress_Content_Id( $content->get_id(), $content->get_object_type_enum() ), $predicate );
+					if ($bag instanceof \WP_Post || $bag instanceof \WP_Term) {
+						$predicate = $bag instanceof \WP_Term ? WL_WHAT_RELATION : $entity_service->get_classification_scope_for($content->get_id());
+						return new Relation($subject, new Wordpress_Content_Id($content->get_id(), $content->get_object_type_enum()), $predicate);
 					}
 					return false;
 				},

src/wordlift/relation/class-relation.php

Indentation +138 added lines, -138 removed lines

@@ -16,142 +16,142 @@
 use Wordlift\Content\Wordpress\Wordpress_Content_Id;
 
 class Relation implements Hashable_Interface, JsonSerializable {
-	/**
-	 * @var Wordpress_Content_Id
-	 */
-	private $subject;
-
-	/**
-	 * @var string
-	 */
-	private $predicate;
-
-	/**
-	 * @param Wordpress_Content_Id $subject
-	 * @param Wordpress_Content_Id $object
-	 * @param string               $predicate
-	 */
-	public function __construct( $subject, $object, $predicate ) {
-		$this->subject   = $subject;
-		$this->predicate = $predicate;
-		$this->object    = $object;
-	}
-
-	/**
-	 * @var Wordpress_Content_Id
-	 */
-	private $object;
-
-	public static function from_json( $item ) {
-		$subject   = Wordpress_Content_Id::from_json( $item['subject'] );
-		$object    = Wordpress_Content_Id::from_json( $item['object'] );
-		$predicate = $item['predicate'];
-
-		return new self( $subject, $object, $predicate );
-	}
-
-	/**
-	 * @return Wordpress_Content_Id
-	 */
-	public function get_subject() {
-		return $this->subject;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_predicate() {
-		return $this->predicate;
-	}
-
-	/**
-	 * @return Wordpress_Content_Id
-	 */
-	public function get_object() {
-		return $this->object;
-	}
-
-	public function hash() {
-		// Define the hash algorithm for your object
-		// Here's an example using the md5 hash function
-		return md5(
-		// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
-			serialize(
-				array(
-					$this->get_subject(),
-					$this->get_predicate(),
-					$this->get_object(),
-				)
-			)
-		);
-	}
-
-	public function equals( Hashable_Interface $obj ) {
-		return $this->hash() === $obj->hash();
-	}
-
-	/**
-	 * @return string
-	 * @deprecated used for legacy compatibilty
-	 */
-	public function get_relation_type() {
-		return $this->predicate;
-	}
-
-	/**
-	 * @return int
-	 * @deprecated used for legacy compatibility
-	 */
-	public function get_object_id() {
-		return $this->object->get_id();
-	}
-
-	/**
-	 * Subject type.
-	 *
-	 * @deprecated used for legacy compatibility
-	 */
-	public function get_subject_type() {
-		return $this->subject->get_type();
-	}
-
-	/**
-	 * Object type.
-	 *
-	 * @deprecated used for legacy compatibility
-	 */
-	public function get_object_type() {
-		return $this->object->get_type();
-	}
-
-	public static function from_relation_instances( $instance ) {
-		Assertions::is_set( $instance->subject_id );
-		Assertions::is_set( $instance->subject_type );
-		Assertions::is_set( $instance->predicate );
-		Assertions::is_set( $instance->object_id );
-		Assertions::is_set( $instance->object_type );
-
-		return new self(
-		// Subject.
-			new Wordpress_Content_Id(
-				$instance->subject_id,
-				$instance->subject_type
-			),
-			// Object.
-			new Wordpress_Content_Id(
-				$instance->object_id,
-				$instance->object_type
-			),
-			// Predicate.
-			$instance->predicate
-		);
-	}
-
-	public function jsonSerialize() {
-		return array(
-			'subject'   => $this->get_subject(),
-			'object'    => $this->get_object(),
-			'predicate' => $this->get_predicate(),
-		);
-	}
+    /**
+     * @var Wordpress_Content_Id
+     */
+    private $subject;
+
+    /**
+     * @var string
+     */
+    private $predicate;
+
+    /**
+     * @param Wordpress_Content_Id $subject
+     * @param Wordpress_Content_Id $object
+     * @param string               $predicate
+     */
+    public function __construct( $subject, $object, $predicate ) {
+        $this->subject   = $subject;
+        $this->predicate = $predicate;
+        $this->object    = $object;
+    }
+
+    /**
+     * @var Wordpress_Content_Id
+     */
+    private $object;
+
+    public static function from_json( $item ) {
+        $subject   = Wordpress_Content_Id::from_json( $item['subject'] );
+        $object    = Wordpress_Content_Id::from_json( $item['object'] );
+        $predicate = $item['predicate'];
+
+        return new self( $subject, $object, $predicate );
+    }
+
+    /**
+     * @return Wordpress_Content_Id
+     */
+    public function get_subject() {
+        return $this->subject;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_predicate() {
+        return $this->predicate;
+    }
+
+    /**
+     * @return Wordpress_Content_Id
+     */
+    public function get_object() {
+        return $this->object;
+    }
+
+    public function hash() {
+        // Define the hash algorithm for your object
+        // Here's an example using the md5 hash function
+        return md5(
+        // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
+            serialize(
+                array(
+                    $this->get_subject(),
+                    $this->get_predicate(),
+                    $this->get_object(),
+                )
+            )
+        );
+    }
+
+    public function equals( Hashable_Interface $obj ) {
+        return $this->hash() === $obj->hash();
+    }
+
+    /**
+     * @return string
+     * @deprecated used for legacy compatibilty
+     */
+    public function get_relation_type() {
+        return $this->predicate;
+    }
+
+    /**
+     * @return int
+     * @deprecated used for legacy compatibility
+     */
+    public function get_object_id() {
+        return $this->object->get_id();
+    }
+
+    /**
+     * Subject type.
+     *
+     * @deprecated used for legacy compatibility
+     */
+    public function get_subject_type() {
+        return $this->subject->get_type();
+    }
+
+    /**
+     * Object type.
+     *
+     * @deprecated used for legacy compatibility
+     */
+    public function get_object_type() {
+        return $this->object->get_type();
+    }
+
+    public static function from_relation_instances( $instance ) {
+        Assertions::is_set( $instance->subject_id );
+        Assertions::is_set( $instance->subject_type );
+        Assertions::is_set( $instance->predicate );
+        Assertions::is_set( $instance->object_id );
+        Assertions::is_set( $instance->object_type );
+
+        return new self(
+        // Subject.
+            new Wordpress_Content_Id(
+                $instance->subject_id,
+                $instance->subject_type
+            ),
+            // Object.
+            new Wordpress_Content_Id(
+                $instance->object_id,
+                $instance->object_type
+            ),
+            // Predicate.
+            $instance->predicate
+        );
+    }
+
+    public function jsonSerialize() {
+        return array(
+            'subject'   => $this->get_subject(),
+            'object'    => $this->get_object(),
+            'predicate' => $this->get_predicate(),
+        );
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param Wordpress_Content_Id $object
 	 * @param string               $predicate
 	 */
-	public function __construct( $subject, $object, $predicate ) {
+	public function __construct($subject, $object, $predicate) {
 		$this->subject   = $subject;
 		$this->predicate = $predicate;
 		$this->object    = $object;
@@ -42,12 +42,12 @@ 
 	 */
 	private $object;
 
-	public static function from_json( $item ) {
-		$subject   = Wordpress_Content_Id::from_json( $item['subject'] );
-		$object    = Wordpress_Content_Id::from_json( $item['object'] );
+	public static function from_json($item) {
+		$subject   = Wordpress_Content_Id::from_json($item['subject']);
+		$object    = Wordpress_Content_Id::from_json($item['object']);
 		$predicate = $item['predicate'];
 
-		return new self( $subject, $object, $predicate );
+		return new self($subject, $object, $predicate);
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 		);
 	}
 
-	public function equals( Hashable_Interface $obj ) {
+	public function equals(Hashable_Interface $obj) {
 		return $this->hash() === $obj->hash();
 	}
 
@@ -124,12 +124,12 @@ 
 		return $this->object->get_type();
 	}
 
-	public static function from_relation_instances( $instance ) {
-		Assertions::is_set( $instance->subject_id );
-		Assertions::is_set( $instance->subject_type );
-		Assertions::is_set( $instance->predicate );
-		Assertions::is_set( $instance->object_id );
-		Assertions::is_set( $instance->object_type );
+	public static function from_relation_instances($instance) {
+		Assertions::is_set($instance->subject_id);
+		Assertions::is_set($instance->subject_type);
+		Assertions::is_set($instance->predicate);
+		Assertions::is_set($instance->object_id);
+		Assertions::is_set($instance->object_type);
 
 		return new self(
 		// Subject.

src/install/class-wordlift-install-3-32-0.php

Indentation +41 added lines, -41 removed lines

@@ -6,49 +6,49 @@
  */
 class Wordlift_Install_3_32_0 extends Wordlift_Install {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected static $version = '3.32.0';
-
-	public static function is_column_exists( $column_name ) {
-		global $wpdb;
-
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name ='{$wpdb->prefix}wl_relation_instances' AND column_name = %s",
-				$column_name
-			)
-		);
-
-	}
-
-	public function install() {
-		global $wpdb;
-		// Allocate only 8 bytes, represent 2 ^ 8 values in signed form ( -128 to 127 )
-		// we default to 0 here, because we are going to represent Object_Type_Enum in
-		// this field
-		// const POST = 0;
-		// const TERM = 1;
-		// const HOMEPAGE = 2;
-		// const USER = 3;
-		// we add 0 as default since we want to add compat between old and new values.
-
-		if ( ! self::is_column_exists( 'object_type' ) ) {
-			// Add object_type column
-			$wpdb->query(
-				"ALTER TABLE {$wpdb->prefix}wl_relation_instances
+    /**
+     * {@inheritdoc}
+     */
+    protected static $version = '3.32.0';
+
+    public static function is_column_exists( $column_name ) {
+        global $wpdb;
+
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name ='{$wpdb->prefix}wl_relation_instances' AND column_name = %s",
+                $column_name
+            )
+        );
+
+    }
+
+    public function install() {
+        global $wpdb;
+        // Allocate only 8 bytes, represent 2 ^ 8 values in signed form ( -128 to 127 )
+        // we default to 0 here, because we are going to represent Object_Type_Enum in
+        // this field
+        // const POST = 0;
+        // const TERM = 1;
+        // const HOMEPAGE = 2;
+        // const USER = 3;
+        // we add 0 as default since we want to add compat between old and new values.
+
+        if ( ! self::is_column_exists( 'object_type' ) ) {
+            // Add object_type column
+            $wpdb->query(
+                "ALTER TABLE {$wpdb->prefix}wl_relation_instances
 					ADD object_type TINYINT DEFAULT 0;"
-			);
-		}
+            );
+        }
 
-		if ( ! self::is_column_exists( 'subject_type' ) ) {
-			// Add subject_type column.
-			$wpdb->query(
-				"ALTER TABLE {$wpdb->prefix}wl_relation_instances
+        if ( ! self::is_column_exists( 'subject_type' ) ) {
+            // Add subject_type column.
+            $wpdb->query(
+                "ALTER TABLE {$wpdb->prefix}wl_relation_instances
 					ADD subject_type TINYINT DEFAULT 0;"
-			);
-		}
-	}
+            );
+        }
+    }
 
 }

src/modules/linked_data/wordlift-linked-data.php

Indentation +462 added lines, -462 removed lines

@@ -23,61 +23,61 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
-
-	$log->trace( "Saving post $post_id to Linked Data..." );
-
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
-
-		return;
-	}
-
-	// Get the post type and check whether it supports the editor.
-	//
-	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
-	/**
-	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
-
-	$is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id );
-	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported
-		 && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
-
-		return;
-	}
-
-	/**
-	 * Only process valid post types
-	 *
-	 * @since 3.25.6
-	 */
-	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
-
-	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types, true ) && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
-
-		return;
-	}
-
-	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
-
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
-
-	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+
+    $log->trace( "Saving post $post_id to Linked Data..." );
+
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        $log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+
+        return;
+    }
+
+    // Get the post type and check whether it supports the editor.
+    //
+    // @see https://github.com/insideout10/wordlift-plugin/issues/659.
+    $post_type = get_post_type( $post_id );
+    /**
+     * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     */
+    $is_editor_supported = wl_post_type_supports_editor( $post_type );
+
+    $is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id );
+    // Bail out if it's not an entity.
+    if ( ! $is_editor_supported
+         && ! $is_no_editor_analysis_enabled ) {
+        $log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+
+        return;
+    }
+
+    /**
+     * Only process valid post types
+     *
+     * @since 3.25.6
+     */
+    $supported_types = Wordlift_Entity_Service::valid_entity_post_types();
+
+    // Bail out if it's not a valid entity.
+    if ( ! in_array( $post_type, $supported_types, true ) && ! $is_no_editor_analysis_enabled ) {
+        $log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+
+        return;
+    }
+
+    // Unhook this function so it doesn't loop infinitely.
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
+
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
+
+    // Re-hook this function.
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -93,204 +93,204 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
-
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
-
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
-
-		return;
-	}
-
-	// get the current post.
-	$post = get_post( $post_id );
-
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
-
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
-
-	// Get the entity service instance.
-	$entity_service  = Wordlift_Entity_Service::get_instance();
-	$uri_service     = Wordlift_Entity_Uri_Service::get_instance();
-	$content_service = Wordpress_Content_Service::get_instance();
-
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
-
-	// Save all the selected internal entity uris to this variable.
-	$internal_entity_uris = array();
-
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$data              = filter_var_array( $_POST, array( 'wl_entities' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$entities_via_post = $data['wl_entities'];
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( wp_json_encode( $entities_via_post ) );
-		wl_write_log( ']' );
-
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
-
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) ) {
-				$existing_entity = get_page_by_title( $entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types() );
-				if ( isset( $existing_entity ) ) {
-					$existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get( $existing_entity->ID );
-					// Type doesn't match, continue to create a new entity.
-					if ( ! isset( $existing_entity_type ) || $existing_entity_type['css_class'] !== $entity['main_type'] ) {
-						$existing_entity = null;
-					}
-				}
-			} else {
-				// Look if current entity uri matches an internal existing entity, meaning:
-				// 1. when $entity_uri is an internal uri
-				// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-				$existing_entity = $entity_service->get_entity_post_by_uri( $entity_uri );
-			}
-
-			// Don't save the entities which are not found, but also local.
-			if ( ! isset( $existing_entity ) && $uri_service->is_internal( $entity_uri ) ) {
-				$internal_entity_uris[] = $entity_uri;
-				continue;
-			}
-
-			if ( ! isset( $existing_entity ) ) {
-				// Update entity data with related post
-				$entity['related_post_id'] = $post_id;
-				// New entity, save it.
-				$existing_entity = wl_save_entity( $entity );
-			} else {
-				// Existing entity, update post status.
-				if ( $existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-					$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
-						? $post->post_status : 'draft';
-					wl_update_post_status( $existing_entity->ID, $post_status );
-				}
-			}
-
-			$uri = $content_service->get_entity_id( Wordpress_Content_Id::create_post( $existing_entity->ID ) );
-
-			$internal_entity_uris[] = $uri;
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
-
-		}
-	}
-
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
-
-	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
-		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
-				continue;
-			}
-
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-		}
-
-		// Update the post content.
-		/**
-		 * Note: wp_update_post do stripslashes before saving the
-		 * content, so add the slashes to prevent back slash getting
-		 * removed.
-		 */
-		wp_update_post(
-			array(
-				'ID'           => $post->ID,
-				'post_content' => addslashes( $updated_post_content ),
-			)
-		);
-	}
-
-	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
-
-	$content_id = Wordpress_Content_Id::create_post( $post->ID );
-	$relations  = Relation_Service::get_instance()->get_relations( $content_id );
-
-	if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
-		$relations->add( ...Relation_Service::get_relations_from_uris( $content_id, $internal_entity_uris ) );
-	}
-	/**
-	 * Filter the relations, we dont want to create a relation
-	 * to uncategorized term, we are already filtering this on jsonld,
-	 *
-	 * @todo: do i need to move this to post-term-relation-service ?
-	 */
-	$filtered_relations = array_filter(
-		$relations->toArray(),
-		function ( $item ) {
-			/**
-			 * @var $item Relation
-			 */
-			$object = $item->get_object();
-
-			return ! ( $object->get_type() === Object_Type_Enum::TERM
-			&& $object->get_id() === 1 );
-		}
-	);
-
-	// Save relation instances
-	/** @var Relation $relation */
-	foreach ( $filtered_relations  as $relation ) {
-		$subject = $relation->get_subject();
-		$object  = $relation->get_object();
-
-		wl_core_add_relation_instance(
-		// subject id.
-			$subject->get_id(),
-			// what, where, when, who
-			$relation->get_predicate(),
-			// object id.
-			$object->get_id(),
-			// Subject type.
-			$subject->get_type(),
-			// Object type.
-			$object->get_type()
-		);
-
-	}
-
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ? filter_input_array( INPUT_POST, array( 'wl_metadata' => FILTER_DEFAULT ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC,
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			if ( empty( $uri ) ) {
-				continue;
-			}
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( Wordlift_Schema_Service::FIELD_TOPIC === $field ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+
+    $log->trace( "Saving $post_id to Linked Data along with related entities..." );
+
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        $log->trace( 'Doing autosave, skipping...' );
+
+        return;
+    }
+
+    // get the current post.
+    $post = get_post( $post_id );
+
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+
+    // Get the entity service instance.
+    $entity_service  = Wordlift_Entity_Service::get_instance();
+    $uri_service     = Wordlift_Entity_Uri_Service::get_instance();
+    $content_service = Wordpress_Content_Service::get_instance();
+
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
+
+    // Save all the selected internal entity uris to this variable.
+    $internal_entity_uris = array();
+
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $data              = filter_var_array( $_POST, array( 'wl_entities' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $entities_via_post = $data['wl_entities'];
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( wp_json_encode( $entities_via_post ) );
+        wl_write_log( ']' );
+
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
+
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) ) {
+                $existing_entity = get_page_by_title( $entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types() );
+                if ( isset( $existing_entity ) ) {
+                    $existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get( $existing_entity->ID );
+                    // Type doesn't match, continue to create a new entity.
+                    if ( ! isset( $existing_entity_type ) || $existing_entity_type['css_class'] !== $entity['main_type'] ) {
+                        $existing_entity = null;
+                    }
+                }
+            } else {
+                // Look if current entity uri matches an internal existing entity, meaning:
+                // 1. when $entity_uri is an internal uri
+                // 2. when $entity_uri is an external uri used as sameAs of an internal entity
+                $existing_entity = $entity_service->get_entity_post_by_uri( $entity_uri );
+            }
+
+            // Don't save the entities which are not found, but also local.
+            if ( ! isset( $existing_entity ) && $uri_service->is_internal( $entity_uri ) ) {
+                $internal_entity_uris[] = $entity_uri;
+                continue;
+            }
+
+            if ( ! isset( $existing_entity ) ) {
+                // Update entity data with related post
+                $entity['related_post_id'] = $post_id;
+                // New entity, save it.
+                $existing_entity = wl_save_entity( $entity );
+            } else {
+                // Existing entity, update post status.
+                if ( $existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+                    $post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
+                        ? $post->post_status : 'draft';
+                    wl_update_post_status( $existing_entity->ID, $post_status );
+                }
+            }
+
+            $uri = $content_service->get_entity_id( Wordpress_Content_Id::create_post( $existing_entity->ID ) );
+
+            $internal_entity_uris[] = $uri;
+            wl_write_log( "Map $entity_uri on $uri" );
+            $entities_uri_mapping[ $entity_uri ] = $uri;
+
+        }
+    }
+
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+
+    // Update the post content if we found mappings of new entities.
+    if ( ! empty( $entities_uri_mapping ) ) {
+        // Save each entity and store the post id.
+        foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+            if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+                continue;
+            }
+
+            $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+        }
+
+        // Update the post content.
+        /**
+         * Note: wp_update_post do stripslashes before saving the
+         * content, so add the slashes to prevent back slash getting
+         * removed.
+         */
+        wp_update_post(
+            array(
+                'ID'           => $post->ID,
+                'post_content' => addslashes( $updated_post_content ),
+            )
+        );
+    }
+
+    // Reset previously saved instances.
+    wl_core_delete_relation_instances( $post_id );
+
+    $content_id = Wordpress_Content_Id::create_post( $post->ID );
+    $relations  = Relation_Service::get_instance()->get_relations( $content_id );
+
+    if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
+        $relations->add( ...Relation_Service::get_relations_from_uris( $content_id, $internal_entity_uris ) );
+    }
+    /**
+     * Filter the relations, we dont want to create a relation
+     * to uncategorized term, we are already filtering this on jsonld,
+     *
+     * @todo: do i need to move this to post-term-relation-service ?
+     */
+    $filtered_relations = array_filter(
+        $relations->toArray(),
+        function ( $item ) {
+            /**
+             * @var $item Relation
+             */
+            $object = $item->get_object();
+
+            return ! ( $object->get_type() === Object_Type_Enum::TERM
+            && $object->get_id() === 1 );
+        }
+    );
+
+    // Save relation instances
+    /** @var Relation $relation */
+    foreach ( $filtered_relations  as $relation ) {
+        $subject = $relation->get_subject();
+        $object  = $relation->get_object();
+
+        wl_core_add_relation_instance(
+        // subject id.
+            $subject->get_id(),
+            // what, where, when, who
+            $relation->get_predicate(),
+            // object id.
+            $object->get_id(),
+            // Subject type.
+            $subject->get_type(),
+            // Object type.
+            $object->get_type()
+        );
+
+    }
+
+    if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        // Save post metadata if available
+        $metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ? filter_input_array( INPUT_POST, array( 'wl_metadata' => FILTER_DEFAULT ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC,
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri = ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            if ( empty( $uri ) ) {
+                continue;
+            }
+            $entity = $entity_service->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( Wordlift_Schema_Service::FIELD_TOPIC === $field ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -313,221 +313,221 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/image.php';
-	}
+    // Required for REST API calls
+    if ( ! function_exists( 'wp_crop_image' ) ) {
+        require_once ABSPATH . 'wp-admin/includes/image.php';
+    }
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
 
-	/*
+    /*
 	 * Data is coming from a $_POST, sanitize it.
 	 *
 	 * @since 3.19.4
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
-	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
-	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
-	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
-
-	// Check whether an entity already exists with the provided URI.
-	$uri = $entity_data['uri'];
-	if ( isset( $uri ) ) {
-		$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-		if ( isset( $post ) ) {
-			$log->debug( "Post already exists for URI $uri." );
-
-			return $post;
-		}
-	}
-
-	// Prepare properties of the new entity.
-	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true ) && is_numeric( $related_post_id )
-		? get_post_status( $related_post_id ) : 'draft';
-
-	$params = array(
-		// @@todo: we don't want an entity to be automatically published.
-		'post_status'  => $post_status,
-		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-		'post_title'   => $label,
-		'post_content' => $description,
-		'post_excerpt' => '',
-		// Ensure we're using a valid slug. We're not overwriting an existing
-		// entity with a post_name already set, since this call is made only for
-		// new entities.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
-	);
-
-	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
-	// the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
-	// Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
-	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
-	// is created when saving a post.
-	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action(
-			'wp_insert_post',
-			array(
-				$wpseo_metabox,
-				'save_postdata',
-			)
-		);
-	}
-
-	if ( isset( $seo_ultimate ) ) {
-		remove_action(
-			'save_post',
-			array(
-				$seo_ultimate,
-				'save_postmeta_box',
-			)
-		);
-	}
-
-	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
-	// save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
-	// to the save_post and restore them after we saved the entity.
-	// see https://github.com/insideout10/wordlift-plugin/issues/203
-	// see https://github.com/insideout10/wordlift-plugin/issues/156
-	// see https://github.com/insideout10/wordlift-plugin/issues/148
-	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-
-	$log->trace( 'Going to insert new post...' );
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Setting the alternative labels for this entity.
-	Wordlift_Entity_Service::get_instance()
-						   ->set_alternative_labels( $post_id, $synonyms );
-
-	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-
-	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action(
-			'wp_insert_post',
-			array(
-				$wpseo_metabox,
-				'save_postdata',
-			)
-		);
-	}
-
-	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action(
-			'save_post',
-			array(
-				$seo_ultimate,
-				'save_postmeta_box',
-			),
-			10,
-			2
-		);
-	}
-
-	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
-
-		// inform an error occurred.
-		return null;
-	}
-
-	wl_set_entity_main_type( $post_id, $type_uri );
-
-	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
-
-	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
-
-	// Add the uri to the sameAs data if it's not a local URI.
-	if ( isset( $uri ) && preg_match( '@https?://.*@', $uri ) &&
-		 $wl_uri !== $uri &&
-		 // Only remote entities
-		 0 !== strpos( $uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri() )
-	) {
-		array_push( $same_as, $uri );
-	}
-
-	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
-
-	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
-
-		if ( false === $image || is_wp_error( $image ) ) {
-			continue;
-		}
-
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
-
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
-
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
-
-		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
-
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
-
-		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
-	}
-
-	// finally return the entity post.
-	return get_post( $post_id );
+    $label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+    $type_uri         = $entity_data['main_type'];
+    $entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+    $description      = $entity_data['description'];
+    $images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
+    $same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
+    $related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
+    $other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+    // Get the synonyms.
+    $synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+
+    // Check whether an entity already exists with the provided URI.
+    $uri = $entity_data['uri'];
+    if ( isset( $uri ) ) {
+        $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+        if ( isset( $post ) ) {
+            $log->debug( "Post already exists for URI $uri." );
+
+            return $post;
+        }
+    }
+
+    // Prepare properties of the new entity.
+    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+    $post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true ) && is_numeric( $related_post_id )
+        ? get_post_status( $related_post_id ) : 'draft';
+
+    $params = array(
+        // @@todo: we don't want an entity to be automatically published.
+        'post_status'  => $post_status,
+        'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+        'post_title'   => $label,
+        'post_content' => $description,
+        'post_excerpt' => '',
+        // Ensure we're using a valid slug. We're not overwriting an existing
+        // entity with a post_name already set, since this call is made only for
+        // new entities.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/282
+        'post_name'    => sanitize_title( $label ),
+    );
+
+    // If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
+    // the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
+    // Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
+    // This does NOT affect saving an entity from the entity admin page since this function is called when an entity
+    // is created when saving a post.
+    global $wpseo_metabox, $seo_ultimate;
+    if ( isset( $wpseo_metabox ) ) {
+        remove_action(
+            'wp_insert_post',
+            array(
+                $wpseo_metabox,
+                'save_postdata',
+            )
+        );
+    }
+
+    if ( isset( $seo_ultimate ) ) {
+        remove_action(
+            'save_post',
+            array(
+                $seo_ultimate,
+                'save_postmeta_box',
+            )
+        );
+    }
+
+    // The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
+    // save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
+    // to the save_post and restore them after we saved the entity.
+    // see https://github.com/insideout10/wordlift-plugin/issues/203
+    // see https://github.com/insideout10/wordlift-plugin/issues/156
+    // see https://github.com/insideout10/wordlift-plugin/issues/148
+    global $wp_filter;
+    $save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+    $log->trace( 'Going to insert new post...' );
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Setting the alternative labels for this entity.
+    Wordlift_Entity_Service::get_instance()
+                            ->set_alternative_labels( $post_id, $synonyms );
+
+    // Restore all the existing filters.
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+    // If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
+    if ( isset( $wpseo_metabox ) ) {
+        add_action(
+            'wp_insert_post',
+            array(
+                $wpseo_metabox,
+                'save_postdata',
+            )
+        );
+    }
+
+    // If SEO Ultimate is installed, add back the hook we removed a few lines above.
+    if ( isset( $seo_ultimate ) ) {
+        add_action(
+            'save_post',
+            array(
+                $seo_ultimate,
+                'save_postmeta_box',
+            ),
+            10,
+            2
+        );
+    }
+
+    // TODO: handle errors.
+    if ( is_wp_error( $post_id ) ) {
+        $log->error( 'An error occurred: ' . $post_id->get_error_message() );
+
+        // inform an error occurred.
+        return null;
+    }
+
+    wl_set_entity_main_type( $post_id, $type_uri );
+
+    // Save the entity types.
+    wl_set_entity_rdf_types( $post_id, $entity_types );
+
+    // Get a dataset URI for the entity.
+    $wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+
+    // Add the uri to the sameAs data if it's not a local URI.
+    if ( isset( $uri ) && preg_match( '@https?://.*@', $uri ) &&
+         $wl_uri !== $uri &&
+         // Only remote entities
+         0 !== strpos( $uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri() )
+    ) {
+        array_push( $same_as, $uri );
+    }
+
+    // Save the sameAs data for the entity.
+    wl_schema_set_value( $post_id, 'sameAs', $same_as );
+
+    // Save the other properties (latitude, langitude, startDate, endDate, etc.)
+    foreach ( $other_properties as $property_name => $property_value ) {
+        wl_schema_set_value( $post_id, $property_name, $property_value );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+
+        if ( false === $image || is_wp_error( $image ) ) {
+            continue;
+        }
+
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
+
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
+
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
+
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
+
+        // Set it as the featured image.
+        set_post_thumbnail( $post_id, $attachment_id );
+    }
+
+    // finally return the entity post.
+    return get_post( $post_id );
 }

Spacing +125 added lines, -125 removed lines

@@ -21,15 +21,15 @@ 
  *
  * @since 3.0.0
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post');
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+	$log->trace("Saving post $post_id to Linked Data...");
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
+		$log->debug("Skipping $post_id, because id is not numeric or is a post revision.");
 
 		return;
 	}
@@ -37,7 +37,7 @@ 
 	// Get the post type and check whether it supports the editor.
 	//
 	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
+	$post_type = get_post_type($post_id);
 	/**
 	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
 	 *
@@ -45,13 +45,13 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
 	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
+	$is_editor_supported = wl_post_type_supports_editor($post_type);
 
-	$is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id );
+	$is_no_editor_analysis_enabled = Wordlift\No_Editor_Analysis\No_Editor_Analysis_Feature::can_no_editor_analysis_be_used($post_id);
 	// Bail out if it's not an entity.
 	if ( ! $is_editor_supported
-		 && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+		 && ! $is_no_editor_analysis_enabled) {
+		$log->debug("Skipping $post_id, because $post_type doesn't support the editor (content).");
 
 		return;
 	}
@@ -64,23 +64,23 @@ 
 	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types, true ) && ! $is_no_editor_analysis_enabled ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+	if ( ! in_array($post_type, $supported_types, true) && ! $is_no_editor_analysis_enabled) {
+		$log->debug("Skipping $post_id, because $post_type is not a valid entity.");
 
 		return;
 	}
 
 	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -91,23 +91,23 @@ 
  *
  * @since 3.0.0
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -123,21 +123,21 @@ 
 	$internal_entity_uris = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$data              = filter_var_array( $_POST, array( 'wl_entities' => array( 'flags' => FILTER_REQUIRE_ARRAY ) ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+	if (isset($_POST['wl_entities'])) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$data              = filter_var_array($_POST, array('wl_entities' => array('flags' => FILTER_REQUIRE_ARRAY))); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$entities_via_post = $data['wl_entities'];
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( wp_json_encode( $entities_via_post ) );
-		wl_write_log( ']' );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(wp_json_encode($entities_via_post));
+		wl_write_log(']');
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) ) {
-				$existing_entity = get_page_by_title( $entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types() );
-				if ( isset( $existing_entity ) ) {
-					$existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get( $existing_entity->ID );
+			if (preg_match('/^local-entity-.+/', $entity_uri)) {
+				$existing_entity = get_page_by_title($entity['label'], OBJECT, Wordlift_Entity_Service::valid_entity_post_types());
+				if (isset($existing_entity)) {
+					$existing_entity_type = Wordlift_Entity_Type_Service::get_instance()->get($existing_entity->ID);
 					// Type doesn't match, continue to create a new entity.
-					if ( ! isset( $existing_entity_type ) || $existing_entity_type['css_class'] !== $entity['main_type'] ) {
+					if ( ! isset($existing_entity_type) || $existing_entity_type['css_class'] !== $entity['main_type']) {
 						$existing_entity = null;
 					}
 				}
@@ -145,35 +145,35 @@ 
 				// Look if current entity uri matches an internal existing entity, meaning:
 				// 1. when $entity_uri is an internal uri
 				// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-				$existing_entity = $entity_service->get_entity_post_by_uri( $entity_uri );
+				$existing_entity = $entity_service->get_entity_post_by_uri($entity_uri);
 			}
 
 			// Don't save the entities which are not found, but also local.
-			if ( ! isset( $existing_entity ) && $uri_service->is_internal( $entity_uri ) ) {
+			if ( ! isset($existing_entity) && $uri_service->is_internal($entity_uri)) {
 				$internal_entity_uris[] = $entity_uri;
 				continue;
 			}
 
-			if ( ! isset( $existing_entity ) ) {
+			if ( ! isset($existing_entity)) {
 				// Update entity data with related post
 				$entity['related_post_id'] = $post_id;
 				// New entity, save it.
-				$existing_entity = wl_save_entity( $entity );
+				$existing_entity = wl_save_entity($entity);
 			} else {
 				// Existing entity, update post status.
-				if ( $existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status ) {
+				if ($existing_entity instanceof WP_Post && 'publish' !== $existing_entity->post_status) {
 					// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-					$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true )
+					$post_status = apply_filters('wl_feature__enable__entity-auto-publish', true)
 						? $post->post_status : 'draft';
-					wl_update_post_status( $existing_entity->ID, $post_status );
+					wl_update_post_status($existing_entity->ID, $post_status);
 				}
 			}
 
-			$uri = $content_service->get_entity_id( Wordpress_Content_Id::create_post( $existing_entity->ID ) );
+			$uri = $content_service->get_entity_id(Wordpress_Content_Id::create_post($existing_entity->ID));
 
 			$internal_entity_uris[] = $uri;
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 		}
 	}
@@ -182,14 +182,14 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+		foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+			if (1 !== preg_match('@^(https?://|local-entity-)@', $tmp_uri)) {
 				continue;
 			}
 
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+			$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 		}
 
 		// Update the post content.
@@ -201,19 +201,19 @@ 
 		wp_update_post(
 			array(
 				'ID'           => $post->ID,
-				'post_content' => addslashes( $updated_post_content ),
+				'post_content' => addslashes($updated_post_content),
 			)
 		);
 	}
 
 	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
-	$content_id = Wordpress_Content_Id::create_post( $post->ID );
-	$relations  = Relation_Service::get_instance()->get_relations( $content_id );
+	$content_id = Wordpress_Content_Id::create_post($post->ID);
+	$relations  = Relation_Service::get_instance()->get_relations($content_id);
 
-	if ( No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( $post_id ) ) {
-		$relations->add( ...Relation_Service::get_relations_from_uris( $content_id, $internal_entity_uris ) );
+	if (No_Editor_Analysis_Feature::can_no_editor_analysis_be_used($post_id)) {
+		$relations->add(...Relation_Service::get_relations_from_uris($content_id, $internal_entity_uris));
 	}
 	/**
 	 * Filter the relations, we dont want to create a relation
@@ -223,20 +223,20 @@ 
 	 */
 	$filtered_relations = array_filter(
 		$relations->toArray(),
-		function ( $item ) {
+		function($item) {
 			/**
 			 * @var $item Relation
 			 */
 			$object = $item->get_object();
 
-			return ! ( $object->get_type() === Object_Type_Enum::TERM
-			&& $object->get_id() === 1 );
+			return ! ($object->get_type() === Object_Type_Enum::TERM
+			&& $object->get_id() === 1);
 		}
 	);
 
 	// Save relation instances
 	/** @var Relation $relation */
-	foreach ( $filtered_relations  as $relation ) {
+	foreach ($filtered_relations  as $relation) {
 		$subject = $relation->get_subject();
 		$object  = $relation->get_object();
 
@@ -255,9 +255,9 @@ 
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+	if (isset($_POST['wl_entities'])) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ? filter_input_array( INPUT_POST, array( 'wl_metadata' => FILTER_DEFAULT ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ? filter_input_array(INPUT_POST, array('wl_metadata' => FILTER_DEFAULT)) : array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 		$fields = array(
 			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
@@ -265,35 +265,35 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			if ( empty( $uri ) ) {
+			if (empty($uri)) {
 				continue;
 			}
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
+			$entity = $entity_service->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( Wordlift_Schema_Service::FIELD_TOPIC === $field ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if (Wordlift_Schema_Service::FIELD_TOPIC === $field) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -311,14 +311,14 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
 	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/image.php';
+	if ( ! function_exists('wp_crop_image')) {
+		require_once ABSPATH.'wp-admin/includes/image.php';
 	}
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+	$log = Wordlift_Log_Service::get_logger('wl_save_entity');
 
 	/*
 	 * Data is coming from a $_POST, sanitize it.
@@ -327,23 +327,23 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+	$label            = preg_replace('/\xEF\xBB\xBF/', '', sanitize_text_field($entity_data['label']));
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+	$images           = isset($entity_data['image']) ? (array) $entity_data['image'] : array();
+	$same_as          = isset($entity_data['sameas']) ? (array) $entity_data['sameas'] : array();
+	$related_post_id  = isset($entity_data['related_post_id']) ? $entity_data['related_post_id'] : null;
+	$other_properties = isset($entity_data['properties']) ? $entity_data['properties'] : array();
 	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+	$synonyms = isset($entity_data['synonym']) ? $entity_data['synonym'] : array();
 
 	// Check whether an entity already exists with the provided URI.
 	$uri = $entity_data['uri'];
-	if ( isset( $uri ) ) {
-		$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-		if ( isset( $post ) ) {
-			$log->debug( "Post already exists for URI $uri." );
+	if (isset($uri)) {
+		$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
+		if (isset($post)) {
+			$log->debug("Post already exists for URI $uri.");
 
 			return $post;
 		}
@@ -351,8 +351,8 @@ 
 
 	// Prepare properties of the new entity.
 	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	$post_status = apply_filters( 'wl_feature__enable__entity-auto-publish', true ) && is_numeric( $related_post_id )
-		? get_post_status( $related_post_id ) : 'draft';
+	$post_status = apply_filters('wl_feature__enable__entity-auto-publish', true) && is_numeric($related_post_id)
+		? get_post_status($related_post_id) : 'draft';
 
 	$params = array(
 		// @@todo: we don't want an entity to be automatically published.
@@ -366,7 +366,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -375,7 +375,7 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
+	if (isset($wpseo_metabox)) {
 		remove_action(
 			'wp_insert_post',
 			array(
@@ -385,7 +385,7 @@ 
 		);
 	}
 
-	if ( isset( $seo_ultimate ) ) {
+	if (isset($seo_ultimate)) {
 		remove_action(
 			'save_post',
 			array(
@@ -402,23 +402,23 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
-	$log->trace( 'Going to insert new post...' );
+	$log->trace('Going to insert new post...');
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Setting the alternative labels for this entity.
 	Wordlift_Entity_Service::get_instance()
-						   ->set_alternative_labels( $post_id, $synonyms );
+						   ->set_alternative_labels($post_id, $synonyms);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
+	if (isset($wpseo_metabox)) {
 		add_action(
 			'wp_insert_post',
 			array(
@@ -429,7 +429,7 @@ 
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
+	if (isset($seo_ultimate)) {
 		add_action(
 			'save_post',
 			array(
@@ -442,61 +442,61 @@ 
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
+	if (is_wp_error($post_id)) {
+		$log->error('An error occurred: '.$post_id->get_error_message());
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri($post_id);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( isset( $uri ) && preg_match( '@https?://.*@', $uri ) &&
+	if (isset($uri) && preg_match('@https?://.*@', $uri) &&
 		 $wl_uri !== $uri &&
 		 // Only remote entities
-		 0 !== strpos( $uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri() )
+		 0 !== strpos($uri, Wordlift_Configuration_Service::get_instance()->get_dataset_uri())
 	) {
-		array_push( $same_as, $uri );
+		array_push($same_as, $uri);
 	}
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+		$image = Wordlift_Remote_Image_Service::save_from_url($image_remote_url);
 
-		if ( false === $image || is_wp_error( $image ) ) {
+		if (false === $image || is_wp_error($image)) {
 			continue;
 		}
 
@@ -516,18 +516,18 @@ 
 		);
 
 		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+		$attachment_id = wp_insert_attachment($attachment, $filename, $post_id);
 
 		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+		wl_set_source_url($attachment_id, $image_remote_url);
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
+		set_post_thumbnail($post_id, $attachment_id);
 	}
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }

src/modules/gardening-kg/includes/Jsonld.php

Indentation +58 added lines, -58 removed lines

@@ -7,74 +7,74 @@
 
 class Jsonld {
 
-	/**
-	 * @var Content_Service $content_service
-	 */
-	private $content_service;
+    /**
+     * @var Content_Service $content_service
+     */
+    private $content_service;
 
-	public function __construct( Content_Service $content_service ) {
-		$this->content_service = $content_service;
-	}
+    public function __construct( Content_Service $content_service ) {
+        $this->content_service = $content_service;
+    }
 
-	public function register_hooks() {
-		add_action( 'wl_post_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
-		add_action( 'wl_entity_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
+    public function register_hooks() {
+        add_action( 'wl_post_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
+        add_action( 'wl_entity_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
 
-	}
+    }
 
-	public function post_jsonld( $jsonld, $post_id ) {
+    public function post_jsonld( $jsonld, $post_id ) {
 
-		$mentions = array();
-		$term_ids = $this->get_term_ids( $post_id );
+        $mentions = array();
+        $term_ids = $this->get_term_ids( $post_id );
 
-		foreach ( $term_ids as $term_id ) {
-			$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_term( $term_id ) );
-		}
+        foreach ( $term_ids as $term_id ) {
+            $this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_term( $term_id ) );
+        }
 
-		// Add also the post jsonld.
-		$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_post( $post_id ) );
+        // Add also the post jsonld.
+        $this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_post( $post_id ) );
 
-		$existing_mentions = array_key_exists( 'mentions', $jsonld ) ? $jsonld['mentions'] : array();
+        $existing_mentions = array_key_exists( 'mentions', $jsonld ) ? $jsonld['mentions'] : array();
 
-		if ( count( $mentions ) > 0 ) {
-			$jsonld['mentions'] = array_merge( $existing_mentions, $mentions );
-		}
-		return $jsonld;
-	}
+        if ( count( $mentions ) > 0 ) {
+            $jsonld['mentions'] = array_merge( $existing_mentions, $mentions );
+        }
+        return $jsonld;
+    }
 
-	private function get_term_ids( $post_id ) {
-		global $wpdb;
-		$result = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT r.term_id from {$wpdb->prefix}term_relationships r 
+    private function get_term_ids( $post_id ) {
+        global $wpdb;
+        $result = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT r.term_id from {$wpdb->prefix}term_relationships r 
     INNER JOIN {$wpdb->prefix}term_taxonomy tt ON r.term_taxonomy_id=tt.term_taxonomy_id WHERE r.object_id= %d",
-				$post_id
-			)
-		);
-
-		return is_array( $result ) ? $result : array();
-	}
-
-	/**
-	 * @param $list array Adds the jsonld to the list if valid.
-	 * @param $content_id \Wordlift\Content\Wordpress\Wordpress_Content_Id
-	 *
-	 * @return void
-	 */
-	private function add_about_jsonld( &$list, $content_id ) {
-		$about_jsonld   = $this->content_service->get_about_jsonld(
-			$content_id
-		);
-		$decoded_jsonld = json_decode( $about_jsonld, true );
-
-		if ( null === $decoded_jsonld ) {
-			return;
-		}
-
-		$value = wp_is_numeric_array( $decoded_jsonld ) ? $decoded_jsonld : array( $decoded_jsonld );
-
-		$list = array_merge( $list, $value );
-
-	}
+                $post_id
+            )
+        );
+
+        return is_array( $result ) ? $result : array();
+    }
+
+    /**
+     * @param $list array Adds the jsonld to the list if valid.
+     * @param $content_id \Wordlift\Content\Wordpress\Wordpress_Content_Id
+     *
+     * @return void
+     */
+    private function add_about_jsonld( &$list, $content_id ) {
+        $about_jsonld   = $this->content_service->get_about_jsonld(
+            $content_id
+        );
+        $decoded_jsonld = json_decode( $about_jsonld, true );
+
+        if ( null === $decoded_jsonld ) {
+            return;
+        }
+
+        $value = wp_is_numeric_array( $decoded_jsonld ) ? $decoded_jsonld : array( $decoded_jsonld );
+
+        $list = array_merge( $list, $value );
+
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -12,37 +12,37 @@ 
 	 */
 	private $content_service;
 
-	public function __construct( Content_Service $content_service ) {
+	public function __construct(Content_Service $content_service) {
 		$this->content_service = $content_service;
 	}
 
 	public function register_hooks() {
-		add_action( 'wl_post_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
-		add_action( 'wl_entity_jsonld', array( $this, 'post_jsonld' ), 10, 2 );
+		add_action('wl_post_jsonld', array($this, 'post_jsonld'), 10, 2);
+		add_action('wl_entity_jsonld', array($this, 'post_jsonld'), 10, 2);
 
 	}
 
-	public function post_jsonld( $jsonld, $post_id ) {
+	public function post_jsonld($jsonld, $post_id) {
 
 		$mentions = array();
-		$term_ids = $this->get_term_ids( $post_id );
+		$term_ids = $this->get_term_ids($post_id);
 
-		foreach ( $term_ids as $term_id ) {
-			$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_term( $term_id ) );
+		foreach ($term_ids as $term_id) {
+			$this->add_about_jsonld($mentions, Wordpress_Content_Id::create_term($term_id));
 		}
 
 		// Add also the post jsonld.
-		$this->add_about_jsonld( $mentions, Wordpress_Content_Id::create_post( $post_id ) );
+		$this->add_about_jsonld($mentions, Wordpress_Content_Id::create_post($post_id));
 
-		$existing_mentions = array_key_exists( 'mentions', $jsonld ) ? $jsonld['mentions'] : array();
+		$existing_mentions = array_key_exists('mentions', $jsonld) ? $jsonld['mentions'] : array();
 
-		if ( count( $mentions ) > 0 ) {
-			$jsonld['mentions'] = array_merge( $existing_mentions, $mentions );
+		if (count($mentions) > 0) {
+			$jsonld['mentions'] = array_merge($existing_mentions, $mentions);
 		}
 		return $jsonld;
 	}
 
-	private function get_term_ids( $post_id ) {
+	private function get_term_ids($post_id) {
 		global $wpdb;
 		$result = $wpdb->get_col(
 			$wpdb->prepare(
@@ -52,7 +52,7 @@ 
 			)
 		);
 
-		return is_array( $result ) ? $result : array();
+		return is_array($result) ? $result : array();
 	}
 
 	/**
@@ -61,19 +61,19 @@ 
 	 *
 	 * @return void
 	 */
-	private function add_about_jsonld( &$list, $content_id ) {
+	private function add_about_jsonld(&$list, $content_id) {
 		$about_jsonld   = $this->content_service->get_about_jsonld(
 			$content_id
 		);
-		$decoded_jsonld = json_decode( $about_jsonld, true );
+		$decoded_jsonld = json_decode($about_jsonld, true);
 
-		if ( null === $decoded_jsonld ) {
+		if (null === $decoded_jsonld) {
 			return;
 		}
 
-		$value = wp_is_numeric_array( $decoded_jsonld ) ? $decoded_jsonld : array( $decoded_jsonld );
+		$value = wp_is_numeric_array($decoded_jsonld) ? $decoded_jsonld : array($decoded_jsonld);
 
-		$list = array_merge( $list, $value );
+		$list = array_merge($list, $value);
 
 	}
 

src/wordlift/analysis/occurrences/class-no-annotation-strategy.php

Indentation +37 added lines, -37 removed lines

@@ -18,42 +18,42 @@
 
 class No_Annotation_Strategy extends Singleton implements Occurrences {
 
-	/**
-	 * @var Relation_Service_Interface
-	 */
-	private $relation_service;
-
-	/**
-	 * @var Content_Service
-	 */
-	private $content_service;
-
-	protected function __construct() {
-		parent::__construct();
-		$this->relation_service = Relation_Service::get_instance();
-		$this->content_service  = Wordpress_Content_Service::get_instance();
-	}
-
-	public function add_occurrences_to_entities( $occurrences, $json, $post_id ) {
-
-		$content_id       = Wordpress_Content_Id::create_post( $post_id );
-		$relation_service = Relation_Service::get_instance();
-		$relations        = $relation_service->get_relations( $content_id );
-
-		/** @var Relation $relation */
-		foreach ( $relations->toArray() as $relation ) {
-			$object = $relation->get_object();
-			// @@todo is this working okey with term id?
-			$entity_uri = $this->content_service->get_entity_id( $relation->get_object() );
-			if ( ! $entity_uri ) {
-				continue;
-			}
-			$entity_data                   = wl_serialize_entity( $object->get_id() );
-			$entity_data['occurrences']    = array( 'placeholder-occurrence' );
-			$json->entities->{$entity_uri} = $entity_data;
-		}
-
-		return $json;
-	}
+    /**
+     * @var Relation_Service_Interface
+     */
+    private $relation_service;
+
+    /**
+     * @var Content_Service
+     */
+    private $content_service;
+
+    protected function __construct() {
+        parent::__construct();
+        $this->relation_service = Relation_Service::get_instance();
+        $this->content_service  = Wordpress_Content_Service::get_instance();
+    }
+
+    public function add_occurrences_to_entities( $occurrences, $json, $post_id ) {
+
+        $content_id       = Wordpress_Content_Id::create_post( $post_id );
+        $relation_service = Relation_Service::get_instance();
+        $relations        = $relation_service->get_relations( $content_id );
+
+        /** @var Relation $relation */
+        foreach ( $relations->toArray() as $relation ) {
+            $object = $relation->get_object();
+            // @@todo is this working okey with term id?
+            $entity_uri = $this->content_service->get_entity_id( $relation->get_object() );
+            if ( ! $entity_uri ) {
+                continue;
+            }
+            $entity_data                   = wl_serialize_entity( $object->get_id() );
+            $entity_data['occurrences']    = array( 'placeholder-occurrence' );
+            $json->entities->{$entity_uri} = $entity_data;
+        }
+
+        return $json;
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -34,22 +34,22 @@
 		$this->content_service  = Wordpress_Content_Service::get_instance();
 	}
 
-	public function add_occurrences_to_entities( $occurrences, $json, $post_id ) {
+	public function add_occurrences_to_entities($occurrences, $json, $post_id) {
 
-		$content_id       = Wordpress_Content_Id::create_post( $post_id );
+		$content_id       = Wordpress_Content_Id::create_post($post_id);
 		$relation_service = Relation_Service::get_instance();
-		$relations        = $relation_service->get_relations( $content_id );
+		$relations        = $relation_service->get_relations($content_id);
 
 		/** @var Relation $relation */
-		foreach ( $relations->toArray() as $relation ) {
+		foreach ($relations->toArray() as $relation) {
 			$object = $relation->get_object();
 			// @@todo is this working okey with term id?
-			$entity_uri = $this->content_service->get_entity_id( $relation->get_object() );
-			if ( ! $entity_uri ) {
+			$entity_uri = $this->content_service->get_entity_id($relation->get_object());
+			if ( ! $entity_uri) {
 				continue;
 			}
-			$entity_data                   = wl_serialize_entity( $object->get_id() );
-			$entity_data['occurrences']    = array( 'placeholder-occurrence' );
+			$entity_data                   = wl_serialize_entity($object->get_id());
+			$entity_data['occurrences']    = array('placeholder-occurrence');
 			$json->entities->{$entity_uri} = $entity_data;
 		}
 

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

Indentation +268 added lines, -268 removed lines

@@ -20,273 +20,273 @@
  */
 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;
-
-	/**
-	 * @var Wordlift_Post_Converter
-	 */
-	private $post_id_to_jsonld_converter;
-
-	/**
-	 * Wordlift_Term_JsonLd_Adapter constructor.
-	 *
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 * @param \Wordlift_Post_Converter     $post_id_to_jsonld_converter The {@link Wordlift_Post_Converter} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
-
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-
-		$this->entity_uri_service          = $entity_uri_service;
-		$this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
-
-		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 ( $id !== null ) {
-			$term                       = get_term( $id );
-			$post_jsonld['description'] = wp_strip_all_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;
-		}
-
-		return $post_jsonld;
-	}
-
-	private function get_posts( $id ) {
-		global $wp_query;
-
-		if ( $wp_query->posts !== null ) {
-			return array_map(
-				function ( $post ) {
-					return $post->ID;
-				},
-				$wp_query->posts
-			);
-		}
-
-		if ( $id === null ) {
-			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 );
-
-		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
-		$jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
-
-		echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
-
-	}
-
-	public function get( $id, $context, $is_recursive_call = false ) {
-		/**
-		 * 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 );
-
-		$references = array();
-
-		// Don't expand nested references, it will lead to an infinite loop.
-		if ( ! $is_recursive_call ) {
-			/**
-			 * @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 ( null === $id ) {
-			return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_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 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
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	private function get_entity_jsonld( $term_id, $context ) {
-
-		// The `_wl_entity_id` are URIs.
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
-		$entity_uri_service = $this->entity_uri_service;
-
-		$wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
-
-		$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 ) );
-		$entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
-		// Reset the `url` to the term page.
-		$entities_jsonld[0]['url'] = get_term_link( $term_id );
-
-		return $entities_jsonld;
-	}
-
-	/**
-	 * @param $references
-	 *
-	 * @return array
-	 */
-	private function expand_references( $references ) {
-		if ( ! is_array( $references ) ) {
-			return array();
-		}
-		$references_jsonld = array();
-		// Expand the references.
-		foreach ( $references as $reference ) {
-			if ( $reference instanceof Term_Reference ) {
-				// Second level references won't be expanded.
-				$references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
-			} elseif ( is_numeric( $reference ) ) {
-				$ref_2               = array();
-				$ref_info_2          = array();
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference, $ref_2, $ref_info_2, new Relations() );
-			}
-		}
-
-		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;
+
+    /**
+     * @var Wordlift_Post_Converter
+     */
+    private $post_id_to_jsonld_converter;
+
+    /**
+     * Wordlift_Term_JsonLd_Adapter constructor.
+     *
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     * @param \Wordlift_Post_Converter     $post_id_to_jsonld_converter The {@link Wordlift_Post_Converter} instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
+
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+
+        $this->entity_uri_service          = $entity_uri_service;
+        $this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
+
+        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 ( $id !== null ) {
+            $term                       = get_term( $id );
+            $post_jsonld['description'] = wp_strip_all_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;
+        }
+
+        return $post_jsonld;
+    }
+
+    private function get_posts( $id ) {
+        global $wp_query;
+
+        if ( $wp_query->posts !== null ) {
+            return array_map(
+                function ( $post ) {
+                    return $post->ID;
+                },
+                $wp_query->posts
+            );
+        }
+
+        if ( $id === null ) {
+            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 );
+
+        $jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
+        $jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
+
+        echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
+
+    }
+
+    public function get( $id, $context, $is_recursive_call = false ) {
+        /**
+         * 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 );
+
+        $references = array();
+
+        // Don't expand nested references, it will lead to an infinite loop.
+        if ( ! $is_recursive_call ) {
+            /**
+             * @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 ( null === $id ) {
+            return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_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 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
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    private function get_entity_jsonld( $term_id, $context ) {
+
+        // The `_wl_entity_id` are URIs.
+        $entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
+        $entity_uri_service = $this->entity_uri_service;
+
+        $wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
+
+        $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 ) );
+        $entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
+        // Reset the `url` to the term page.
+        $entities_jsonld[0]['url'] = get_term_link( $term_id );
+
+        return $entities_jsonld;
+    }
+
+    /**
+     * @param $references
+     *
+     * @return array
+     */
+    private function expand_references( $references ) {
+        if ( ! is_array( $references ) ) {
+            return array();
+        }
+        $references_jsonld = array();
+        // Expand the references.
+        foreach ( $references as $reference ) {
+            if ( $reference instanceof Term_Reference ) {
+                // Second level references won't be expanded.
+                $references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
+            } elseif ( is_numeric( $reference ) ) {
+                $ref_2               = array();
+                $ref_info_2          = array();
+                $references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference, $ref_2, $ref_info_2, new Relations() );
+            }
+        }
+
+        return $references_jsonld;
+
+    }
 
 }

Spacing +60 added lines, -60 removed lines

@@ -44,9 +44,9 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
+	public function __construct($entity_uri_service, $post_id_to_jsonld_converter) {
 
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
+		add_action('wp_head', array($this, 'wp_head'));
 
 		$this->entity_uri_service          = $entity_uri_service;
 		$this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
@@ -64,31 +64,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 ( $id !== null ) {
-			$term                       = get_term( $id );
-			$post_jsonld['description'] = wp_strip_all_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 ($id !== null) {
+			$term                       = get_term($id);
+			$post_jsonld['description'] = wp_strip_all_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,
@@ -97,34 +97,34 @@ 
 				 *
 				 * 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 );
-			++ $position;
+			array_push($post_jsonld['itemListElement'], $result);
+			++$position;
 		}
 
 		return $post_jsonld;
 	}
 
-	private function get_posts( $id ) {
+	private function get_posts($id) {
 		global $wp_query;
 
-		if ( $wp_query->posts !== null ) {
+		if ($wp_query->posts !== null) {
 			return array_map(
-				function ( $post ) {
+				function($post) {
 					return $post->ID;
 				},
 				$wp_query->posts
 			);
 		}
 
-		if ( $id === null ) {
+		if ($id === null) {
 			return null;
 		}
 
-		$term = get_term( $id );
+		$term = get_term($id);
 
-		return get_objects_in_term( $id, $term->taxonomy );
+		return get_objects_in_term($id, $term->taxonomy);
 	}
 
 	/**
@@ -136,34 +136,34 @@ 
 		$query_object = get_queried_object();
 
 		// Check if it is a term page.
-		if ( ! $query_object instanceof WP_Term ) {
+		if ( ! $query_object instanceof WP_Term) {
 			return;
 		}
 
 		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+		if ( ! apply_filters('wl_jsonld_enabled', true)) {
 			return;
 		}
 
 		$term_id = $query_object->term_id;
 
-		$jsonld = $this->get( $term_id, Jsonld_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);
 
-		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
-		$jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
+		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">'.$jsonld_string.'</script>';
+		$jsonld_term_html_output = apply_filters('wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id);
 
 		echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
 
 	}
 
-	public function get( $id, $context, $is_recursive_call = false ) {
+	public function get($id, $context, $is_recursive_call = false) {
 		/**
 		 * Support for carousel rich snippet, get jsonld data present
 		 * for all the posts shown in the term page, and add the jsonld data
@@ -175,17 +175,17 @@ 
 		 */
 		$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(),
 		);
 
@@ -195,35 +195,35 @@ 
 		 * @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);
 
 		$references = array();
 
 		// Don't expand nested references, it will lead to an infinite loop.
-		if ( ! $is_recursive_call ) {
+		if ( ! $is_recursive_call) {
 			/**
 			 * @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 ( null === $id ) {
-			return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ) : '';
+	private function get_term_url($id) {
+		if (null === $id) {
+			return isset($_SERVER['REQUEST_URI']) ? filter_var(wp_unslash($_SERVER['REQUEST_URI']), FILTER_SANITIZE_URL) : '';
 		}
 
-		$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);
 	}
 
 	/**
@@ -235,30 +235,30 @@ 
 	 * @return array
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	private function get_entity_jsonld( $term_id, $context ) {
+	private function get_entity_jsonld($term_id, $context) {
 
 		// The `_wl_entity_id` are URIs.
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
+		$entity_ids         = get_term_meta($term_id, '_wl_entity_id');
 		$entity_uri_service = $this->entity_uri_service;
 
 		$wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
 
 		$local_entity_ids = array_filter(
 			$entity_ids,
-			function ( $uri ) use ( $entity_uri_service ) {
-				return $entity_uri_service->is_internal( $uri );
+			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 ) );
-		$entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
+		$post            = $this->entity_uri_service->get_entity(array_shift($local_entity_ids));
+		$entities_jsonld = $wordlift_jsonld_service->get_jsonld(false, $post->ID);
 		// Reset the `url` to the term page.
-		$entities_jsonld[0]['url'] = get_term_link( $term_id );
+		$entities_jsonld[0]['url'] = get_term_link($term_id);
 
 		return $entities_jsonld;
 	}
@@ -268,20 +268,20 @@ 
 	 *
 	 * @return array
 	 */
-	private function expand_references( $references ) {
-		if ( ! is_array( $references ) ) {
+	private function expand_references($references) {
+		if ( ! is_array($references)) {
 			return array();
 		}
 		$references_jsonld = array();
 		// Expand the references.
-		foreach ( $references as $reference ) {
-			if ( $reference instanceof Term_Reference ) {
+		foreach ($references as $reference) {
+			if ($reference instanceof Term_Reference) {
 				// Second level references won't be expanded.
-				$references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
-			} elseif ( is_numeric( $reference ) ) {
+				$references_jsonld[] = current($this->get($reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true));
+			} elseif (is_numeric($reference)) {
 				$ref_2               = array();
 				$ref_info_2          = array();
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference, $ref_2, $ref_info_2, new Relations() );
+				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert($reference, $ref_2, $ref_info_2, new Relations());
 			}
 		}
 

src/includes/properties/class-wordlift-property-entity-reference.php

Indentation +105 added lines, -105 removed lines

@@ -18,110 +18,110 @@
  */
 class Wordlift_Property_Entity_Reference {
 
-	/**
-	 * The URL associated with this entity reference.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var string $url The URL associated with the entity reference.
-	 */
-	private $url;
-
-	/**
-	 * The entity post id.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var int $id The entity post id.
-	 */
-	private $id;
-
-	private $required;
-
-	/**
-	 * @var int
-	 */
-	private $type;
-
-	/**
-	 * Create a Wordlift_Property_Entity_Reference instance with the provided URL.
-	 *
-	 * @param string $entity_uri The URL.
-	 * @param int    $id The entity post id.
-	 * @param bool   $required Whether this property is always required in SD output, default false.
-	 * @param int    $type Instance of Object_Enum_Type
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_uri, $id, $required = false, $type = Object_Type_Enum::POST ) {
-
-		$this->url      = $entity_uri;
-		$this->id       = $id;
-		$this->required = $required;
-		$this->type     = $type;
-
-	}
-
-	/**
-	 * Return the type of the reference, one of the values in Object_Type_Enum
-	 *
-	 * @return int
-	 * @since 3.38.0
-	 */
-	public function get_type() {
-		return $this->type;
-	}
-
-	/**
-	 * Get the URL associated with this entity reference.
-	 *
-	 * @return string The URL associated with the entity reference.
-	 * @since 3.8.0
-	 */
-	public function get_url() {
-
-		return $this->url;
-	}
-
-	/**
-	 * Get the entity id.
-	 *
-	 * @return int The entity id.
-	 * @since 3.10.0
-	 */
-	public function get_id() {
-
-		return $this->id;
-	}
-
-	/**
-	 * Get the required flag for this {@link Wordlift_Property_Entity_Reference}.
-	 *
-	 * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
-	 * property needs to be output to SD (JSON-LD).
-	 *
-	 * @since 3.27.1
-	 */
-	public function get_required() {
-
-		return $this->required;
-
-	}
-
-	/**
-	 * Set the required flag for this {@link Wordlift_Property_Entity_Reference}.
-	 *
-	 * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
-	 * property needs to be output to SD (JSON-LD).
-	 *
-	 * @param bool $value
-	 *
-	 * @since 3.27.1
-	 */
-	public function set_required( $value ) {
-
-		$this->required = $value;
-
-	}
+    /**
+     * The URL associated with this entity reference.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var string $url The URL associated with the entity reference.
+     */
+    private $url;
+
+    /**
+     * The entity post id.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var int $id The entity post id.
+     */
+    private $id;
+
+    private $required;
+
+    /**
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Create a Wordlift_Property_Entity_Reference instance with the provided URL.
+     *
+     * @param string $entity_uri The URL.
+     * @param int    $id The entity post id.
+     * @param bool   $required Whether this property is always required in SD output, default false.
+     * @param int    $type Instance of Object_Enum_Type
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_uri, $id, $required = false, $type = Object_Type_Enum::POST ) {
+
+        $this->url      = $entity_uri;
+        $this->id       = $id;
+        $this->required = $required;
+        $this->type     = $type;
+
+    }
+
+    /**
+     * Return the type of the reference, one of the values in Object_Type_Enum
+     *
+     * @return int
+     * @since 3.38.0
+     */
+    public function get_type() {
+        return $this->type;
+    }
+
+    /**
+     * Get the URL associated with this entity reference.
+     *
+     * @return string The URL associated with the entity reference.
+     * @since 3.8.0
+     */
+    public function get_url() {
+
+        return $this->url;
+    }
+
+    /**
+     * Get the entity id.
+     *
+     * @return int The entity id.
+     * @since 3.10.0
+     */
+    public function get_id() {
+
+        return $this->id;
+    }
+
+    /**
+     * Get the required flag for this {@link Wordlift_Property_Entity_Reference}.
+     *
+     * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
+     * property needs to be output to SD (JSON-LD).
+     *
+     * @since 3.27.1
+     */
+    public function get_required() {
+
+        return $this->required;
+
+    }
+
+    /**
+     * Set the required flag for this {@link Wordlift_Property_Entity_Reference}.
+     *
+     * The required flag may tell converters or consumers (like {@link \Wordlift\Jsonld\Jsonld_Service} that this
+     * property needs to be output to SD (JSON-LD).
+     *
+     * @param bool $value
+     *
+     * @since 3.27.1
+     */
+    public function set_required( $value ) {
+
+        $this->required = $value;
+
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_uri, $id, $required = false, $type = Object_Type_Enum::POST ) {
+	public function __construct($entity_uri, $id, $required = false, $type = Object_Type_Enum::POST) {
 
 		$this->url      = $entity_uri;
 		$this->id       = $id;
@@ -118,7 +118,7 @@ 
 	 *
 	 * @since 3.27.1
 	 */
-	public function set_required( $value ) {
+	public function set_required($value) {
 
 		$this->required = $value;
 

src/wordlift/vocabulary/jsonld/class-post-jsonld.php

Indentation +77 added lines, -77 removed lines

@@ -11,111 +11,111 @@
 
 class Post_Jsonld {
 
-	public function enhance_post_jsonld() {
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11 );
-	}
+    public function enhance_post_jsonld() {
+        add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
+        add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11 );
+    }
 
-	public function wl_post_jsonld_array( $arr, $post_id ) {
+    public function wl_post_jsonld_array( $arr, $post_id ) {
 
-		$jsonld     = $arr['jsonld'];
-		$references = $arr['references'];
+        $jsonld     = $arr['jsonld'];
+        $references = $arr['references'];
 
-		$this->add_mentions( $post_id, $jsonld );
+        $this->add_mentions( $post_id, $jsonld );
 
-		return array(
-			'jsonld'     => $jsonld,
-			'references' => $references,
-		);
+        return array(
+            'jsonld'     => $jsonld,
+            'references' => $references,
+        );
 
-	}
+    }
 
-	public function add_mentions( $post_id, &$jsonld ) {
+    public function add_mentions( $post_id, &$jsonld ) {
 
-		$taxonomies = Terms_Compat::get_public_taxonomies();
-		$terms      = array();
+        $taxonomies = Terms_Compat::get_public_taxonomies();
+        $terms      = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			$taxonomy_terms = get_the_terms( $post_id, $taxonomy );
-			if ( ! $taxonomy_terms ) {
-				continue;
-			}
-			$terms = array_merge( $taxonomy_terms, $terms );
-		}
+        foreach ( $taxonomies as $taxonomy ) {
+            $taxonomy_terms = get_the_terms( $post_id, $taxonomy );
+            if ( ! $taxonomy_terms ) {
+                continue;
+            }
+            $terms = array_merge( $taxonomy_terms, $terms );
+        }
 
-		if ( ! $terms ) {
-			return;
-		}
+        if ( ! $terms ) {
+            return;
+        }
 
-		if ( ! array_key_exists( 'mentions', $jsonld ) && count( $terms ) > 0 ) {
-			$jsonld['mentions'] = array();
-		}
+        if ( ! array_key_exists( 'mentions', $jsonld ) && count( $terms ) > 0 ) {
+            $jsonld['mentions'] = array();
+        }
 
-		foreach ( $terms as $term ) {
+        foreach ( $terms as $term ) {
 
-			$is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
+            $is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
 
-			if ( ! $is_matched ) {
-				continue;
-			}
+            if ( ! $is_matched ) {
+                continue;
+            }
 
-			$entities = Jsonld_Utils::get_matched_entities_for_term( $term->term_id );
+            $entities = Jsonld_Utils::get_matched_entities_for_term( $term->term_id );
 
-			if ( count( $entities ) === 0 ) {
-				continue;
-			}
+            if ( count( $entities ) === 0 ) {
+                continue;
+            }
 
-			$add_additional_attrs = self::add_additional_attrs( $term, $entities );
+            $add_additional_attrs = self::add_additional_attrs( $term, $entities );
 
-			$jsonld['mentions'] = array_merge( $jsonld['mentions'], $add_additional_attrs );
-		}
+            $jsonld['mentions'] = array_merge( $jsonld['mentions'], $add_additional_attrs );
+        }
 
-	}
+    }
 
-	/**
-	 * @param $term \WP_Term
-	 * @param $entities
-	 *
-	 * @return array
-	 */
-	public static function add_additional_attrs( $term, $entities ) {
+    /**
+     * @param $term \WP_Term
+     * @param $entities
+     *
+     * @return array
+     */
+    public static function add_additional_attrs( $term, $entities ) {
 
-		return array_map(
-			function ( $entity ) use ( $term ) {
-				$entity['@id'] = get_term_link( $term->term_id ) . '#id';
-				if ( ! empty( $term->description ) ) {
-					  $entity['description'] = $term->description;
-				}
+        return array_map(
+            function ( $entity ) use ( $term ) {
+                $entity['@id'] = get_term_link( $term->term_id ) . '#id';
+                if ( ! empty( $term->description ) ) {
+                        $entity['description'] = $term->description;
+                }
 
-				return $entity;
+                return $entity;
 
-			},
-			$entities
-		);
+            },
+            $entities
+        );
 
-	}
+    }
 
-	public function wl_after_get_jsonld( $jsonld ) {
+    public function wl_after_get_jsonld( $jsonld ) {
 
-		if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
-			return $jsonld;
-		}
+        if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
+            return $jsonld;
+        }
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'Article' === $value['@type'] && isset( $value['image'] ) ) {
-				$image = $value['image'];
-			}
-			if ( 'Recipe' === $value['@type'] && ! isset( $value['image'] ) ) {
-				$index = $key;
-			}
-		}
+        foreach ( $jsonld as $key => $value ) {
+            if ( 'Article' === $value['@type'] && isset( $value['image'] ) ) {
+                $image = $value['image'];
+            }
+            if ( 'Recipe' === $value['@type'] && ! isset( $value['image'] ) ) {
+                $index = $key;
+            }
+        }
 
-		if ( isset( $index ) && ! empty( $image ) ) {
-			$jsonld[ $index ]['image'] = $image;
-		}
+        if ( isset( $index ) && ! empty( $image ) ) {
+            $jsonld[ $index ]['image'] = $image;
+        }
 
-		return $jsonld;
+        return $jsonld;
 
-	}
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -12,16 +12,16 @@ 
 class Post_Jsonld {
 
 	public function enhance_post_jsonld() {
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11 );
+		add_filter('wl_post_jsonld_array', array($this, 'wl_post_jsonld_array'), 11, 2);
+		add_filter('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 11);
 	}
 
-	public function wl_post_jsonld_array( $arr, $post_id ) {
+	public function wl_post_jsonld_array($arr, $post_id) {
 
 		$jsonld     = $arr['jsonld'];
 		$references = $arr['references'];
 
-		$this->add_mentions( $post_id, $jsonld );
+		$this->add_mentions($post_id, $jsonld);
 
 		return array(
 			'jsonld'     => $jsonld,
@@ -30,44 +30,44 @@ 
 
 	}
 
-	public function add_mentions( $post_id, &$jsonld ) {
+	public function add_mentions($post_id, &$jsonld) {
 
 		$taxonomies = Terms_Compat::get_public_taxonomies();
 		$terms      = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			$taxonomy_terms = get_the_terms( $post_id, $taxonomy );
-			if ( ! $taxonomy_terms ) {
+		foreach ($taxonomies as $taxonomy) {
+			$taxonomy_terms = get_the_terms($post_id, $taxonomy);
+			if ( ! $taxonomy_terms) {
 				continue;
 			}
-			$terms = array_merge( $taxonomy_terms, $terms );
+			$terms = array_merge($taxonomy_terms, $terms);
 		}
 
-		if ( ! $terms ) {
+		if ( ! $terms) {
 			return;
 		}
 
-		if ( ! array_key_exists( 'mentions', $jsonld ) && count( $terms ) > 0 ) {
+		if ( ! array_key_exists('mentions', $jsonld) && count($terms) > 0) {
 			$jsonld['mentions'] = array();
 		}
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 
-			$is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
+			$is_matched = intval(get_term_meta($term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true)) === 1;
 
-			if ( ! $is_matched ) {
+			if ( ! $is_matched) {
 				continue;
 			}
 
-			$entities = Jsonld_Utils::get_matched_entities_for_term( $term->term_id );
+			$entities = Jsonld_Utils::get_matched_entities_for_term($term->term_id);
 
-			if ( count( $entities ) === 0 ) {
+			if (count($entities) === 0) {
 				continue;
 			}
 
-			$add_additional_attrs = self::add_additional_attrs( $term, $entities );
+			$add_additional_attrs = self::add_additional_attrs($term, $entities);
 
-			$jsonld['mentions'] = array_merge( $jsonld['mentions'], $add_additional_attrs );
+			$jsonld['mentions'] = array_merge($jsonld['mentions'], $add_additional_attrs);
 		}
 
 	}
@@ -78,12 +78,12 @@ 
 	 *
 	 * @return array
 	 */
-	public static function add_additional_attrs( $term, $entities ) {
+	public static function add_additional_attrs($term, $entities) {
 
 		return array_map(
-			function ( $entity ) use ( $term ) {
-				$entity['@id'] = get_term_link( $term->term_id ) . '#id';
-				if ( ! empty( $term->description ) ) {
+			function($entity) use ($term) {
+				$entity['@id'] = get_term_link($term->term_id).'#id';
+				if ( ! empty($term->description)) {
 					  $entity['description'] = $term->description;
 				}
 
@@ -95,23 +95,23 @@ 
 
 	}
 
-	public function wl_after_get_jsonld( $jsonld ) {
+	public function wl_after_get_jsonld($jsonld) {
 
-		if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
+		if ( ! is_array($jsonld) || count($jsonld) === 0) {
 			return $jsonld;
 		}
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'Article' === $value['@type'] && isset( $value['image'] ) ) {
+		foreach ($jsonld as $key => $value) {
+			if ('Article' === $value['@type'] && isset($value['image'])) {
 				$image = $value['image'];
 			}
-			if ( 'Recipe' === $value['@type'] && ! isset( $value['image'] ) ) {
+			if ('Recipe' === $value['@type'] && ! isset($value['image'])) {
 				$index = $key;
 			}
 		}
 
-		if ( isset( $index ) && ! empty( $image ) ) {
-			$jsonld[ $index ]['image'] = $image;
+		if (isset($index) && ! empty($image)) {
+			$jsonld[$index]['image'] = $image;
 		}
 
 		return $jsonld;