insideout10 / wordlift-plugin

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

Indentation +256 added lines, -256 removed lines

@@ -23,261 +23,261 @@
  */
 class Wordlift_Content_Filter_Service {
 
-	/**
-	 * The pattern to find entities in text.
-	 *
-	 * @since 3.8.0
-	 */
-	const PATTERN = '/<(\\w+)[^<]*class="([^"]*)"\\sitemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * The `link by default` setting.
-	 *
-	 * @since  3.13.0
-	 * @access private
-	 * @var bool True if link by default is enabled otherwise false.
-	 */
-	private $is_link_by_default;
-
-	private $linked_entity_uris = array();
-
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-	/**
-	 * @var Object_Link_Provider
-	 */
-	private $object_link_provider;
-
-	/**
-	 * Create a {@link Wordlift_Content_Filter_Service} instance.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.8.0
-	 *
-	 */
-	protected function __construct( $entity_service, $entity_uri_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->entity_service       = $entity_service;
-		$this->entity_uri_service   = $entity_uri_service;
-		$this->object_link_provider = Object_Link_Provider::get_instance();
-
-	}
-
-	private static $instance = null;
-
-	/**
-	 * Get the {@link Wordlift_Content_Filter_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Content_Filter_Service The {@link Wordlift_Content_Filter_Service} singleton instance.
-	 * @since 3.14.2
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self( Wordlift_Entity_Service::get_instance(), Wordlift_Entity_Uri_Service::get_instance() );
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Mangle the content by adding links to the entity pages. This function is
-	 * hooked to the 'the_content' WP's filter.
-	 *
-	 * @param string $content The content being filtered.
-	 *
-	 * @return string The filtered content.
-	 * @since 3.8.0
-	 *
-	 */
-	public function the_content( $content ) {
-		$this->log->trace( "Filtering content [ " . ( is_singular() ? 'yes' : 'no' ) . " ]..." );
-
-		// Links should be added only on the front end and not for RSS.
-		if ( is_feed() || is_admin() ) {
-			return $content;
-		}
-
-		// Preload the `link by default` setting.
-		$this->is_link_by_default = Wordlift_Configuration_Service::get_instance()->is_link_by_default();
-
-		// Reset the array of of entity post ids linked from the post content.
-		// This is used to avoid linking more the once the same post.
-		$this->linked_entity_uris = array();
-
-		// Preload URIs.
-		$matches = array();
-		preg_match_all( self::PATTERN, $content, $matches );
-
-		// Bail out if there are no URIs.
-		if ( empty( $matches[3] ) ) {
-			return $content;
-		}
-
-		// Replace each match of the entity tag with the entity link. If an error
-		// occurs fail silently returning the original content.
-		return preg_replace_callback( self::PATTERN, array(
-			$this,
-			'link',
-		), $content ) ?: $content;
-	}
-
-	/**
-	 * Get the entity match and replace it with a page link.
-	 *
-	 * @param array $matches An array of matches.
-	 *
-	 * @return string The replaced text with the link to the entity page.
-	 * @since 3.8.0
-	 *
-	 */
-	private function link( $matches ) {
-
-		// Get the entity itemid URI and label.
-		$css_class = $matches[2];
-		$uri       = $matches[3];
-		$label     = $matches[4];
-
-
-		/**
-		 * If the entity is already linked, dont send query to the db.
-		 */
-		if ( $this->is_already_linked( $uri ) ) {
-			return $label;
-		}
-
-
-		$link = - 1 < strpos( $css_class, 'wl-link' );
-
-		// If the entity should not be linked and link by default is also disabled,
-		// then don't lookup the entity on the table.
-		if ( ! $this->is_link_by_default && ! $link ) {
-			return $label;
-		}
-
-		$content_service = Wordpress_Content_Service::get_instance();
-		$content         = $content_service->get_by_entity_id_or_same_as( $uri );
-
-		// If no content is found, return the label, that is _remove the annotation_.
-		if ( ! isset( $content ) ) {
-			return $label;
-		}
-
-		$object_id   = $content->get_id();
-		$object_type = $content->get_object_type_enum();
-
-
-		$no_link = - 1 < strpos( $css_class, 'wl-no-link' );
-
-		// Don't link if links are disabled and the entity is not link or the
-		// entity is do not link.
-		$dont_link = ( ! $this->is_link_by_default && ! $link ) || $no_link;
-
-		// Return the label if it's don't link.
-		if ( $dont_link ) {
-			return $label;
-		}
-
-		/**
-		 * @since 3.32.0
-		 * Object_ids are prefixed with object_type to prevent conflicts.
-		 */
-		$this->linked_entity_uris[] = $uri;
-
-		// Get the link.
-		$href = Wordlift_Post_Adapter::get_production_permalink( $object_id, $object_type );
-
-		// Bail out if the `$href` has been reset.
-		if ( empty( $href ) ) {
-			return $label;
-		}
-
-		return Link_Builder::create( $uri, $object_id )
-		                   ->label( $label )
-		                   ->href( $href )
-		                   ->generate_link();
-	}
-
-
-	/**
-	 * Get a string to be used as a title attribute in links to a post
-	 *
-	 * @param int $post_id The post id of the post being linked.
-	 * @param string $ignore_label A label to ignore.
-	 *
-	 * @return string    The title to be used in the link. An empty string when
-	 *                    there is no alternative that is not the $ignore_label.
-	 * @deprecated 3.32.0 Use object link provider to get the link title for getting link
-	 * title for different types.
-	 * @since 3.15.0
-	 *
-	 * As of 3.32.0 this method is not used anywhere in the core, this should be removed
-	 * from tests and companion plugins.
-	 *
-	 */
-	function get_link_title( $post_id, $ignore_label, $object_type = Object_Type_Enum::POST ) {
-		return $this->object_link_provider->get_link_title( $post_id, $ignore_label, $object_type );
-	}
-
-	/**
-	 * Get the entity URIs (configured in the `itemid` attribute) contained in
-	 * the provided content.
-	 *
-	 * @param string $content The content.
-	 *
-	 * @return array An array of URIs.
-	 * @since 3.14.2
-	 *
-	 */
-	public function get_entity_uris( $content ) {
-
-		$matches = array();
-		preg_match_all( Wordlift_Content_Filter_Service::PATTERN, $content, $matches );
-
-		// We need to use `array_values` here in order to avoid further `json_encode`
-		// to turn it into an object (since if the 3rd match isn't found the index
-		// is not sequential.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/646.
-		return array_values( array_unique( $matches[3] ) );
-	}
-
-
-	/**
-	 * @param $entity_uri
-	 *
-	 * @return bool
-	 */
-	private function is_already_linked( $entity_uri ) {
-		return in_array( $entity_uri, $this->linked_entity_uris );
-	}
+    /**
+     * The pattern to find entities in text.
+     *
+     * @since 3.8.0
+     */
+    const PATTERN = '/<(\\w+)[^<]*class="([^"]*)"\\sitemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * The `link by default` setting.
+     *
+     * @since  3.13.0
+     * @access private
+     * @var bool True if link by default is enabled otherwise false.
+     */
+    private $is_link_by_default;
+
+    private $linked_entity_uris = array();
+
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.16.0
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+    /**
+     * @var Object_Link_Provider
+     */
+    private $object_link_provider;
+
+    /**
+     * Create a {@link Wordlift_Content_Filter_Service} instance.
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.8.0
+     *
+     */
+    protected function __construct( $entity_service, $entity_uri_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->entity_service       = $entity_service;
+        $this->entity_uri_service   = $entity_uri_service;
+        $this->object_link_provider = Object_Link_Provider::get_instance();
+
+    }
+
+    private static $instance = null;
+
+    /**
+     * Get the {@link Wordlift_Content_Filter_Service} singleton instance.
+     *
+     * @return \Wordlift_Content_Filter_Service The {@link Wordlift_Content_Filter_Service} singleton instance.
+     * @since 3.14.2
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self( Wordlift_Entity_Service::get_instance(), Wordlift_Entity_Uri_Service::get_instance() );
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Mangle the content by adding links to the entity pages. This function is
+     * hooked to the 'the_content' WP's filter.
+     *
+     * @param string $content The content being filtered.
+     *
+     * @return string The filtered content.
+     * @since 3.8.0
+     *
+     */
+    public function the_content( $content ) {
+        $this->log->trace( "Filtering content [ " . ( is_singular() ? 'yes' : 'no' ) . " ]..." );
+
+        // Links should be added only on the front end and not for RSS.
+        if ( is_feed() || is_admin() ) {
+            return $content;
+        }
+
+        // Preload the `link by default` setting.
+        $this->is_link_by_default = Wordlift_Configuration_Service::get_instance()->is_link_by_default();
+
+        // Reset the array of of entity post ids linked from the post content.
+        // This is used to avoid linking more the once the same post.
+        $this->linked_entity_uris = array();
+
+        // Preload URIs.
+        $matches = array();
+        preg_match_all( self::PATTERN, $content, $matches );
+
+        // Bail out if there are no URIs.
+        if ( empty( $matches[3] ) ) {
+            return $content;
+        }
+
+        // Replace each match of the entity tag with the entity link. If an error
+        // occurs fail silently returning the original content.
+        return preg_replace_callback( self::PATTERN, array(
+            $this,
+            'link',
+        ), $content ) ?: $content;
+    }
+
+    /**
+     * Get the entity match and replace it with a page link.
+     *
+     * @param array $matches An array of matches.
+     *
+     * @return string The replaced text with the link to the entity page.
+     * @since 3.8.0
+     *
+     */
+    private function link( $matches ) {
+
+        // Get the entity itemid URI and label.
+        $css_class = $matches[2];
+        $uri       = $matches[3];
+        $label     = $matches[4];
+
+
+        /**
+         * If the entity is already linked, dont send query to the db.
+         */
+        if ( $this->is_already_linked( $uri ) ) {
+            return $label;
+        }
+
+
+        $link = - 1 < strpos( $css_class, 'wl-link' );
+
+        // If the entity should not be linked and link by default is also disabled,
+        // then don't lookup the entity on the table.
+        if ( ! $this->is_link_by_default && ! $link ) {
+            return $label;
+        }
+
+        $content_service = Wordpress_Content_Service::get_instance();
+        $content         = $content_service->get_by_entity_id_or_same_as( $uri );
+
+        // If no content is found, return the label, that is _remove the annotation_.
+        if ( ! isset( $content ) ) {
+            return $label;
+        }
+
+        $object_id   = $content->get_id();
+        $object_type = $content->get_object_type_enum();
+
+
+        $no_link = - 1 < strpos( $css_class, 'wl-no-link' );
+
+        // Don't link if links are disabled and the entity is not link or the
+        // entity is do not link.
+        $dont_link = ( ! $this->is_link_by_default && ! $link ) || $no_link;
+
+        // Return the label if it's don't link.
+        if ( $dont_link ) {
+            return $label;
+        }
+
+        /**
+         * @since 3.32.0
+         * Object_ids are prefixed with object_type to prevent conflicts.
+         */
+        $this->linked_entity_uris[] = $uri;
+
+        // Get the link.
+        $href = Wordlift_Post_Adapter::get_production_permalink( $object_id, $object_type );
+
+        // Bail out if the `$href` has been reset.
+        if ( empty( $href ) ) {
+            return $label;
+        }
+
+        return Link_Builder::create( $uri, $object_id )
+                            ->label( $label )
+                            ->href( $href )
+                            ->generate_link();
+    }
+
+
+    /**
+     * Get a string to be used as a title attribute in links to a post
+     *
+     * @param int $post_id The post id of the post being linked.
+     * @param string $ignore_label A label to ignore.
+     *
+     * @return string    The title to be used in the link. An empty string when
+     *                    there is no alternative that is not the $ignore_label.
+     * @deprecated 3.32.0 Use object link provider to get the link title for getting link
+     * title for different types.
+     * @since 3.15.0
+     *
+     * As of 3.32.0 this method is not used anywhere in the core, this should be removed
+     * from tests and companion plugins.
+     *
+     */
+    function get_link_title( $post_id, $ignore_label, $object_type = Object_Type_Enum::POST ) {
+        return $this->object_link_provider->get_link_title( $post_id, $ignore_label, $object_type );
+    }
+
+    /**
+     * Get the entity URIs (configured in the `itemid` attribute) contained in
+     * the provided content.
+     *
+     * @param string $content The content.
+     *
+     * @return array An array of URIs.
+     * @since 3.14.2
+     *
+     */
+    public function get_entity_uris( $content ) {
+
+        $matches = array();
+        preg_match_all( Wordlift_Content_Filter_Service::PATTERN, $content, $matches );
+
+        // We need to use `array_values` here in order to avoid further `json_encode`
+        // to turn it into an object (since if the 3rd match isn't found the index
+        // is not sequential.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/646.
+        return array_values( array_unique( $matches[3] ) );
+    }
+
+
+    /**
+     * @param $entity_uri
+     *
+     * @return bool
+     */
+    private function is_already_linked( $entity_uri ) {
+        return in_array( $entity_uri, $this->linked_entity_uris );
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -81,9 +81,9 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	protected function __construct( $entity_service, $entity_uri_service ) {
+	protected function __construct($entity_service, $entity_uri_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->entity_service       = $entity_service;
 		$this->entity_uri_service   = $entity_uri_service;
@@ -101,8 +101,8 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self( Wordlift_Entity_Service::get_instance(), Wordlift_Entity_Uri_Service::get_instance() );
+		if ( ! isset(self::$instance)) {
+			self::$instance = new self(Wordlift_Entity_Service::get_instance(), Wordlift_Entity_Uri_Service::get_instance());
 		}
 
 		return self::$instance;
@@ -118,11 +118,11 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	public function the_content( $content ) {
-		$this->log->trace( "Filtering content [ " . ( is_singular() ? 'yes' : 'no' ) . " ]..." );
+	public function the_content($content) {
+		$this->log->trace("Filtering content [ ".(is_singular() ? 'yes' : 'no')." ]...");
 
 		// Links should be added only on the front end and not for RSS.
-		if ( is_feed() || is_admin() ) {
+		if (is_feed() || is_admin()) {
 			return $content;
 		}
 
@@ -135,19 +135,19 @@ 
 
 		// Preload URIs.
 		$matches = array();
-		preg_match_all( self::PATTERN, $content, $matches );
+		preg_match_all(self::PATTERN, $content, $matches);
 
 		// Bail out if there are no URIs.
-		if ( empty( $matches[3] ) ) {
+		if (empty($matches[3])) {
 			return $content;
 		}
 
 		// Replace each match of the entity tag with the entity link. If an error
 		// occurs fail silently returning the original content.
-		return preg_replace_callback( self::PATTERN, array(
+		return preg_replace_callback(self::PATTERN, array(
 			$this,
 			'link',
-		), $content ) ?: $content;
+		), $content) ?: $content;
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	private function link( $matches ) {
+	private function link($matches) {
 
 		// Get the entity itemid URI and label.
 		$css_class = $matches[2];
@@ -170,24 +170,24 @@ 
 		/**
 		 * If the entity is already linked, dont send query to the db.
 		 */
-		if ( $this->is_already_linked( $uri ) ) {
+		if ($this->is_already_linked($uri)) {
 			return $label;
 		}
 
 
-		$link = - 1 < strpos( $css_class, 'wl-link' );
+		$link = - 1 < strpos($css_class, 'wl-link');
 
 		// If the entity should not be linked and link by default is also disabled,
 		// then don't lookup the entity on the table.
-		if ( ! $this->is_link_by_default && ! $link ) {
+		if ( ! $this->is_link_by_default && ! $link) {
 			return $label;
 		}
 
 		$content_service = Wordpress_Content_Service::get_instance();
-		$content         = $content_service->get_by_entity_id_or_same_as( $uri );
+		$content         = $content_service->get_by_entity_id_or_same_as($uri);
 
 		// If no content is found, return the label, that is _remove the annotation_.
-		if ( ! isset( $content ) ) {
+		if ( ! isset($content)) {
 			return $label;
 		}
 
@@ -195,14 +195,14 @@ 
 		$object_type = $content->get_object_type_enum();
 
 
-		$no_link = - 1 < strpos( $css_class, 'wl-no-link' );
+		$no_link = - 1 < strpos($css_class, 'wl-no-link');
 
 		// Don't link if links are disabled and the entity is not link or the
 		// entity is do not link.
-		$dont_link = ( ! $this->is_link_by_default && ! $link ) || $no_link;
+		$dont_link = ( ! $this->is_link_by_default && ! $link) || $no_link;
 
 		// Return the label if it's don't link.
-		if ( $dont_link ) {
+		if ($dont_link) {
 			return $label;
 		}
 
@@ -213,16 +213,16 @@ 
 		$this->linked_entity_uris[] = $uri;
 
 		// Get the link.
-		$href = Wordlift_Post_Adapter::get_production_permalink( $object_id, $object_type );
+		$href = Wordlift_Post_Adapter::get_production_permalink($object_id, $object_type);
 
 		// Bail out if the `$href` has been reset.
-		if ( empty( $href ) ) {
+		if (empty($href)) {
 			return $label;
 		}
 
-		return Link_Builder::create( $uri, $object_id )
-		                   ->label( $label )
-		                   ->href( $href )
+		return Link_Builder::create($uri, $object_id)
+		                   ->label($label)
+		                   ->href($href)
 		                   ->generate_link();
 	}
 
@@ -243,8 +243,8 @@ 
 	 * from tests and companion plugins.
 	 *
 	 */
-	function get_link_title( $post_id, $ignore_label, $object_type = Object_Type_Enum::POST ) {
-		return $this->object_link_provider->get_link_title( $post_id, $ignore_label, $object_type );
+	function get_link_title($post_id, $ignore_label, $object_type = Object_Type_Enum::POST) {
+		return $this->object_link_provider->get_link_title($post_id, $ignore_label, $object_type);
 	}
 
 	/**
@@ -257,17 +257,17 @@ 
 	 * @since 3.14.2
 	 *
 	 */
-	public function get_entity_uris( $content ) {
+	public function get_entity_uris($content) {
 
 		$matches = array();
-		preg_match_all( Wordlift_Content_Filter_Service::PATTERN, $content, $matches );
+		preg_match_all(Wordlift_Content_Filter_Service::PATTERN, $content, $matches);
 
 		// We need to use `array_values` here in order to avoid further `json_encode`
 		// to turn it into an object (since if the 3rd match isn't found the index
 		// is not sequential.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/646.
-		return array_values( array_unique( $matches[3] ) );
+		return array_values(array_unique($matches[3]));
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_already_linked( $entity_uri ) {
-		return in_array( $entity_uri, $this->linked_entity_uris );
+	private function is_already_linked($entity_uri) {
+		return in_array($entity_uri, $this->linked_entity_uris);
 	}
 
 }

src/wordlift/entity/class-entity-uri-generator.php

Indentation +39 added lines, -39 removed lines

@@ -8,57 +8,57 @@
 
 class Entity_Uri_Generator {
 
-	public static function create_uri( $object_type_enum, $id ) {
+    public static function create_uri( $object_type_enum, $id ) {
 
-		switch ( $object_type_enum ) {
-			case Object_Type_Enum::POST:
-				$post = get_post( $id );
-				if ( ! isset( $post ) || in_array( $post->post_status, array( 'auto-draft', 'inherit' ) ) ) {
-					return null;
-				}
+        switch ( $object_type_enum ) {
+            case Object_Type_Enum::POST:
+                $post = get_post( $id );
+                if ( ! isset( $post ) || in_array( $post->post_status, array( 'auto-draft', 'inherit' ) ) ) {
+                    return null;
+                }
 
-				$slug = $post->post_name ?: sanitize_title( $post->post_title ) . '-' . $post->ID;
+                $slug = $post->post_name ?: sanitize_title( $post->post_title ) . '-' . $post->ID;
 
-				return self::ensure_unique( $post->post_type . '/' . $slug );
+                return self::ensure_unique( $post->post_type . '/' . $slug );
 
-			case Object_Type_Enum::TERM:
-				$term = get_term( $id );
-				if ( ! is_a( $term, 'WP_Term' ) ) {
-					return null;
-				}
+            case Object_Type_Enum::TERM:
+                $term = get_term( $id );
+                if ( ! is_a( $term, 'WP_Term' ) ) {
+                    return null;
+                }
 
-				return self::ensure_unique( $term->taxonomy . '/' . $term->slug );
+                return self::ensure_unique( $term->taxonomy . '/' . $term->slug );
 
-			case Object_Type_Enum::USER:
-				$user = get_user_by( 'id', $id );
+            case Object_Type_Enum::USER:
+                $user = get_user_by( 'id', $id );
 
-				if ( ! is_a( $user, 'WP_User' ) ) {
-					return null;
-				}
+                if ( ! is_a( $user, 'WP_User' ) ) {
+                    return null;
+                }
 
-				return self::ensure_unique( 'user/' . $user->user_nicename );
+                return self::ensure_unique( 'user/' . $user->user_nicename );
 
-			default:
-		}
+            default:
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	private static function ensure_unique( $rel_uri ) {
-		for ( $try_rel_uri = $rel_uri, $i = 2; $i < 100; $i ++ ) {
-			$content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $try_rel_uri );
-			if ( ! isset( $content ) ) {
-				return $try_rel_uri;
-			}
+    /**
+     * @throws Exception
+     */
+    private static function ensure_unique( $rel_uri ) {
+        for ( $try_rel_uri = $rel_uri, $i = 2; $i < 100; $i ++ ) {
+            $content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $try_rel_uri );
+            if ( ! isset( $content ) ) {
+                return $try_rel_uri;
+            }
 
-			$try_rel_uri = $rel_uri . '-' . $i;
-		}
+            $try_rel_uri = $rel_uri . '-' . $i;
+        }
 
-		// Giving up.
-		return $rel_uri . '-' . uniqid();
-	}
+        // Giving up.
+        return $rel_uri . '-' . uniqid();
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -8,35 +8,35 @@ 
 
 class Entity_Uri_Generator {
 
-	public static function create_uri( $object_type_enum, $id ) {
+	public static function create_uri($object_type_enum, $id) {
 
-		switch ( $object_type_enum ) {
+		switch ($object_type_enum) {
 			case Object_Type_Enum::POST:
-				$post = get_post( $id );
-				if ( ! isset( $post ) || in_array( $post->post_status, array( 'auto-draft', 'inherit' ) ) ) {
+				$post = get_post($id);
+				if ( ! isset($post) || in_array($post->post_status, array('auto-draft', 'inherit'))) {
 					return null;
 				}
 
-				$slug = $post->post_name ?: sanitize_title( $post->post_title ) . '-' . $post->ID;
+				$slug = $post->post_name ?: sanitize_title($post->post_title).'-'.$post->ID;
 
-				return self::ensure_unique( $post->post_type . '/' . $slug );
+				return self::ensure_unique($post->post_type.'/'.$slug);
 
 			case Object_Type_Enum::TERM:
-				$term = get_term( $id );
-				if ( ! is_a( $term, 'WP_Term' ) ) {
+				$term = get_term($id);
+				if ( ! is_a($term, 'WP_Term')) {
 					return null;
 				}
 
-				return self::ensure_unique( $term->taxonomy . '/' . $term->slug );
+				return self::ensure_unique($term->taxonomy.'/'.$term->slug);
 
 			case Object_Type_Enum::USER:
-				$user = get_user_by( 'id', $id );
+				$user = get_user_by('id', $id);
 
-				if ( ! is_a( $user, 'WP_User' ) ) {
+				if ( ! is_a($user, 'WP_User')) {
 					return null;
 				}
 
-				return self::ensure_unique( 'user/' . $user->user_nicename );
+				return self::ensure_unique('user/'.$user->user_nicename);
 
 			default:
 		}
@@ -47,18 +47,18 @@ 
 	/**
 	 * @throws Exception
 	 */
-	private static function ensure_unique( $rel_uri ) {
-		for ( $try_rel_uri = $rel_uri, $i = 2; $i < 100; $i ++ ) {
-			$content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $try_rel_uri );
-			if ( ! isset( $content ) ) {
+	private static function ensure_unique($rel_uri) {
+		for ($try_rel_uri = $rel_uri, $i = 2; $i < 100; $i++) {
+			$content = Wordpress_Content_Service::get_instance()->get_by_entity_id($try_rel_uri);
+			if ( ! isset($content)) {
 				return $try_rel_uri;
 			}
 
-			$try_rel_uri = $rel_uri . '-' . $i;
+			$try_rel_uri = $rel_uri.'-'.$i;
 		}
 
 		// Giving up.
-		return $rel_uri . '-' . uniqid();
+		return $rel_uri.'-'.uniqid();
 	}
 
 }

src/wordlift/cache/class-ttl-cache.php

Indentation +157 added lines, -157 removed lines

@@ -17,177 +17,177 @@
 // @@todo: add a hook to clear the cached files now and then.
 class Ttl_Cache {
 
-	/**
-	 * The cache name.
-	 *
-	 * @var string $name The cache name.
-	 * @access private
-	 * @since 3.21.2
-	 */
-	private $name;
-
-	/**
-	 * The TTL of cached responses in seconds.
-	 *
-	 * @var int $ttl The TTL in seconds.
-	 * @access private
-	 * @since 3.21.2
-	 */
-	private $ttl;
-
-	/**
-	 * The cache dir where the cached data is written.
-	 *
-	 * @since 3.21.2
-	 * @access private
-	 * @var string $cache_dir The cache dir where the cached responses are written.
-	 */
-	private $cache_dir;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 * @access private
-	 * @since 3.21.2
-	 */
-	private $log;
-
-	/**
-	 * @var array
-	 */
-	private static $caches = array();
-
-	/**
-	 * Create a {@link Ttl_Cache} with the specified TTL, default 900 secs.
-	 *
-	 * @param string $name The cache name.
-	 * @param int $ttl The cache TTL, default 900 secs.
-	 *
-	 * @since 3.21.2
-	 */
-	public function __construct( $name, $ttl = 900 ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->name = $name;
-		$this->ttl  = $ttl;
-
-		$this->cache_dir = self::get_cache_folder() . DIRECTORY_SEPARATOR . md5( $name );
-
-		$this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
-		wp_mkdir_p( $this->cache_dir );
-
-		self::$caches[ $name ] = $this;
-
-	}
-
-	/**
-	 * Get the root cache folder.
-	 *
-	 * This is useful to introduce a cache cleaning procedure which will scan and delete older stale cache files.
-	 *
-	 * @return string The root cache folder.
-	 * @since 3.22.5
-	 */
-	public static function get_cache_folder() {
-
-		// Get the temp dir and add the directory separator if missing.
-		$temp_dir = get_temp_dir();
-		if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
-			$temp_dir .= DIRECTORY_SEPARATOR;
-		}
-
-		return $temp_dir . 'wl.cache' . DIRECTORY_SEPARATOR . md5( home_url() );
-	}
-
-	/**
-	 * Get the cached data for the specified key.
-	 *
-	 * @param mixed $key A serializable key.
-	 *
-	 * @return mixed|null
-	 * @since 3.21.2
-	 */
-	public function get( $key ) {
-
-		$filename = $this->get_filename( $key );
-
-		// If the cache file exists and it's not too old, then return it.
-		if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
-			$this->log->trace( "Cache HIT.\n" );
-
-			return json_decode( file_get_contents( $filename ), true );
-		}
-
-		$this->log->trace( "Cache MISS, filename $filename." );
-
-		return null;
-	}
-
-	public function put( $key, $data ) {
-
-		$filename = $this->get_filename( $key );
-
-		// Cache.
-		if ( file_exists( $filename ) ) {
-			@unlink( $filename );
-		}
-		@file_put_contents( $filename, wp_json_encode( $data ) );
+    /**
+     * The cache name.
+     *
+     * @var string $name The cache name.
+     * @access private
+     * @since 3.21.2
+     */
+    private $name;
+
+    /**
+     * The TTL of cached responses in seconds.
+     *
+     * @var int $ttl The TTL in seconds.
+     * @access private
+     * @since 3.21.2
+     */
+    private $ttl;
+
+    /**
+     * The cache dir where the cached data is written.
+     *
+     * @since 3.21.2
+     * @access private
+     * @var string $cache_dir The cache dir where the cached responses are written.
+     */
+    private $cache_dir;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     * @access private
+     * @since 3.21.2
+     */
+    private $log;
+
+    /**
+     * @var array
+     */
+    private static $caches = array();
+
+    /**
+     * Create a {@link Ttl_Cache} with the specified TTL, default 900 secs.
+     *
+     * @param string $name The cache name.
+     * @param int $ttl The cache TTL, default 900 secs.
+     *
+     * @since 3.21.2
+     */
+    public function __construct( $name, $ttl = 900 ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->name = $name;
+        $this->ttl  = $ttl;
+
+        $this->cache_dir = self::get_cache_folder() . DIRECTORY_SEPARATOR . md5( $name );
+
+        $this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
+        wp_mkdir_p( $this->cache_dir );
+
+        self::$caches[ $name ] = $this;
+
+    }
+
+    /**
+     * Get the root cache folder.
+     *
+     * This is useful to introduce a cache cleaning procedure which will scan and delete older stale cache files.
+     *
+     * @return string The root cache folder.
+     * @since 3.22.5
+     */
+    public static function get_cache_folder() {
+
+        // Get the temp dir and add the directory separator if missing.
+        $temp_dir = get_temp_dir();
+        if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
+            $temp_dir .= DIRECTORY_SEPARATOR;
+        }
+
+        return $temp_dir . 'wl.cache' . DIRECTORY_SEPARATOR . md5( home_url() );
+    }
+
+    /**
+     * Get the cached data for the specified key.
+     *
+     * @param mixed $key A serializable key.
+     *
+     * @return mixed|null
+     * @since 3.21.2
+     */
+    public function get( $key ) {
+
+        $filename = $this->get_filename( $key );
+
+        // If the cache file exists and it's not too old, then return it.
+        if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
+            $this->log->trace( "Cache HIT.\n" );
+
+            return json_decode( file_get_contents( $filename ), true );
+        }
+
+        $this->log->trace( "Cache MISS, filename $filename." );
+
+        return null;
+    }
+
+    public function put( $key, $data ) {
+
+        $filename = $this->get_filename( $key );
+
+        // Cache.
+        if ( file_exists( $filename ) ) {
+            @unlink( $filename );
+        }
+        @file_put_contents( $filename, wp_json_encode( $data ) );
 
-	}
-
-	public function delete( $key ) {
+    }
+
+    public function delete( $key ) {
 
-		$filename = $this->get_filename( $key );
+        $filename = $this->get_filename( $key );
 
-		// Delete.
-		if ( file_exists( $filename ) ) {
-			@unlink( $filename );
-		}
+        // Delete.
+        if ( file_exists( $filename ) ) {
+            @unlink( $filename );
+        }
 
-	}
+    }
 
-	public function flush() {
+    public function flush() {
 
-		$files = glob( $this->cache_dir . DIRECTORY_SEPARATOR . '*' );
-		foreach ( $files as $file ) { // iterate files
-			if ( is_file( $file ) ) {
-				@unlink( $file );
-			}
-		}
+        $files = glob( $this->cache_dir . DIRECTORY_SEPARATOR . '*' );
+        foreach ( $files as $file ) { // iterate files
+            if ( is_file( $file ) ) {
+                @unlink( $file );
+            }
+        }
 
-	}
+    }
 
-	public static function flush_all() {
+    public static function flush_all() {
 
-		/** @var Ttl_Cache $cache */
-		foreach ( self::$caches as $cache ) {
-			$cache->flush();
-		}
+        /** @var Ttl_Cache $cache */
+        foreach ( self::$caches as $cache ) {
+            $cache->flush();
+        }
 
-	}
+    }
 
-	/**
-	 * Get the full path for the given `$hash`. The file is not checked for its existence.
-	 *
-	 * @param string $hash A file hash.
-	 *
-	 * @return string The full path to the file.
-	 * @since 3.21.2
-	 */
-	private function get_path( $hash ) {
+    /**
+     * Get the full path for the given `$hash`. The file is not checked for its existence.
+     *
+     * @param string $hash A file hash.
+     *
+     * @return string The full path to the file.
+     * @since 3.21.2
+     */
+    private function get_path( $hash ) {
 
-		return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
-	}
+        return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
+    }
 
-	private function get_filename( $key ) {
+    private function get_filename( $key ) {
 
-		// Create a hash and a path to the cache file.
-		$hash     = md5( json_encode( $key ) );
-		$filename = $this->get_path( $hash );
+        // Create a hash and a path to the cache file.
+        $hash     = md5( json_encode( $key ) );
+        $filename = $this->get_path( $hash );
 
-		return $filename;
-	}
+        return $filename;
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -66,19 +66,19 @@ 
 	 *
 	 * @since 3.21.2
 	 */
-	public function __construct( $name, $ttl = 900 ) {
+	public function __construct($name, $ttl = 900) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->name = $name;
 		$this->ttl  = $ttl;
 
-		$this->cache_dir = self::get_cache_folder() . DIRECTORY_SEPARATOR . md5( $name );
+		$this->cache_dir = self::get_cache_folder().DIRECTORY_SEPARATOR.md5($name);
 
-		$this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
-		wp_mkdir_p( $this->cache_dir );
+		$this->log->trace("Creating the cache folder {$this->cache_dir}...");
+		wp_mkdir_p($this->cache_dir);
 
-		self::$caches[ $name ] = $this;
+		self::$caches[$name] = $this;
 
 	}
 
@@ -94,11 +94,11 @@ 
 
 		// Get the temp dir and add the directory separator if missing.
 		$temp_dir = get_temp_dir();
-		if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
+		if (DIRECTORY_SEPARATOR !== substr($temp_dir, - strlen(DIRECTORY_SEPARATOR))) {
 			$temp_dir .= DIRECTORY_SEPARATOR;
 		}
 
-		return $temp_dir . 'wl.cache' . DIRECTORY_SEPARATOR . md5( home_url() );
+		return $temp_dir.'wl.cache'.DIRECTORY_SEPARATOR.md5(home_url());
 	}
 
 	/**
@@ -109,51 +109,51 @@ 
 	 * @return mixed|null
 	 * @since 3.21.2
 	 */
-	public function get( $key ) {
+	public function get($key) {
 
-		$filename = $this->get_filename( $key );
+		$filename = $this->get_filename($key);
 
 		// If the cache file exists and it's not too old, then return it.
-		if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
-			$this->log->trace( "Cache HIT.\n" );
+		if (file_exists($filename) && $this->ttl >= time() - filemtime($filename)) {
+			$this->log->trace("Cache HIT.\n");
 
-			return json_decode( file_get_contents( $filename ), true );
+			return json_decode(file_get_contents($filename), true);
 		}
 
-		$this->log->trace( "Cache MISS, filename $filename." );
+		$this->log->trace("Cache MISS, filename $filename.");
 
 		return null;
 	}
 
-	public function put( $key, $data ) {
+	public function put($key, $data) {
 
-		$filename = $this->get_filename( $key );
+		$filename = $this->get_filename($key);
 
 		// Cache.
-		if ( file_exists( $filename ) ) {
-			@unlink( $filename );
+		if (file_exists($filename)) {
+			@unlink($filename);
 		}
-		@file_put_contents( $filename, wp_json_encode( $data ) );
+		@file_put_contents($filename, wp_json_encode($data));
 
 	}
 
-	public function delete( $key ) {
+	public function delete($key) {
 
-		$filename = $this->get_filename( $key );
+		$filename = $this->get_filename($key);
 
 		// Delete.
-		if ( file_exists( $filename ) ) {
-			@unlink( $filename );
+		if (file_exists($filename)) {
+			@unlink($filename);
 		}
 
 	}
 
 	public function flush() {
 
-		$files = glob( $this->cache_dir . DIRECTORY_SEPARATOR . '*' );
-		foreach ( $files as $file ) { // iterate files
-			if ( is_file( $file ) ) {
-				@unlink( $file );
+		$files = glob($this->cache_dir.DIRECTORY_SEPARATOR.'*');
+		foreach ($files as $file) { // iterate files
+			if (is_file($file)) {
+				@unlink($file);
 			}
 		}
 
@@ -162,7 +162,7 @@ 
 	public static function flush_all() {
 
 		/** @var Ttl_Cache $cache */
-		foreach ( self::$caches as $cache ) {
+		foreach (self::$caches as $cache) {
 			$cache->flush();
 		}
 
@@ -176,16 +176,16 @@ 
 	 * @return string The full path to the file.
 	 * @since 3.21.2
 	 */
-	private function get_path( $hash ) {
+	private function get_path($hash) {
 
-		return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
+		return $this->cache_dir.DIRECTORY_SEPARATOR.$hash;
 	}
 
-	private function get_filename( $key ) {
+	private function get_filename($key) {
 
 		// Create a hash and a path to the cache file.
-		$hash     = md5( json_encode( $key ) );
-		$filename = $this->get_path( $hash );
+		$hash     = md5(json_encode($key));
+		$filename = $this->get_path($hash);
 
 		return $filename;
 	}

src/wordlift/dataset/class-sync-service.php

Indentation +244 added lines, -244 removed lines

@@ -8,251 +8,251 @@
 use Wordlift\Object_Type_Enum;
 
 class Sync_Service {
-	const JSONLD_HASH = 'jsonld_hash';
-	const SYNCED_GMT = 'synced_gmt';
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * @var Api_Service
-	 */
-	private $api_service;
-
-	/**
-	 * @var Jsonld_Service
-	 */
-	private $jsonld_service;
-
-	/**
-	 * @var Sync_Background_Process
-	 */
-	private $sync_background_process;
-
-	/**
-	 * The number of posts processed in one call.
-	 *
-	 * @var int The batch size.
-	 */
-	private $batch_size;
-
-	/**
-	 * @var Sync_Object_Adapter_Factory
-	 */
-	private $sync_object_adapter_factory;
-
-	/**
-	 * @var Sync_Service
-	 */
-	private static $instance;
-	private $entity_service;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Api_Service $api_service The {@link Api_Service} used to communicate with the remote APIs.
-	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
-	 * @param Jsonld_Service $jsonld_service
-	 * @param \Wordlift_Entity_Service $entity_service
-	 */
-	public function __construct( $api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service ) {
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->api_service                 = $api_service;
-		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
-		$this->jsonld_service              = $jsonld_service;
-		$this->entity_service              = $entity_service;
-		$this->batch_size                  = 10;
-
-		// You need to initialize this early, otherwise the Background Process isn't registered in AJAX calls.
+    const JSONLD_HASH = 'jsonld_hash';
+    const SYNCED_GMT = 'synced_gmt';
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * @var Api_Service
+     */
+    private $api_service;
+
+    /**
+     * @var Jsonld_Service
+     */
+    private $jsonld_service;
+
+    /**
+     * @var Sync_Background_Process
+     */
+    private $sync_background_process;
+
+    /**
+     * The number of posts processed in one call.
+     *
+     * @var int The batch size.
+     */
+    private $batch_size;
+
+    /**
+     * @var Sync_Object_Adapter_Factory
+     */
+    private $sync_object_adapter_factory;
+
+    /**
+     * @var Sync_Service
+     */
+    private static $instance;
+    private $entity_service;
+
+    /**
+     * Constructor.
+     *
+     * @param Api_Service $api_service The {@link Api_Service} used to communicate with the remote APIs.
+     * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
+     * @param Jsonld_Service $jsonld_service
+     * @param \Wordlift_Entity_Service $entity_service
+     */
+    public function __construct( $api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service ) {
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->api_service                 = $api_service;
+        $this->sync_object_adapter_factory = $sync_object_adapter_factory;
+        $this->jsonld_service              = $jsonld_service;
+        $this->entity_service              = $entity_service;
+        $this->batch_size                  = 10;
+
+        // You need to initialize this early, otherwise the Background Process isn't registered in AJAX calls.
 //		$this->sync_background_process = new Sync_Background_Process( $this );;
 
-		// Exclude the JSONLD_HASH meta key from those that require a resync.
-		add_filter( 'wl_dataset__sync_hooks__ignored_meta_keys', function ( $args ) {
-			$args[] = Sync_Service::JSONLD_HASH;
-			$args[] = Sync_Service::SYNCED_GMT;
-
-			return $args;
-		} );
-
-		self::$instance = $this;
-	}
-
-	public static function get_instance() {
-		return self::$instance;
-	}
-
-	/**
-	 * @param int $type
-	 * @param int $object_id
-	 *
-	 * @return array|false
-	 * @throws Exception
-	 */
-	public function sync_one( $type, $object_id ) {
-
-		$object = $this->sync_object_adapter_factory->create( $type, $object_id );
-
-		return $this->sync_many( array( $object ) );
-	}
-
-	/**
-	 * @param $type string Post or User.
-	 * @param $object_id  int Post or User id
-	 * @param $uri string Entity uri , This needs to be supplied before deletion, if we
-	 * get it from meta it might not be available.
-	 *
-	 * @return bool
-	 */
-	public function delete_one( $type, $object_id, $uri ) {
-		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
-			return false;
-		}
-
-		$response = $this->api_service->request(
-			'DELETE', sprintf( '/middleware/dataset?uri=%s', rawurlencode( $uri ) ) );
-
-
-		// Update the sync date in case of success, otherwise log an error.
-		if ( ! $response->is_success() ) {
-			return false;
-		}
-
-		/**
-		 * Allow 3rd parties to run additional sync work.
-		 */
-		do_action( 'wl_sync__delete_one', $type, $object_id, $uri );
-
-		return true;
-	}
-
-	/**
-	 * @param Sync_Object_Adapter[] $objects
-	 * @param bool $force Force synchronization even if the json-ld hash hasn't changed.
-	 *
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function sync_many( $objects, $force = false ) {
-
-		$hashes   = array();
-		$payloads = array();
-		/** @var Sync_Object_Adapter $object */
-		foreach ( $objects as $object ) {
-			// Bail out if no payload.
-			$payload_as_string = $this->get_payload_as_string( $object );
-			if ( empty( $payload_as_string ) ) {
-				continue;
-			}
-			$new_hash = sha1( $payload_as_string );
-			$old_hash = $object->get_value( self::JSONLD_HASH );
-
-			// JSON-LD hasn't changed, bail out.
-			$should_sync = $force || $new_hash !== $old_hash;
-			if ( ! apply_filters( 'wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string ) ) {
-				continue;
-			}
-
-			// Collect the hashes and the payloads.
-			$hashes[]   = array( $object, $new_hash, $payload_as_string );
-			$payloads[] = $payload_as_string;
-		}
-
-		// Bail out if payloads are empty.
-		if ( empty( $payloads ) ) {
-			return false;
-		}
-
-		$blocking = apply_filters( 'wl_feature__enable__sync-blocking', false );
-		$response = $this->api_service->request(
-			'POST', '/middleware/dataset/batch',
-			array( 'Content-Type' => 'application/json', ),
-			// Put the payload in a JSON array w/o decoding/encoding again.
-			'[ ' . implode( ', ', $payloads ) . ' ]',
-			$blocking ? 60 : 0.001,
-			null,
-			array( 'blocking' => $blocking ) );
-
-		// Update the sync date in case of success, otherwise log an error.
-		if ( $blocking && ! $response->is_success() ) {
-			return false;
-		}
-
-		// If successful update the hashes and sync datetime.
-		foreach ( $hashes as $hash ) {
-			$object   = $hash[0];
-			$new_hash = $hash[1];
-
-			$object->set_values( array(
-				self::JSONLD_HASH => $new_hash,
-				self::SYNCED_GMT  => current_time( 'mysql', true ),
-			) );
-		}
-
-
-		/**
-		 * Allow 3rd parties to run additional sync work.
-		 */
-		do_action( 'wl_sync__sync_many', $hashes );
-
-		return true;
-	}
-
-	/**
-	 * @param Sync_Object_Adapter $object
-	 *
-	 * @return false|string
-	 * @throws Exception
-	 */
-	private function get_payload_as_string( $object ) {
-		$type             = $object->get_type();
-		$object_id        = $object->get_object_id();
-		$jsonld_as_string = wp_json_encode( apply_filters( 'wl_dataset__sync_service__sync_item__jsonld',
-			$this->jsonld_service->get( $type, $object_id ), $type, $object_id ), 64 ); // JSON_UNESCAPED_SLASHES
-		$uri              = $this->entity_service->get_uri( $object_id, $type );
-
-		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
-			return false;
-		}
-
-		return wp_json_encode( array(
-			'uri'     => $uri,
-			'model'   => $jsonld_as_string,
-			'private' => ! $object->is_public(),
-		), 64 ); // JSON_UNESCAPED_SLASHES
-	}
-
-	/**
-	 * @param $post_id
-	 *
-	 * @todo Complete the delete item.
-	 */
-	public function delete_item( $post_id ) {
-		$uri = $this->entity_service->get_uri( $post_id, Object_Type_Enum::POST );
-
-		if ( ! isset( $uri ) ) {
-			return;
-		}
-
-		// Make a request to the remote endpoint.
-		$response = $this->api_service->request(
-			'DELETE', '/middleware/dataset?uri=' . rawurlencode( $uri ),
-			array( 'Content-Type' => 'application/ld+json', ) );
-
-	}
-
-	public function get_batch_size() {
-
-		return $this->batch_size;
-	}
-
-	public function delete_all() {
-		$this->api_service->request( 'DELETE', '/middleware/dataset/all' );
-	}
+        // Exclude the JSONLD_HASH meta key from those that require a resync.
+        add_filter( 'wl_dataset__sync_hooks__ignored_meta_keys', function ( $args ) {
+            $args[] = Sync_Service::JSONLD_HASH;
+            $args[] = Sync_Service::SYNCED_GMT;
+
+            return $args;
+        } );
+
+        self::$instance = $this;
+    }
+
+    public static function get_instance() {
+        return self::$instance;
+    }
+
+    /**
+     * @param int $type
+     * @param int $object_id
+     *
+     * @return array|false
+     * @throws Exception
+     */
+    public function sync_one( $type, $object_id ) {
+
+        $object = $this->sync_object_adapter_factory->create( $type, $object_id );
+
+        return $this->sync_many( array( $object ) );
+    }
+
+    /**
+     * @param $type string Post or User.
+     * @param $object_id  int Post or User id
+     * @param $uri string Entity uri , This needs to be supplied before deletion, if we
+     * get it from meta it might not be available.
+     *
+     * @return bool
+     */
+    public function delete_one( $type, $object_id, $uri ) {
+        // Entity URL isn't set, bail out.
+        if ( empty( $uri ) ) {
+            return false;
+        }
+
+        $response = $this->api_service->request(
+            'DELETE', sprintf( '/middleware/dataset?uri=%s', rawurlencode( $uri ) ) );
+
+
+        // Update the sync date in case of success, otherwise log an error.
+        if ( ! $response->is_success() ) {
+            return false;
+        }
+
+        /**
+         * Allow 3rd parties to run additional sync work.
+         */
+        do_action( 'wl_sync__delete_one', $type, $object_id, $uri );
+
+        return true;
+    }
+
+    /**
+     * @param Sync_Object_Adapter[] $objects
+     * @param bool $force Force synchronization even if the json-ld hash hasn't changed.
+     *
+     * @return bool
+     * @throws Exception
+     */
+    public function sync_many( $objects, $force = false ) {
+
+        $hashes   = array();
+        $payloads = array();
+        /** @var Sync_Object_Adapter $object */
+        foreach ( $objects as $object ) {
+            // Bail out if no payload.
+            $payload_as_string = $this->get_payload_as_string( $object );
+            if ( empty( $payload_as_string ) ) {
+                continue;
+            }
+            $new_hash = sha1( $payload_as_string );
+            $old_hash = $object->get_value( self::JSONLD_HASH );
+
+            // JSON-LD hasn't changed, bail out.
+            $should_sync = $force || $new_hash !== $old_hash;
+            if ( ! apply_filters( 'wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string ) ) {
+                continue;
+            }
+
+            // Collect the hashes and the payloads.
+            $hashes[]   = array( $object, $new_hash, $payload_as_string );
+            $payloads[] = $payload_as_string;
+        }
+
+        // Bail out if payloads are empty.
+        if ( empty( $payloads ) ) {
+            return false;
+        }
+
+        $blocking = apply_filters( 'wl_feature__enable__sync-blocking', false );
+        $response = $this->api_service->request(
+            'POST', '/middleware/dataset/batch',
+            array( 'Content-Type' => 'application/json', ),
+            // Put the payload in a JSON array w/o decoding/encoding again.
+            '[ ' . implode( ', ', $payloads ) . ' ]',
+            $blocking ? 60 : 0.001,
+            null,
+            array( 'blocking' => $blocking ) );
+
+        // Update the sync date in case of success, otherwise log an error.
+        if ( $blocking && ! $response->is_success() ) {
+            return false;
+        }
+
+        // If successful update the hashes and sync datetime.
+        foreach ( $hashes as $hash ) {
+            $object   = $hash[0];
+            $new_hash = $hash[1];
+
+            $object->set_values( array(
+                self::JSONLD_HASH => $new_hash,
+                self::SYNCED_GMT  => current_time( 'mysql', true ),
+            ) );
+        }
+
+
+        /**
+         * Allow 3rd parties to run additional sync work.
+         */
+        do_action( 'wl_sync__sync_many', $hashes );
+
+        return true;
+    }
+
+    /**
+     * @param Sync_Object_Adapter $object
+     *
+     * @return false|string
+     * @throws Exception
+     */
+    private function get_payload_as_string( $object ) {
+        $type             = $object->get_type();
+        $object_id        = $object->get_object_id();
+        $jsonld_as_string = wp_json_encode( apply_filters( 'wl_dataset__sync_service__sync_item__jsonld',
+            $this->jsonld_service->get( $type, $object_id ), $type, $object_id ), 64 ); // JSON_UNESCAPED_SLASHES
+        $uri              = $this->entity_service->get_uri( $object_id, $type );
+
+        // Entity URL isn't set, bail out.
+        if ( empty( $uri ) ) {
+            return false;
+        }
+
+        return wp_json_encode( array(
+            'uri'     => $uri,
+            'model'   => $jsonld_as_string,
+            'private' => ! $object->is_public(),
+        ), 64 ); // JSON_UNESCAPED_SLASHES
+    }
+
+    /**
+     * @param $post_id
+     *
+     * @todo Complete the delete item.
+     */
+    public function delete_item( $post_id ) {
+        $uri = $this->entity_service->get_uri( $post_id, Object_Type_Enum::POST );
+
+        if ( ! isset( $uri ) ) {
+            return;
+        }
+
+        // Make a request to the remote endpoint.
+        $response = $this->api_service->request(
+            'DELETE', '/middleware/dataset?uri=' . rawurlencode( $uri ),
+            array( 'Content-Type' => 'application/ld+json', ) );
+
+    }
+
+    public function get_batch_size() {
+
+        return $this->batch_size;
+    }
+
+    public function delete_all() {
+        $this->api_service->request( 'DELETE', '/middleware/dataset/all' );
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -57,9 +57,9 @@ 
 	 * @param Jsonld_Service $jsonld_service
 	 * @param \Wordlift_Entity_Service $entity_service
 	 */
-	public function __construct( $api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service ) {
+	public function __construct($api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service) {
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->api_service                 = $api_service;
 		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
@@ -71,7 +71,7 @@ 
 //		$this->sync_background_process = new Sync_Background_Process( $this );;
 
 		// Exclude the JSONLD_HASH meta key from those that require a resync.
-		add_filter( 'wl_dataset__sync_hooks__ignored_meta_keys', function ( $args ) {
+		add_filter('wl_dataset__sync_hooks__ignored_meta_keys', function($args) {
 			$args[] = Sync_Service::JSONLD_HASH;
 			$args[] = Sync_Service::SYNCED_GMT;
 
@@ -92,11 +92,11 @@ 
 	 * @return array|false
 	 * @throws Exception
 	 */
-	public function sync_one( $type, $object_id ) {
+	public function sync_one($type, $object_id) {
 
-		$object = $this->sync_object_adapter_factory->create( $type, $object_id );
+		$object = $this->sync_object_adapter_factory->create($type, $object_id);
 
-		return $this->sync_many( array( $object ) );
+		return $this->sync_many(array($object));
 	}
 
 	/**
@@ -107,25 +107,25 @@ 
 	 *
 	 * @return bool
 	 */
-	public function delete_one( $type, $object_id, $uri ) {
+	public function delete_one($type, $object_id, $uri) {
 		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return false;
 		}
 
 		$response = $this->api_service->request(
-			'DELETE', sprintf( '/middleware/dataset?uri=%s', rawurlencode( $uri ) ) );
+			'DELETE', sprintf('/middleware/dataset?uri=%s', rawurlencode($uri)) );
 
 
 		// Update the sync date in case of success, otherwise log an error.
-		if ( ! $response->is_success() ) {
+		if ( ! $response->is_success()) {
 			return false;
 		}
 
 		/**
 		 * Allow 3rd parties to run additional sync work.
 		 */
-		do_action( 'wl_sync__delete_one', $type, $object_id, $uri );
+		do_action('wl_sync__delete_one', $type, $object_id, $uri);
 
 		return true;
 	}
@@ -137,67 +137,67 @@ 
 	 * @return bool
 	 * @throws Exception
 	 */
-	public function sync_many( $objects, $force = false ) {
+	public function sync_many($objects, $force = false) {
 
 		$hashes   = array();
 		$payloads = array();
 		/** @var Sync_Object_Adapter $object */
-		foreach ( $objects as $object ) {
+		foreach ($objects as $object) {
 			// Bail out if no payload.
-			$payload_as_string = $this->get_payload_as_string( $object );
-			if ( empty( $payload_as_string ) ) {
+			$payload_as_string = $this->get_payload_as_string($object);
+			if (empty($payload_as_string)) {
 				continue;
 			}
-			$new_hash = sha1( $payload_as_string );
-			$old_hash = $object->get_value( self::JSONLD_HASH );
+			$new_hash = sha1($payload_as_string);
+			$old_hash = $object->get_value(self::JSONLD_HASH);
 
 			// JSON-LD hasn't changed, bail out.
 			$should_sync = $force || $new_hash !== $old_hash;
-			if ( ! apply_filters( 'wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string ) ) {
+			if ( ! apply_filters('wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string)) {
 				continue;
 			}
 
 			// Collect the hashes and the payloads.
-			$hashes[]   = array( $object, $new_hash, $payload_as_string );
+			$hashes[]   = array($object, $new_hash, $payload_as_string);
 			$payloads[] = $payload_as_string;
 		}
 
 		// Bail out if payloads are empty.
-		if ( empty( $payloads ) ) {
+		if (empty($payloads)) {
 			return false;
 		}
 
-		$blocking = apply_filters( 'wl_feature__enable__sync-blocking', false );
+		$blocking = apply_filters('wl_feature__enable__sync-blocking', false);
 		$response = $this->api_service->request(
 			'POST', '/middleware/dataset/batch',
-			array( 'Content-Type' => 'application/json', ),
+			array('Content-Type' => 'application/json',),
 			// Put the payload in a JSON array w/o decoding/encoding again.
-			'[ ' . implode( ', ', $payloads ) . ' ]',
+			'[ '.implode(', ', $payloads).' ]',
 			$blocking ? 60 : 0.001,
 			null,
-			array( 'blocking' => $blocking ) );
+			array('blocking' => $blocking) );
 
 		// Update the sync date in case of success, otherwise log an error.
-		if ( $blocking && ! $response->is_success() ) {
+		if ($blocking && ! $response->is_success()) {
 			return false;
 		}
 
 		// If successful update the hashes and sync datetime.
-		foreach ( $hashes as $hash ) {
+		foreach ($hashes as $hash) {
 			$object   = $hash[0];
 			$new_hash = $hash[1];
 
-			$object->set_values( array(
+			$object->set_values(array(
 				self::JSONLD_HASH => $new_hash,
-				self::SYNCED_GMT  => current_time( 'mysql', true ),
-			) );
+				self::SYNCED_GMT  => current_time('mysql', true),
+			));
 		}
 
 
 		/**
 		 * Allow 3rd parties to run additional sync work.
 		 */
-		do_action( 'wl_sync__sync_many', $hashes );
+		do_action('wl_sync__sync_many', $hashes);
 
 		return true;
 	}
@@ -208,23 +208,23 @@ 
 	 * @return false|string
 	 * @throws Exception
 	 */
-	private function get_payload_as_string( $object ) {
+	private function get_payload_as_string($object) {
 		$type             = $object->get_type();
 		$object_id        = $object->get_object_id();
-		$jsonld_as_string = wp_json_encode( apply_filters( 'wl_dataset__sync_service__sync_item__jsonld',
-			$this->jsonld_service->get( $type, $object_id ), $type, $object_id ), 64 ); // JSON_UNESCAPED_SLASHES
-		$uri              = $this->entity_service->get_uri( $object_id, $type );
+		$jsonld_as_string = wp_json_encode(apply_filters('wl_dataset__sync_service__sync_item__jsonld',
+			$this->jsonld_service->get($type, $object_id), $type, $object_id), 64); // JSON_UNESCAPED_SLASHES
+		$uri              = $this->entity_service->get_uri($object_id, $type);
 
 		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return false;
 		}
 
-		return wp_json_encode( array(
+		return wp_json_encode(array(
 			'uri'     => $uri,
 			'model'   => $jsonld_as_string,
 			'private' => ! $object->is_public(),
-		), 64 ); // JSON_UNESCAPED_SLASHES
+		), 64); // JSON_UNESCAPED_SLASHES
 	}
 
 	/**
@@ -232,17 +232,17 @@ 
 	 *
 	 * @todo Complete the delete item.
 	 */
-	public function delete_item( $post_id ) {
-		$uri = $this->entity_service->get_uri( $post_id, Object_Type_Enum::POST );
+	public function delete_item($post_id) {
+		$uri = $this->entity_service->get_uri($post_id, Object_Type_Enum::POST);
 
-		if ( ! isset( $uri ) ) {
+		if ( ! isset($uri)) {
 			return;
 		}
 
 		// Make a request to the remote endpoint.
 		$response = $this->api_service->request(
-			'DELETE', '/middleware/dataset?uri=' . rawurlencode( $uri ),
-			array( 'Content-Type' => 'application/ld+json', ) );
+			'DELETE', '/middleware/dataset?uri='.rawurlencode($uri),
+			array('Content-Type' => 'application/ld+json',) );
 
 	}
 
@@ -252,7 +252,7 @@ 
 	}
 
 	public function delete_all() {
-		$this->api_service->request( 'DELETE', '/middleware/dataset/all' );
+		$this->api_service->request('DELETE', '/middleware/dataset/all');
 	}
 
 }