insideout10 / wordlift-plugin

src/includes/class-wordlift-deactivator.php

Indentation +11 added lines, -11 removed lines

@@ -21,18 +21,18 @@
  */
 class Wordlift_Deactivator {
 
-	/**
-	 * Short Description. (use period)
-	 *
-	 * Long Description.
-	 *
-	 * @since    1.0.0
-	 */
-	public static function deactivate() {
+    /**
+     * Short Description. (use period)
+     *
+     * Long Description.
+     *
+     * @since    1.0.0
+     */
+    public static function deactivate() {
 
-		// Clear caches.
-		Wordlift_File_Cache_Service::flush_all();
+        // Clear caches.
+        Wordlift_File_Cache_Service::flush_all();
 
-	}
+    }
 
 }

src/includes/cache/require.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@
  * @package    Wordlift
  * @subpackage Wordlift/includes/cache
  */
-require_once plugin_dir_path( dirname( dirname( __FILE__ ) ) ) . 'includes/cache/intf-wordlift-cache-service.php';
-require_once plugin_dir_path( dirname( dirname( __FILE__ ) ) ) . 'includes/cache/class-wordlift-file-cache-service.php';
-require_once plugin_dir_path( dirname( dirname( __FILE__ ) ) ) . 'includes/cache/class-wordlift-cached-post-converter.php';
-require_once plugin_dir_path( dirname( dirname( __FILE__ ) ) ) . 'includes/cache/class-wordlift-cached-entity-uri-service.php';
+require_once plugin_dir_path(dirname(dirname(__FILE__))).'includes/cache/intf-wordlift-cache-service.php';
+require_once plugin_dir_path(dirname(dirname(__FILE__))).'includes/cache/class-wordlift-file-cache-service.php';
+require_once plugin_dir_path(dirname(dirname(__FILE__))).'includes/cache/class-wordlift-cached-post-converter.php';
+require_once plugin_dir_path(dirname(dirname(__FILE__))).'includes/cache/class-wordlift-cached-entity-uri-service.php';

src/includes/cache/intf-wordlift-cache-service.php

Indentation +43 added lines, -43 removed lines

@@ -17,53 +17,53 @@
  */
 interface Wordlift_Cache_Service {
 
-	/**
-	 * Get the cached response for the specified `id`.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @param string $id The cache `id`.
-	 *
-	 * @return mixed|false The cached contents or false if the cache isn't found.
-	 */
-	function get_cache( $id );
+    /**
+     * Get the cached response for the specified `id`.
+     *
+     * @since 3.16.0
+     *
+     * @param string $id The cache `id`.
+     *
+     * @return mixed|false The cached contents or false if the cache isn't found.
+     */
+    function get_cache( $id );
 
-	/**
-	 * Check whether we have cached results for the provided id.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param string $id The cache `id`.
-	 *
-	 * @return bool True if we have cached results otherwise false.
-	 */
-	function has_cache( $id );
+    /**
+     * Check whether we have cached results for the provided id.
+     *
+     * @since 3.16.3
+     *
+     * @param string $id The cache `id`.
+     *
+     * @return bool True if we have cached results otherwise false.
+     */
+    function has_cache( $id );
 
-	/**
-	 * Set the cache contents for the specified `id`.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @param string $id       The cache id.
-	 * @param mixed  $contents The cache contents.
-	 */
-	function set_cache( $id, $contents );
+    /**
+     * Set the cache contents for the specified `id`.
+     *
+     * @since 3.16.0
+     *
+     * @param string $id       The cache id.
+     * @param mixed  $contents The cache contents.
+     */
+    function set_cache( $id, $contents );
 
 
-	/**
-	 * Delete the cache for the specified `id`.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @param string $id The cache `id`.
-	 */
-	function delete_cache( $id );
+    /**
+     * Delete the cache for the specified `id`.
+     *
+     * @since 3.16.0
+     *
+     * @param string $id The cache `id`.
+     */
+    function delete_cache( $id );
 
-	/**
-	 * Flush the whole cache.
-	 *
-	 * @since 3.16.0
-	 */
-	function flush();
+    /**
+     * Flush the whole cache.
+     *
+     * @since 3.16.0
+     */
+    function flush();
 
 }

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	 *
 	 * @return mixed|false The cached contents or false if the cache isn't found.
 	 */
-	function get_cache( $id );
+	function get_cache($id);
 
 	/**
 	 * Check whether we have cached results for the provided id.
@@ -37,7 +37,7 @@ 
 	 *
 	 * @return bool True if we have cached results otherwise false.
 	 */
-	function has_cache( $id );
+	function has_cache($id);
 
 	/**
 	 * Set the cache contents for the specified `id`.
@@ -47,7 +47,7 @@ 
 	 * @param string $id       The cache id.
 	 * @param mixed  $contents The cache contents.
 	 */
-	function set_cache( $id, $contents );
+	function set_cache($id, $contents);
 
 
 	/**
@@ -57,7 +57,7 @@ 
 	 *
 	 * @param string $id The cache `id`.
 	 */
-	function delete_cache( $id );
+	function delete_cache($id);
 
 	/**
 	 * Flush the whole cache.

src/includes/cache/class-wordlift-cached-entity-uri-service.php

Indentation +195 added lines, -195 removed lines

@@ -14,200 +14,200 @@
  */
 class Wordlift_Cached_Entity_Uri_Service extends Wordlift_Entity_Uri_Service {
 
-	/**
-	 * The {@link Wordlift_Cache_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Cache_Service $cache_service The {@link Wordlift_Cache_Service} instance.
-	 */
-	private $cache_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_Cached_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service
-	 * @param \Wordlift_Cache_Service         $cache_service
-	 */
-	public function __construct( $configuration_service, $cache_service ) {
-		parent::__construct( $configuration_service );
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Add hooks for meta being added/modified/deleted.
-		$this->cache_service = $cache_service;
-
-		add_action( 'add_post_meta', array(
-			$this,
-			'on_before_post_meta_add',
-		), 10, 3 );
-		add_action( 'update_post_meta', array(
-			$this,
-			'on_before_post_meta_change',
-		), 10, 4 );
-		add_action( 'delete_post_meta', array(
-			$this,
-			'on_before_post_meta_change',
-		), 10, 4 );
-
-	}
-
-	/**
-	 * Preload the URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param array $uris Preload an array of URIs.
-	 */
-	public function preload_uris( $uris ) {
-
-		// Filter the URIs which aren't yet cached.
-		$cache_service = $this->cache_service;
-		$uris_to_cache = array_filter( (array) $uris, function ( $item ) use ( $cache_service ) {
-			return ! $cache_service->has_cache( $item );
-		} );
-
-		// Preload the URIs.
-		parent::preload_uris( $uris_to_cache );
-
-		// Store them in cache.
-		if ( is_array( $this->uri_to_post ) && ! empty( $this->uri_to_post ) ) {
-			foreach ( $this->uri_to_post as $uri => $post ) {
-				$this->set_cache( $uri, $post );
-			}
-		}
-
-	}
-
-	/**
-	 * Get the entity post for the specified URI.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param string $uri The URI.
-	 *
-	 * @return null|WP_Post The {@link WP_Post} or null if not found.
-	 */
-	public function get_entity( $uri ) {
-
-		$this->log->trace( "Getting entity for uri $uri..." );
-
-		// Get the cached post for the specified URI.
-		$cache = $this->cache_service->get_cache( $uri );
-
-		// Return the cached data if valid.
-		if ( false !== $cache && is_numeric( $cache ) ) {
-			$this->log->debug( "Cached entity $cache for uri $uri found." );
-
-			return get_post( $cache );
-		}
-
-		// Get the actual result.
-		$post = parent::get_entity( $uri );
-
-		// Cache the result, if a post is not found we cache -1.
-		$this->set_cache( $uri, $post );
-
-		// Return the result.
-		return $post;
-	}
-
-	/**
-	 * Set the cached URI for the specified {@link WP_Post}.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param string  $uri  The URI.
-	 * @param WP_Post $post The post.
-	 */
-	private function set_cache( $uri, $post ) {
-
-		// Cache the result, if a post is not found we cache -1.
-		$this->cache_service->set_cache( $uri, ( null === $post ? - 1 : $post->ID ) );
-
-	}
-
-	/**
-	 * Delete the cache for the specified URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param array $uris An array of URIs.
-	 */
-	private function delete_cache( $uris ) {
-
-		// Delete the cache for each URI.
-		foreach ( $uris as $uri ) {
-			// Delete the single cache file.
-			$this->cache_service->delete_cache( $uri );
-		}
-
-	}
-
-	/**
-	 * Before post meta change.
-	 *
-	 * When a post meta is going to be changed, we check if the `meta_key` is
-	 * either the `entity_url` or the `same_as` in which case we delete the cache
-	 * for all the associated URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param int|array $meta_ids   The {@link WP_Post} meta id(s).
-	 * @param int       $post_id    The {@link WP_Post} id.
-	 * @param string    $meta_key   The meta key.
-	 * @param mixed     $meta_value The meta value(s).
-	 */
-	public function on_before_post_meta_change( $meta_ids, $post_id, $meta_key, $meta_value ) {
-
-		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
-			return;
-		}
-
-		$this->log->trace( "Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache..." );
-
-		// The list of existing URIs, plus the list of URIs being deleted/updated.
-		$uris = get_post_meta( $post_id, $meta_key ) + (array) $meta_value;
-
-		// Delete the cache for those URIs.
-		$this->delete_cache( $uris );
-
-	}
-
-	/**
-	 * Hook to meta add for a {@link WP_Post}, will cause the cache to
-	 * invalidate.
-	 *
-	 * @since 3.16.3
-	 *
-	 * @param int    $post_id    The {@link WP_Post} id.
-	 * @param string $meta_key   The meta key.
-	 * @param mixed  $meta_value The meta value(s).
-	 */
-	public function on_before_post_meta_add( $post_id, $meta_key, $meta_value ) {
-
-		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
-			return;
-		}
-
-		$this->log->trace( "Adding $meta_key for post $post_id ($meta_key), invalidating cache..." );
-
-		// Delete the cache for the URIs being added.
-		$this->delete_cache( (array) $meta_value );
-
-	}
+    /**
+     * The {@link Wordlift_Cache_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Cache_Service $cache_service The {@link Wordlift_Cache_Service} instance.
+     */
+    private $cache_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_Cached_Entity_Uri_Service} instance.
+     *
+     * @since 3.16.3
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service
+     * @param \Wordlift_Cache_Service         $cache_service
+     */
+    public function __construct( $configuration_service, $cache_service ) {
+        parent::__construct( $configuration_service );
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Add hooks for meta being added/modified/deleted.
+        $this->cache_service = $cache_service;
+
+        add_action( 'add_post_meta', array(
+            $this,
+            'on_before_post_meta_add',
+        ), 10, 3 );
+        add_action( 'update_post_meta', array(
+            $this,
+            'on_before_post_meta_change',
+        ), 10, 4 );
+        add_action( 'delete_post_meta', array(
+            $this,
+            'on_before_post_meta_change',
+        ), 10, 4 );
+
+    }
+
+    /**
+     * Preload the URIs.
+     *
+     * @since 3.16.3
+     *
+     * @param array $uris Preload an array of URIs.
+     */
+    public function preload_uris( $uris ) {
+
+        // Filter the URIs which aren't yet cached.
+        $cache_service = $this->cache_service;
+        $uris_to_cache = array_filter( (array) $uris, function ( $item ) use ( $cache_service ) {
+            return ! $cache_service->has_cache( $item );
+        } );
+
+        // Preload the URIs.
+        parent::preload_uris( $uris_to_cache );
+
+        // Store them in cache.
+        if ( is_array( $this->uri_to_post ) && ! empty( $this->uri_to_post ) ) {
+            foreach ( $this->uri_to_post as $uri => $post ) {
+                $this->set_cache( $uri, $post );
+            }
+        }
+
+    }
+
+    /**
+     * Get the entity post for the specified URI.
+     *
+     * @since 3.16.3
+     *
+     * @param string $uri The URI.
+     *
+     * @return null|WP_Post The {@link WP_Post} or null if not found.
+     */
+    public function get_entity( $uri ) {
+
+        $this->log->trace( "Getting entity for uri $uri..." );
+
+        // Get the cached post for the specified URI.
+        $cache = $this->cache_service->get_cache( $uri );
+
+        // Return the cached data if valid.
+        if ( false !== $cache && is_numeric( $cache ) ) {
+            $this->log->debug( "Cached entity $cache for uri $uri found." );
+
+            return get_post( $cache );
+        }
+
+        // Get the actual result.
+        $post = parent::get_entity( $uri );
+
+        // Cache the result, if a post is not found we cache -1.
+        $this->set_cache( $uri, $post );
+
+        // Return the result.
+        return $post;
+    }
+
+    /**
+     * Set the cached URI for the specified {@link WP_Post}.
+     *
+     * @since 3.16.3
+     *
+     * @param string  $uri  The URI.
+     * @param WP_Post $post The post.
+     */
+    private function set_cache( $uri, $post ) {
+
+        // Cache the result, if a post is not found we cache -1.
+        $this->cache_service->set_cache( $uri, ( null === $post ? - 1 : $post->ID ) );
+
+    }
+
+    /**
+     * Delete the cache for the specified URIs.
+     *
+     * @since 3.16.3
+     *
+     * @param array $uris An array of URIs.
+     */
+    private function delete_cache( $uris ) {
+
+        // Delete the cache for each URI.
+        foreach ( $uris as $uri ) {
+            // Delete the single cache file.
+            $this->cache_service->delete_cache( $uri );
+        }
+
+    }
+
+    /**
+     * Before post meta change.
+     *
+     * When a post meta is going to be changed, we check if the `meta_key` is
+     * either the `entity_url` or the `same_as` in which case we delete the cache
+     * for all the associated URIs.
+     *
+     * @since 3.16.3
+     *
+     * @param int|array $meta_ids   The {@link WP_Post} meta id(s).
+     * @param int       $post_id    The {@link WP_Post} id.
+     * @param string    $meta_key   The meta key.
+     * @param mixed     $meta_value The meta value(s).
+     */
+    public function on_before_post_meta_change( $meta_ids, $post_id, $meta_key, $meta_value ) {
+
+        // Bail out if we're not interested in the meta key.
+        if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+            return;
+        }
+
+        $this->log->trace( "Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache..." );
+
+        // The list of existing URIs, plus the list of URIs being deleted/updated.
+        $uris = get_post_meta( $post_id, $meta_key ) + (array) $meta_value;
+
+        // Delete the cache for those URIs.
+        $this->delete_cache( $uris );
+
+    }
+
+    /**
+     * Hook to meta add for a {@link WP_Post}, will cause the cache to
+     * invalidate.
+     *
+     * @since 3.16.3
+     *
+     * @param int    $post_id    The {@link WP_Post} id.
+     * @param string $meta_key   The meta key.
+     * @param mixed  $meta_value The meta value(s).
+     */
+    public function on_before_post_meta_add( $post_id, $meta_key, $meta_value ) {
+
+        // Bail out if we're not interested in the meta key.
+        if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+            return;
+        }
+
+        $this->log->trace( "Adding $meta_key for post $post_id ($meta_key), invalidating cache..." );
+
+        // Delete the cache for the URIs being added.
+        $this->delete_cache( (array) $meta_value );
+
+    }
 
 }
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -40,26 +40,26 @@ 
 	 * @param \Wordlift_Configuration_Service $configuration_service
 	 * @param \Wordlift_Cache_Service         $cache_service
 	 */
-	public function __construct( $configuration_service, $cache_service ) {
-		parent::__construct( $configuration_service );
+	public function __construct($configuration_service, $cache_service) {
+		parent::__construct($configuration_service);
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Add hooks for meta being added/modified/deleted.
 		$this->cache_service = $cache_service;
 
-		add_action( 'add_post_meta', array(
+		add_action('add_post_meta', array(
 			$this,
 			'on_before_post_meta_add',
-		), 10, 3 );
-		add_action( 'update_post_meta', array(
+		), 10, 3);
+		add_action('update_post_meta', array(
 			$this,
 			'on_before_post_meta_change',
-		), 10, 4 );
-		add_action( 'delete_post_meta', array(
+		), 10, 4);
+		add_action('delete_post_meta', array(
 			$this,
 			'on_before_post_meta_change',
-		), 10, 4 );
+		), 10, 4);
 
 	}
 
@@ -70,21 +70,21 @@ 
 	 *
 	 * @param array $uris Preload an array of URIs.
 	 */
-	public function preload_uris( $uris ) {
+	public function preload_uris($uris) {
 
 		// Filter the URIs which aren't yet cached.
 		$cache_service = $this->cache_service;
-		$uris_to_cache = array_filter( (array) $uris, function ( $item ) use ( $cache_service ) {
-			return ! $cache_service->has_cache( $item );
+		$uris_to_cache = array_filter((array) $uris, function($item) use ($cache_service) {
+			return ! $cache_service->has_cache($item);
 		} );
 
 		// Preload the URIs.
-		parent::preload_uris( $uris_to_cache );
+		parent::preload_uris($uris_to_cache);
 
 		// Store them in cache.
-		if ( is_array( $this->uri_to_post ) && ! empty( $this->uri_to_post ) ) {
-			foreach ( $this->uri_to_post as $uri => $post ) {
-				$this->set_cache( $uri, $post );
+		if (is_array($this->uri_to_post) && ! empty($this->uri_to_post)) {
+			foreach ($this->uri_to_post as $uri => $post) {
+				$this->set_cache($uri, $post);
 			}
 		}
 
@@ -99,25 +99,25 @@ 
 	 *
 	 * @return null|WP_Post The {@link WP_Post} or null if not found.
 	 */
-	public function get_entity( $uri ) {
+	public function get_entity($uri) {
 
-		$this->log->trace( "Getting entity for uri $uri..." );
+		$this->log->trace("Getting entity for uri $uri...");
 
 		// Get the cached post for the specified URI.
-		$cache = $this->cache_service->get_cache( $uri );
+		$cache = $this->cache_service->get_cache($uri);
 
 		// Return the cached data if valid.
-		if ( false !== $cache && is_numeric( $cache ) ) {
-			$this->log->debug( "Cached entity $cache for uri $uri found." );
+		if (false !== $cache && is_numeric($cache)) {
+			$this->log->debug("Cached entity $cache for uri $uri found.");
 
-			return get_post( $cache );
+			return get_post($cache);
 		}
 
 		// Get the actual result.
-		$post = parent::get_entity( $uri );
+		$post = parent::get_entity($uri);
 
 		// Cache the result, if a post is not found we cache -1.
-		$this->set_cache( $uri, $post );
+		$this->set_cache($uri, $post);
 
 		// Return the result.
 		return $post;
@@ -131,10 +131,10 @@ 
 	 * @param string  $uri  The URI.
 	 * @param WP_Post $post The post.
 	 */
-	private function set_cache( $uri, $post ) {
+	private function set_cache($uri, $post) {
 
 		// Cache the result, if a post is not found we cache -1.
-		$this->cache_service->set_cache( $uri, ( null === $post ? - 1 : $post->ID ) );
+		$this->cache_service->set_cache($uri, (null === $post ? -1 : $post->ID));
 
 	}
 
@@ -145,12 +145,12 @@ 
 	 *
 	 * @param array $uris An array of URIs.
 	 */
-	private function delete_cache( $uris ) {
+	private function delete_cache($uris) {
 
 		// Delete the cache for each URI.
-		foreach ( $uris as $uri ) {
+		foreach ($uris as $uri) {
 			// Delete the single cache file.
-			$this->cache_service->delete_cache( $uri );
+			$this->cache_service->delete_cache($uri);
 		}
 
 	}
@@ -169,20 +169,20 @@ 
 	 * @param string    $meta_key   The meta key.
 	 * @param mixed     $meta_value The meta value(s).
 	 */
-	public function on_before_post_meta_change( $meta_ids, $post_id, $meta_key, $meta_value ) {
+	public function on_before_post_meta_change($meta_ids, $post_id, $meta_key, $meta_value) {
 
 		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+		if (WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key) {
 			return;
 		}
 
-		$this->log->trace( "Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache..." );
+		$this->log->trace("Updating/deleting $meta_key for post $post_id ($meta_key), invalidating cache...");
 
 		// The list of existing URIs, plus the list of URIs being deleted/updated.
-		$uris = get_post_meta( $post_id, $meta_key ) + (array) $meta_value;
+		$uris = get_post_meta($post_id, $meta_key) + (array) $meta_value;
 
 		// Delete the cache for those URIs.
-		$this->delete_cache( $uris );
+		$this->delete_cache($uris);
 
 	}
 
@@ -196,17 +196,17 @@ 
 	 * @param string $meta_key   The meta key.
 	 * @param mixed  $meta_value The meta value(s).
 	 */
-	public function on_before_post_meta_add( $post_id, $meta_key, $meta_value ) {
+	public function on_before_post_meta_add($post_id, $meta_key, $meta_value) {
 
 		// Bail out if we're not interested in the meta key.
-		if ( WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key ) {
+		if (WL_ENTITY_URL_META_NAME !== $meta_key && Wordlift_Schema_Service::FIELD_SAME_AS !== $meta_key) {
 			return;
 		}
 
-		$this->log->trace( "Adding $meta_key for post $post_id ($meta_key), invalidating cache..." );
+		$this->log->trace("Adding $meta_key for post $post_id ($meta_key), invalidating cache...");
 
 		// Delete the cache for the URIs being added.
-		$this->delete_cache( (array) $meta_value );
+		$this->delete_cache((array) $meta_value);
 
 	}
 

src/admin/elements/intf-wordlift-admin-element.php

Indentation +10 added lines, -10 removed lines

@@ -18,15 +18,15 @@
  */
 interface Wordlift_Admin_Element {
 
-	/**
-	 * Render the element.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $args An array of parameters.
-	 *
-	 * @return \Wordlift_Admin_Element The element instance.
-	 */
-	public function render( $args );
+    /**
+     * Render the element.
+     *
+     * @since 3.11.0
+     *
+     * @param array $args An array of parameters.
+     *
+     * @return \Wordlift_Admin_Element The element instance.
+     */
+    public function render( $args );
 
 }

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
 	 *
 	 * @return \Wordlift_Admin_Element The element instance.
 	 */
-	public function render( $args );
+	public function render($args);
 
 }

src/includes/batch-analysis/class-wordlift-batch-analysis-adapter.php

Indentation +157 added lines, -157 removed lines

@@ -16,178 +16,178 @@
  */
 class Wordlift_Batch_Analysis_Adapter {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.17.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.17.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * The {@link Wordlift_Batch_Analysis_Service} instance.
-	 *
-	 * @since  3.17.0
-	 * @access private
-	 * @var \Wordlift_Batch_Analysis_Service $batch_analysis_service The {@link Wordlift_Batch_Analysis_Service} instance.
-	 */
-	private $batch_analysis_service;
-
-	/**
-	 * Wordlift_Batch_Analysis_Adapter constructor.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param \Wordlift_Batch_Analysis_Service $batch_analysis_service
-	 */
-	public function __construct( $batch_analysis_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->batch_analysis_service = $batch_analysis_service;
-
-		add_action( 'wp_ajax_wl_batch_analysis_complete', array(
-			$this,
-			'complete',
-		) );
-
-	}
-
-	/**
-	 * Submit the posts for batch analysis.
-	 *
-	 * @since 3.14.2
-	 */
-	public function submit() {
-
-		// Get the parameters from the $_REQUEST.
-		$params = self::create_params_from_request();
-
-		// Submit the request.
-		$count = $this->batch_analysis_service->submit( $params );
-
-		// Clear any buffer.
-		ob_clean();
-
-		// Send the response.
-		wp_send_json_success( array( 'count' => $count ) );
-
-	}
-
-	/**
-	 * Submit the posts for batch analysis.
-	 *
-	 * @since 3.14.2
-	 */
-	public function submit_posts() {
-
-		$this->log->trace( 'Received Batch Analysis request for posts...' );
-
-		if ( empty( $_REQUEST['post'] ) ) {
-			$this->log->error( 'Batch Analysis request for posts missing the post(s) id.' );
-
-			wp_send_json_error( 'The `post` parameter is required.' );
-		}
-
-		// Get the parameters from the $_REQUEST.
-		$params = self::create_params_from_request();
-
-		// Submit the request.
-		$count = $this->batch_analysis_service->submit_posts( $params );
-
-		// Clear any buffer.
-		ob_clean();
-
-		// Send the response.
-		wp_send_json_success( array( 'count' => $count ) );
-
-	}
-
-	public function complete() {
-
-		$this->batch_analysis_service->complete();
-
-		wp_send_json_success();
-
-	}
-
-
-	/**
-	 * A helper function to create the parameters from the $_REQUEST.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @return array An array or parameters.
-	 */
-	private static function create_params_from_request() {
+    /**
+     * The {@link Wordlift_Batch_Analysis_Service} instance.
+     *
+     * @since  3.17.0
+     * @access private
+     * @var \Wordlift_Batch_Analysis_Service $batch_analysis_service The {@link Wordlift_Batch_Analysis_Service} instance.
+     */
+    private $batch_analysis_service;
+
+    /**
+     * Wordlift_Batch_Analysis_Adapter constructor.
+     *
+     * @since 3.14.2
+     *
+     * @param \Wordlift_Batch_Analysis_Service $batch_analysis_service
+     */
+    public function __construct( $batch_analysis_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->batch_analysis_service = $batch_analysis_service;
+
+        add_action( 'wp_ajax_wl_batch_analysis_complete', array(
+            $this,
+            'complete',
+        ) );
+
+    }
+
+    /**
+     * Submit the posts for batch analysis.
+     *
+     * @since 3.14.2
+     */
+    public function submit() {
+
+        // Get the parameters from the $_REQUEST.
+        $params = self::create_params_from_request();
+
+        // Submit the request.
+        $count = $this->batch_analysis_service->submit( $params );
+
+        // Clear any buffer.
+        ob_clean();
+
+        // Send the response.
+        wp_send_json_success( array( 'count' => $count ) );
+
+    }
+
+    /**
+     * Submit the posts for batch analysis.
+     *
+     * @since 3.14.2
+     */
+    public function submit_posts() {
+
+        $this->log->trace( 'Received Batch Analysis request for posts...' );
+
+        if ( empty( $_REQUEST['post'] ) ) {
+            $this->log->error( 'Batch Analysis request for posts missing the post(s) id.' );
+
+            wp_send_json_error( 'The `post` parameter is required.' );
+        }
+
+        // Get the parameters from the $_REQUEST.
+        $params = self::create_params_from_request();
+
+        // Submit the request.
+        $count = $this->batch_analysis_service->submit_posts( $params );
+
+        // Clear any buffer.
+        ob_clean();
+
+        // Send the response.
+        wp_send_json_success( array( 'count' => $count ) );
+
+    }
+
+    public function complete() {
+
+        $this->batch_analysis_service->complete();
+
+        wp_send_json_success();
+
+    }
+
+
+    /**
+     * A helper function to create the parameters from the $_REQUEST.
+     *
+     * @since 3.17.0
+     *
+     * @return array An array or parameters.
+     */
+    private static function create_params_from_request() {
 
-		// Build params array and check if param exists.
-		// @codingStandardsIgnoreStart, Ignore phpcs indentation errors.
-		$params = array(
-			// Get the `links` parameter, or use `default` if not provided.
-			'links' => isset( $_REQUEST['links'] ) ? $_REQUEST['links'] : 'default',
-			// If `include_annotated` is set to `yes`, the set the parameter to true.
-			'include_annotated' => isset( $_REQUEST['include_annotated'] ) && 'yes' === $_REQUEST['include_annotated'],
-			// Set the minimum amount of occurrences, use `1` by default.
-			'min_occurrences' => isset( $_REQUEST['min_occurrences'] ) && is_numeric( $_REQUEST['min_occurrences'] ) ? intval( $_REQUEST['min_occurrences'] ) : 1,
-			// Set the `post_type` to `post` if none provided.
-			'post_type' => isset( $_REQUEST['post_type'] ) ? (array) $_REQUEST['post_type'] : 'post',
-			// Set the exclude array.
-			'exclude' => isset( $_REQUEST['exclude'] ) ? (array) $_REQUEST['exclude'] : array(),
-			// Set the `from` date, or null if not provided.
-			'from' => isset( $_REQUEST['from'] ) ? $_REQUEST['from'] : null,
-			// Set the `to` date, or null if not provided.
-			'to' => isset( $_REQUEST['to'] ) ? $_REQUEST['to'] : null,
-			//
-			'ids' => isset( $_REQUEST['post'] ) ? wp_parse_id_list( (array) $_REQUEST['post'] ) : array(),
-		);
+        // Build params array and check if param exists.
+        // @codingStandardsIgnoreStart, Ignore phpcs indentation errors.
+        $params = array(
+            // Get the `links` parameter, or use `default` if not provided.
+            'links' => isset( $_REQUEST['links'] ) ? $_REQUEST['links'] : 'default',
+            // If `include_annotated` is set to `yes`, the set the parameter to true.
+            'include_annotated' => isset( $_REQUEST['include_annotated'] ) && 'yes' === $_REQUEST['include_annotated'],
+            // Set the minimum amount of occurrences, use `1` by default.
+            'min_occurrences' => isset( $_REQUEST['min_occurrences'] ) && is_numeric( $_REQUEST['min_occurrences'] ) ? intval( $_REQUEST['min_occurrences'] ) : 1,
+            // Set the `post_type` to `post` if none provided.
+            'post_type' => isset( $_REQUEST['post_type'] ) ? (array) $_REQUEST['post_type'] : 'post',
+            // Set the exclude array.
+            'exclude' => isset( $_REQUEST['exclude'] ) ? (array) $_REQUEST['exclude'] : array(),
+            // Set the `from` date, or null if not provided.
+            'from' => isset( $_REQUEST['from'] ) ? $_REQUEST['from'] : null,
+            // Set the `to` date, or null if not provided.
+            'to' => isset( $_REQUEST['to'] ) ? $_REQUEST['to'] : null,
+            //
+            'ids' => isset( $_REQUEST['post'] ) ? wp_parse_id_list( (array) $_REQUEST['post'] ) : array(),
+        );
 
-		// @codingStandardsIgnoreEnd
+        // @codingStandardsIgnoreEnd
 
-		return $params;
-	}
+        return $params;
+    }
 
-	/**
-	 * Cancel the batch analysis for the specified post.
-	 *
-	 * @since 3.14.0
-	 */
-	public function cancel() {
+    /**
+     * Cancel the batch analysis for the specified post.
+     *
+     * @since 3.14.0
+     */
+    public function cancel() {
 
-		if ( ! isset( $_REQUEST['post'] ) ) {
-			wp_die( 'The `post` parameter is required.' );
-		}
+        if ( ! isset( $_REQUEST['post'] ) ) {
+            wp_die( 'The `post` parameter is required.' );
+        }
 
-		$count = $this->batch_analysis_service->cancel( (array) $_REQUEST['post'] );
+        $count = $this->batch_analysis_service->cancel( (array) $_REQUEST['post'] );
 
-		// Clear any buffer.
-		ob_clean();
+        // Clear any buffer.
+        ob_clean();
 
-		// Send the response.
-		wp_send_json_success( array( 'count' => $count ) );
+        // Send the response.
+        wp_send_json_success( array( 'count' => $count ) );
 
-	}
+    }
 
-	/**
-	 * Clear warnings for the specified post.
-	 *
-	 * @since 3.14.0
-	 */
-	public function clear_warning() {
+    /**
+     * Clear warnings for the specified post.
+     *
+     * @since 3.14.0
+     */
+    public function clear_warning() {
 
-		if ( ! isset( $_REQUEST['post'] ) ) {
-			wp_die( 'The `post` parameter is required.' );
-		}
+        if ( ! isset( $_REQUEST['post'] ) ) {
+            wp_die( 'The `post` parameter is required.' );
+        }
 
-		$this->batch_analysis_service->clear_warning( (array) $_REQUEST['post'] );
+        $this->batch_analysis_service->clear_warning( (array) $_REQUEST['post'] );
 
-		// Clear any buffer.
-		ob_clean();
+        // Clear any buffer.
+        ob_clean();
 
-		// Send the response.
-		wp_send_json_success();
+        // Send the response.
+        wp_send_json_success();
 
-	}
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -41,16 +41,16 @@ 
 	 *
 	 * @param \Wordlift_Batch_Analysis_Service $batch_analysis_service
 	 */
-	public function __construct( $batch_analysis_service ) {
+	public function __construct($batch_analysis_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->batch_analysis_service = $batch_analysis_service;
 
-		add_action( 'wp_ajax_wl_batch_analysis_complete', array(
+		add_action('wp_ajax_wl_batch_analysis_complete', array(
 			$this,
 			'complete',
-		) );
+		));
 
 	}
 
@@ -65,13 +65,13 @@ 
 		$params = self::create_params_from_request();
 
 		// Submit the request.
-		$count = $this->batch_analysis_service->submit( $params );
+		$count = $this->batch_analysis_service->submit($params);
 
 		// Clear any buffer.
 		ob_clean();
 
 		// Send the response.
-		wp_send_json_success( array( 'count' => $count ) );
+		wp_send_json_success(array('count' => $count));
 
 	}
 
@@ -82,25 +82,25 @@ 
 	 */
 	public function submit_posts() {
 
-		$this->log->trace( 'Received Batch Analysis request for posts...' );
+		$this->log->trace('Received Batch Analysis request for posts...');
 
-		if ( empty( $_REQUEST['post'] ) ) {
-			$this->log->error( 'Batch Analysis request for posts missing the post(s) id.' );
+		if (empty($_REQUEST['post'])) {
+			$this->log->error('Batch Analysis request for posts missing the post(s) id.');
 
-			wp_send_json_error( 'The `post` parameter is required.' );
+			wp_send_json_error('The `post` parameter is required.');
 		}
 
 		// Get the parameters from the $_REQUEST.
 		$params = self::create_params_from_request();
 
 		// Submit the request.
-		$count = $this->batch_analysis_service->submit_posts( $params );
+		$count = $this->batch_analysis_service->submit_posts($params);
 
 		// Clear any buffer.
 		ob_clean();
 
 		// Send the response.
-		wp_send_json_success( array( 'count' => $count ) );
+		wp_send_json_success(array('count' => $count));
 
 	}
 
@@ -126,21 +126,21 @@ 
 		// @codingStandardsIgnoreStart, Ignore phpcs indentation errors.
 		$params = array(
 			// Get the `links` parameter, or use `default` if not provided.
-			'links' => isset( $_REQUEST['links'] ) ? $_REQUEST['links'] : 'default',
+			'links' => isset($_REQUEST['links']) ? $_REQUEST['links'] : 'default',
 			// If `include_annotated` is set to `yes`, the set the parameter to true.
-			'include_annotated' => isset( $_REQUEST['include_annotated'] ) && 'yes' === $_REQUEST['include_annotated'],
+			'include_annotated' => isset($_REQUEST['include_annotated']) && 'yes' === $_REQUEST['include_annotated'],
 			// Set the minimum amount of occurrences, use `1` by default.
-			'min_occurrences' => isset( $_REQUEST['min_occurrences'] ) && is_numeric( $_REQUEST['min_occurrences'] ) ? intval( $_REQUEST['min_occurrences'] ) : 1,
+			'min_occurrences' => isset($_REQUEST['min_occurrences']) && is_numeric($_REQUEST['min_occurrences']) ? intval($_REQUEST['min_occurrences']) : 1,
 			// Set the `post_type` to `post` if none provided.
-			'post_type' => isset( $_REQUEST['post_type'] ) ? (array) $_REQUEST['post_type'] : 'post',
+			'post_type' => isset($_REQUEST['post_type']) ? (array) $_REQUEST['post_type'] : 'post',
 			// Set the exclude array.
-			'exclude' => isset( $_REQUEST['exclude'] ) ? (array) $_REQUEST['exclude'] : array(),
+			'exclude' => isset($_REQUEST['exclude']) ? (array) $_REQUEST['exclude'] : array(),
 			// Set the `from` date, or null if not provided.
-			'from' => isset( $_REQUEST['from'] ) ? $_REQUEST['from'] : null,
+			'from' => isset($_REQUEST['from']) ? $_REQUEST['from'] : null,
 			// Set the `to` date, or null if not provided.
-			'to' => isset( $_REQUEST['to'] ) ? $_REQUEST['to'] : null,
+			'to' => isset($_REQUEST['to']) ? $_REQUEST['to'] : null,
 			//
-			'ids' => isset( $_REQUEST['post'] ) ? wp_parse_id_list( (array) $_REQUEST['post'] ) : array(),
+			'ids' => isset($_REQUEST['post']) ? wp_parse_id_list((array) $_REQUEST['post']) : array(),
 		);
 
 		// @codingStandardsIgnoreEnd
@@ -155,17 +155,17 @@ 
 	 */
 	public function cancel() {
 
-		if ( ! isset( $_REQUEST['post'] ) ) {
-			wp_die( 'The `post` parameter is required.' );
+		if ( ! isset($_REQUEST['post'])) {
+			wp_die('The `post` parameter is required.');
 		}
 
-		$count = $this->batch_analysis_service->cancel( (array) $_REQUEST['post'] );
+		$count = $this->batch_analysis_service->cancel((array) $_REQUEST['post']);
 
 		// Clear any buffer.
 		ob_clean();
 
 		// Send the response.
-		wp_send_json_success( array( 'count' => $count ) );
+		wp_send_json_success(array('count' => $count));
 
 	}
 
@@ -176,11 +176,11 @@ 
 	 */
 	public function clear_warning() {
 
-		if ( ! isset( $_REQUEST['post'] ) ) {
-			wp_die( 'The `post` parameter is required.' );
+		if ( ! isset($_REQUEST['post'])) {
+			wp_die('The `post` parameter is required.');
 		}
 
-		$this->batch_analysis_service->clear_warning( (array) $_REQUEST['post'] );
+		$this->batch_analysis_service->clear_warning((array) $_REQUEST['post']);
 
 		// Clear any buffer.
 		ob_clean();

src/includes/class-wordlift-remote-image-service.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 *
 	 * @since 3.18.0
 	 *
-	 * @return string|bool The file extension on success and
+	 * @return string|false The file extension on success and
 	 * false on fail or if the content type is not supported.
 	 */
 	private static function get_extension_from_content_type( $content_type ) {

Indentation +133 added lines, -133 removed lines

@@ -8,138 +8,138 @@
  */
 class Wordlift_Remote_Image_Service {
 
-	/**
-	 * Save the image with the specified URL locally.
-	 *
-	 * @param string $url The image remote URL.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
-	 * url, *content_type*: the image content type) or false on error.
-	 */
-	public static function save_from_url( $url ) {
-
-		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
-		}
-		// Load `WP_Filesystem`.
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Parse the url.
-		$parts = wp_parse_url( $url );
-
-		// Get the bare filename (filename w/o the extension).
-		$basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
-
-		// Get the base dir.
-		$wp_upload_dir = wp_upload_dir();
-
-		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
-
-		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
-
-		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
-
-			return false;
-		};
-
-		$response = self::get_response( $url );
-
-		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
-
-			return false;
-		}
-
-		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-
-		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
-
-		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
-			return false;
-		}
-
-		// Complete the local filename.
-		$image_full_path .= $extension;
-		$image_full_url  .= $extension;
-
-		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
-
-		// Return the path.
-		return array(
-			'path'         => $image_full_path,
-			'url'          => $image_full_url,
-			'content_type' => $content_type,
-		);
-	}
-
-	/**
-	 * Returns the file extension using the content type.
-	 *
-	 * @param string $content_type File content type.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return string|bool The file extension on success and
-	 * false on fail or if the content type is not supported.
-	 */
-	private static function get_extension_from_content_type( $content_type ) {
-
-		// Return the extension if match.
-		switch ( $content_type ) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				return '.jpg';
-			case 'image/gif':
-				return '.gif';
-			case 'image/png':
-				return '.png';
-		}
-
-		// Otherwise return false.
-		return false;
-	}
-
-	/**
-	 * Retrieve the response from url and sets the response.
-	 *
-	 * @param string $url The url to retrieve.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return false|array True on success and false on failure.
-	 */
-	private static function get_response( $url ) {
-		// Request the remote file.
-		$response = wp_remote_get( $url );
-
-		// Bail out if the response is not ok.
-		if (
-			is_wp_error( $response )
-			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
-		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
-
-			return false;
-		}
-
-		// Set the response.
-		return $response;
-	}
+    /**
+     * Save the image with the specified URL locally.
+     *
+     * @param string $url The image remote URL.
+     *
+     * @since 3.18.0
+     *
+     * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
+     * url, *content_type*: the image content type) or false on error.
+     */
+    public static function save_from_url( $url ) {
+
+        // Required for REST API calls
+        if ( ! function_exists( 'WP_Filesystem' ) ) {
+            require_once( ABSPATH . 'wp-admin/includes/file.php' );
+        }
+        // Load `WP_Filesystem`.
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Parse the url.
+        $parts = wp_parse_url( $url );
+
+        // Get the bare filename (filename w/o the extension).
+        $basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
+
+        // Get the base dir.
+        $wp_upload_dir = wp_upload_dir();
+
+        // Set the upload directory and URL.
+        $upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
+        $upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+
+        // Get the full path to the local filename.
+        $image_full_path = $upload_dir . '/' . $basename;
+        $image_full_url  = $upload_url . '/' . $basename;
+
+        // Create custom directory and bail on failure.
+        if ( ! wp_mkdir_p( $upload_dir ) ) {
+            wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+
+            return false;
+        };
+
+        $response = self::get_response( $url );
+
+        // Bail if the response is not set.
+        if ( false === $response ) {
+            wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+
+            return false;
+        }
+
+        // Get the content type of response.
+        $content_type = wp_remote_retrieve_header( $response, 'content-type' );
+
+        // Get the file extension.
+        $extension = self::get_extension_from_content_type( $content_type );
+
+        // Bail if the content type is not supported.
+        if ( empty( $extension ) ) {
+            return false;
+        }
+
+        // Complete the local filename.
+        $image_full_path .= $extension;
+        $image_full_url  .= $extension;
+
+        // Store the data locally.
+        $wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+
+        // Return the path.
+        return array(
+            'path'         => $image_full_path,
+            'url'          => $image_full_url,
+            'content_type' => $content_type,
+        );
+    }
+
+    /**
+     * Returns the file extension using the content type.
+     *
+     * @param string $content_type File content type.
+     *
+     * @since 3.18.0
+     *
+     * @return string|bool The file extension on success and
+     * false on fail or if the content type is not supported.
+     */
+    private static function get_extension_from_content_type( $content_type ) {
+
+        // Return the extension if match.
+        switch ( $content_type ) {
+            case 'image/jpeg':
+            case 'image/jpg':
+                return '.jpg';
+            case 'image/gif':
+                return '.gif';
+            case 'image/png':
+                return '.png';
+        }
+
+        // Otherwise return false.
+        return false;
+    }
+
+    /**
+     * Retrieve the response from url and sets the response.
+     *
+     * @param string $url The url to retrieve.
+     *
+     * @since 3.18.0
+     *
+     * @return false|array True on success and false on failure.
+     */
+    private static function get_response( $url ) {
+        // Request the remote file.
+        $response = wp_remote_get( $url );
+
+        // Bail out if the response is not ok.
+        if (
+            is_wp_error( $response )
+            || 200 !== (int) $response['response']['code']
+            || ! isset( $response['body'] )
+        ) {
+            wl_write_log( "save_image_from_url : error fetching image $url \n" );
+
+            return false;
+        }
+
+        // Set the response.
+        return $response;
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -18,57 +18,57 @@ 
 	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
 	 * url, *content_type*: the image content type) or false on error.
 	 */
-	public static function save_from_url( $url ) {
+	public static function save_from_url($url) {
 
 		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		if ( ! function_exists('WP_Filesystem')) {
+			require_once(ABSPATH.'wp-admin/includes/file.php');
 		}
 		// Load `WP_Filesystem`.
 		WP_Filesystem();
 		global $wp_filesystem;
 
 		// Parse the url.
-		$parts = wp_parse_url( $url );
+		$parts = wp_parse_url($url);
 
 		// Get the bare filename (filename w/o the extension).
-		$basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
+		$basename = pathinfo($parts['path'], PATHINFO_FILENAME);
 
 		// Get the base dir.
 		$wp_upload_dir = wp_upload_dir();
 
 		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+		$upload_dir = $wp_upload_dir['basedir'].'/wl'.$wp_upload_dir['subdir'];
+		$upload_url = $wp_upload_dir['baseurl'].'/wl'.$wp_upload_dir['subdir'];
 
 		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
+		$image_full_path = $upload_dir.'/'.$basename;
+		$image_full_url  = $upload_url.'/'.$basename;
 
 		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+		if ( ! wp_mkdir_p($upload_dir)) {
+			wl_write_log("save_image_from_url : failed creating upload dir $upload_dir \n");
 
 			return false;
 		};
 
-		$response = self::get_response( $url );
+		$response = self::get_response($url);
 
 		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+		if (false === $response) {
+			wl_write_log("save_image_from_url : failed to fetch the response from: $url \n");
 
 			return false;
 		}
 
 		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+		$content_type = wp_remote_retrieve_header($response, 'content-type');
 
 		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
+		$extension = self::get_extension_from_content_type($content_type);
 
 		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
+		if (empty($extension)) {
 			return false;
 		}
 
@@ -77,7 +77,7 @@ 
 		$image_full_url  .= $extension;
 
 		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+		$wp_filesystem->put_contents($image_full_path, wp_remote_retrieve_body($response));
 
 		// Return the path.
 		return array(
@@ -97,10 +97,10 @@ 
 	 * @return string|bool The file extension on success and
 	 * false on fail or if the content type is not supported.
 	 */
-	private static function get_extension_from_content_type( $content_type ) {
+	private static function get_extension_from_content_type($content_type) {
 
 		// Return the extension if match.
-		switch ( $content_type ) {
+		switch ($content_type) {
 			case 'image/jpeg':
 			case 'image/jpg':
 				return '.jpg';
@@ -123,17 +123,17 @@ 
 	 *
 	 * @return false|array True on success and false on failure.
 	 */
-	private static function get_response( $url ) {
+	private static function get_response($url) {
 		// Request the remote file.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Bail out if the response is not ok.
 		if (
-			is_wp_error( $response )
+			is_wp_error($response)
 			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
+			|| ! isset($response['body'])
 		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
+			wl_write_log("save_image_from_url : error fetching image $url \n");
 
 			return false;
 		}

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

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	/**
 	 * Retrieve the current db version.
 	 *
-	 * @return type
+	 * @return string
 	 */
 	private function get_current_version() {
 		return get_option( 'wl_db_version', '0.0.0' );

Spacing +24 added lines, -24 removed lines

@@ -44,23 +44,23 @@ 
 	public function __construct() {
 
 		/** Installs. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-1-0-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-10-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-12-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-14-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-15-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-18-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-18-3.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-19-5.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-3-20-0.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-all-entity-types.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'install/class-wordlift-install-package-type.php';
 
 
 		self::$instance = $this;
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 	}
 
@@ -84,12 +84,12 @@ 
 	 */
 	public function install() {
 
-		if ( false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+		if (false === get_transient('_wl_installing')) {
+			set_transient('_wl_installing', true, 5 * MINUTE_IN_SECONDS);
 
 			$this->do_install();
 
-			delete_transient( '_wl_installing' );
+			delete_transient('_wl_installing');
 		}
 
 	}
@@ -122,24 +122,24 @@ 
 		$version = null;
 
 		/** @var Wordlift_Install $install */
-		foreach ( $installs as $install ) {
+		foreach ($installs as $install) {
 			// Get the install version.
 			$version = $install->get_version();
 
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-			     || $install->must_install() ) {
+			if (version_compare($version, $this->get_current_version(), '>')
+			     || $install->must_install()) {
 
-				$class_name = get_class( $install );
+				$class_name = get_class($install);
 
-				$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+				$this->log->info("Current version is {$this->get_current_version()}, installing $class_name...");
 
 				// Install version.
 				$install->install();
 
-				$this->log->info( "$class_name installed." );
+				$this->log->info("$class_name installed.");
 
 				// Bump the version.
-				update_option( 'wl_db_version', $version );
+				update_option('wl_db_version', $version);
 
 			}
 
@@ -153,7 +153,7 @@ 
 	 * @return type
 	 */
 	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
+		return get_option('wl_db_version', '0.0.0');
 	}
 
 }

Indentation +122 added lines, -122 removed lines

@@ -18,141 +18,141 @@
  */
 class Wordlift_Install_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Install_Service $instance A {@link Wordlift_Install_Service} instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Wordlift_Install_Service constructor.
-	 *
-	 * @since 3.18.0
-	 */
-	public function __construct() {
-
-		/** Installs. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
-
-		self::$instance = $this;
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.18.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Loop thought all versions and install the updates.
-	 *
-	 * @since 3.20.0 use a transient to avoid concurrent installation calls.
-	 * @since 3.18.0
-	 *
-	 * @return void
-	 */
-	public function install() {
-
-		if ( false === get_transient( '_wl_installing' ) ) {
-			set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
-
-			$this->do_install();
-
-			delete_transient( '_wl_installing' );
-		}
-
-	}
-
-	/**
-	 * Perform the actual installation.
-	 *
-	 * @since 3.20.0
-	 */
-	private function do_install() {
-
-		// Get the install services.
-		$installs = array(
-			new Wordlift_Install_1_0_0(),
-			new Wordlift_Install_3_10_0(),
-			new Wordlift_Install_3_12_0(),
-			new Wordlift_Install_3_14_0(),
-			new Wordlift_Install_3_15_0(),
-			new Wordlift_Install_3_18_0(),
-			new Wordlift_Install_3_18_3(),
-			new Wordlift_Install_3_19_5(),
-			new Wordlift_Install_3_20_0(),
-			/*
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The singleton instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Install_Service $instance A {@link Wordlift_Install_Service} instance.
+     */
+    private static $instance;
+
+    /**
+     * Wordlift_Install_Service constructor.
+     *
+     * @since 3.18.0
+     */
+    public function __construct() {
+
+        /** Installs. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-1-0-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-10-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-12-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-14-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-15-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-18-3.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-19-5.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-3-20-0.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-all-entity-types.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'install/class-wordlift-install-package-type.php';
+
+        self::$instance = $this;
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.18.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Loop thought all versions and install the updates.
+     *
+     * @since 3.20.0 use a transient to avoid concurrent installation calls.
+     * @since 3.18.0
+     *
+     * @return void
+     */
+    public function install() {
+
+        if ( false === get_transient( '_wl_installing' ) ) {
+            set_transient( '_wl_installing', true, 5 * MINUTE_IN_SECONDS );
+
+            $this->do_install();
+
+            delete_transient( '_wl_installing' );
+        }
+
+    }
+
+    /**
+     * Perform the actual installation.
+     *
+     * @since 3.20.0
+     */
+    private function do_install() {
+
+        // Get the install services.
+        $installs = array(
+            new Wordlift_Install_1_0_0(),
+            new Wordlift_Install_3_10_0(),
+            new Wordlift_Install_3_12_0(),
+            new Wordlift_Install_3_14_0(),
+            new Wordlift_Install_3_15_0(),
+            new Wordlift_Install_3_18_0(),
+            new Wordlift_Install_3_18_3(),
+            new Wordlift_Install_3_19_5(),
+            new Wordlift_Install_3_20_0(),
+            /*
 			 * This should be enabled with #852.
 			 */
-			// new Wordlift_Install_All_Entity_Types(),
-			new Wordlift_Install_Package_Type(),
-		);
+            // new Wordlift_Install_All_Entity_Types(),
+            new Wordlift_Install_Package_Type(),
+        );
 
-		$version = null;
+        $version = null;
 
-		/** @var Wordlift_Install $install */
-		foreach ( $installs as $install ) {
-			// Get the install version.
-			$version = $install->get_version();
+        /** @var Wordlift_Install $install */
+        foreach ( $installs as $install ) {
+            // Get the install version.
+            $version = $install->get_version();
 
-			if ( version_compare( $version, $this->get_current_version(), '>' )
-			     || $install->must_install() ) {
+            if ( version_compare( $version, $this->get_current_version(), '>' )
+                 || $install->must_install() ) {
 
-				$class_name = get_class( $install );
+                $class_name = get_class( $install );
 
-				$this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
+                $this->log->info( "Current version is {$this->get_current_version()}, installing $class_name..." );
 
-				// Install version.
-				$install->install();
+                // Install version.
+                $install->install();
 
-				$this->log->info( "$class_name installed." );
+                $this->log->info( "$class_name installed." );
 
-				// Bump the version.
-				update_option( 'wl_db_version', $version );
+                // Bump the version.
+                update_option( 'wl_db_version', $version );
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieve the current db version.
-	 *
-	 * @return type
-	 */
-	private function get_current_version() {
-		return get_option( 'wl_db_version', '0.0.0' );
-	}
+    /**
+     * Retrieve the current db version.
+     *
+     * @return type
+     */
+    private function get_current_version() {
+        return get_option( 'wl_db_version', '0.0.0' );
+    }
 
 }

src/includes/class-wordlift-entity-page-service.php

Indentation +114 added lines, -114 removed lines

@@ -17,52 +17,52 @@ 
  */
 class Wordlift_Entity_Page_Service {
 
-	/**
-	 * Set the entity post types as one to be included in archive pages.
-	 *
-	 * In order to have entities show up in standard WP categories (Posts categories)
-	 * we configure the `entity` post type, but we also need to alter the main
-	 * WP query (which by default queries posts only) to include the `entities`.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param WP_Query $query WP's {@link WP_Query} instance.
-	 */
-	public function pre_get_posts( $query ) {
-
-		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
-			return;
-		}
-
-		// We don't want to alter the query if we're in the admin UI, if this is
-		// not a entity type achieve query, or if the `suppress_filters` is set.
-		//
-		// Note that it is unlikely for `suppress_filter` to be set on the front
-		// end, but let's be safe if it is set the calling code assumes no
-		// modifications of queries.
-
-		// Ignore admin side request, requests for which filters should be
-		// suppressed, and when we are not on a entity type archive page.
-		if ( is_admin() ||
-			 ! is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ||
-			 ! empty( $query->query_vars['suppress_filters'] )
-		) {
-			return;
-		}
-
-		// Events should be sorted by start date in descending order.
-		if ( is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event' ) ) {
-
-			// Update the query to use the start time meta and desc order.
-			$meta_query[] = array(
-				'key' => Wordlift_Schema_Service::FIELD_DATE_START,
-			);
-			$query->set( 'meta_query', $meta_query );
-			$query->set( 'orderby', 'meta_value' );
-			$query->set( 'order', 'DESC' );
-		} else {
-			/*
+    /**
+     * Set the entity post types as one to be included in archive pages.
+     *
+     * In order to have entities show up in standard WP categories (Posts categories)
+     * we configure the `entity` post type, but we also need to alter the main
+     * WP query (which by default queries posts only) to include the `entities`.
+     *
+     * @since 3.12.0
+     *
+     * @param WP_Query $query WP's {@link WP_Query} instance.
+     */
+    public function pre_get_posts( $query ) {
+
+        // Only for the main query, avoid problems with widgets and what not.
+        if ( ! $query->is_main_query() ) {
+            return;
+        }
+
+        // We don't want to alter the query if we're in the admin UI, if this is
+        // not a entity type achieve query, or if the `suppress_filters` is set.
+        //
+        // Note that it is unlikely for `suppress_filter` to be set on the front
+        // end, but let's be safe if it is set the calling code assumes no
+        // modifications of queries.
+
+        // Ignore admin side request, requests for which filters should be
+        // suppressed, and when we are not on a entity type archive page.
+        if ( is_admin() ||
+             ! is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ||
+             ! empty( $query->query_vars['suppress_filters'] )
+        ) {
+            return;
+        }
+
+        // Events should be sorted by start date in descending order.
+        if ( is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event' ) ) {
+
+            // Update the query to use the start time meta and desc order.
+            $meta_query[] = array(
+                'key' => Wordlift_Schema_Service::FIELD_DATE_START,
+            );
+            $query->set( 'meta_query', $meta_query );
+            $query->set( 'orderby', 'meta_value' );
+            $query->set( 'order', 'DESC' );
+        } else {
+            /*
 			 * All other entity types should be sorted by their connectivity.
 			 * For this we need to query the relationship table which has
 			 * to be done by manipulating the SQL generated for the query.
@@ -70,73 +70,73 @@ 
 			 * additional filters to handle it.
 			 */
 
-			add_filter( 'posts_join', array( $this, 'posts_join' ) );
-			add_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
-			add_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
-		}
-	}
-
-	/**
-	 * Filter handler that sets the join part of a query to include the
-	 * relationship table to be able to use it in the sorting.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $join_statement The join part of the SQL statement which is used for the query.
-	 *
-	 * @return string An join SQL which add the relationships table to the join.
-	 */
-	public function posts_join( $join_statement ) {
-
-		global $wpdb;
-
-		$join_statement .= " LEFT JOIN {$wpdb->prefix}wl_relation_instances ri "
-						   . " ON (ri.object_id = {$wpdb->posts}.ID)";
-
-		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_join', array( $this, 'posts_join' ) );
-
-		return $join_statement;
-	}
-
-	/**
-	 * Filter handler that sets the groupby part of a query to include the
-	 * relationship table to be able to use it in the sorting.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $groupby_statement The groupby part of the SQL statement which is used for the query.
-	 *
-	 * @return string A groupby SQL which add the relationships table to the join.
-	 */
-	public function posts_groupby( $groupby_statement ) {
-
-		$groupby_statement = 'ri.object_id, ' . $groupby_statement;
-
-		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
-
-		return $groupby_statement;
-	}
-
-	/**
-	 * Filter handler that sets the orderby part of a query to sort by number of
-	 * relationships.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $orderby_statement The orderby part of the SQL statement which is used for the query.
-	 *
-	 * @return string An orderby SQL which sorts by the number of relationships
-	 */
-	public function posts_orderby( $orderby_statement ) {
-
-		$orderby_statement = 'COUNT( ri.object_id ) DESC, ' . $orderby_statement;
-
-		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
-
-		return $orderby_statement;
-	}
+            add_filter( 'posts_join', array( $this, 'posts_join' ) );
+            add_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
+            add_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+        }
+    }
+
+    /**
+     * Filter handler that sets the join part of a query to include the
+     * relationship table to be able to use it in the sorting.
+     *
+     * @since 3.15.0
+     *
+     * @param string $join_statement The join part of the SQL statement which is used for the query.
+     *
+     * @return string An join SQL which add the relationships table to the join.
+     */
+    public function posts_join( $join_statement ) {
+
+        global $wpdb;
+
+        $join_statement .= " LEFT JOIN {$wpdb->prefix}wl_relation_instances ri "
+                            . " ON (ri.object_id = {$wpdb->posts}.ID)";
+
+        // Remove to make sure it will not run agan in other context.
+        remove_filter( 'posts_join', array( $this, 'posts_join' ) );
+
+        return $join_statement;
+    }
+
+    /**
+     * Filter handler that sets the groupby part of a query to include the
+     * relationship table to be able to use it in the sorting.
+     *
+     * @since 3.15.0
+     *
+     * @param string $groupby_statement The groupby part of the SQL statement which is used for the query.
+     *
+     * @return string A groupby SQL which add the relationships table to the join.
+     */
+    public function posts_groupby( $groupby_statement ) {
+
+        $groupby_statement = 'ri.object_id, ' . $groupby_statement;
+
+        // Remove to make sure it will not run agan in other context.
+        remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
+
+        return $groupby_statement;
+    }
+
+    /**
+     * Filter handler that sets the orderby part of a query to sort by number of
+     * relationships.
+     *
+     * @since 3.15.0
+     *
+     * @param string $orderby_statement The orderby part of the SQL statement which is used for the query.
+     *
+     * @return string An orderby SQL which sorts by the number of relationships
+     */
+    public function posts_orderby( $orderby_statement ) {
+
+        $orderby_statement = 'COUNT( ri.object_id ) DESC, ' . $orderby_statement;
+
+        // Remove to make sure it will not run agan in other context.
+        remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+
+        return $orderby_statement;
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -28,10 +28,10 @@ 
 	 *
 	 * @param WP_Query $query WP's {@link WP_Query} instance.
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
+		if ( ! $query->is_main_query()) {
 			return;
 		}
 
@@ -44,23 +44,23 @@ 
 
 		// Ignore admin side request, requests for which filters should be
 		// suppressed, and when we are not on a entity type archive page.
-		if ( is_admin() ||
-			 ! is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ||
-			 ! empty( $query->query_vars['suppress_filters'] )
+		if (is_admin() ||
+			 ! is_tax(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME) ||
+			 ! empty($query->query_vars['suppress_filters'])
 		) {
 			return;
 		}
 
 		// Events should be sorted by start date in descending order.
-		if ( is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event' ) ) {
+		if (is_tax(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event')) {
 
 			// Update the query to use the start time meta and desc order.
 			$meta_query[] = array(
 				'key' => Wordlift_Schema_Service::FIELD_DATE_START,
 			);
-			$query->set( 'meta_query', $meta_query );
-			$query->set( 'orderby', 'meta_value' );
-			$query->set( 'order', 'DESC' );
+			$query->set('meta_query', $meta_query);
+			$query->set('orderby', 'meta_value');
+			$query->set('order', 'DESC');
 		} else {
 			/*
 			 * All other entity types should be sorted by their connectivity.
@@ -70,9 +70,9 @@ 
 			 * additional filters to handle it.
 			 */
 
-			add_filter( 'posts_join', array( $this, 'posts_join' ) );
-			add_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
-			add_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+			add_filter('posts_join', array($this, 'posts_join'));
+			add_filter('posts_groupby', array($this, 'posts_groupby'));
+			add_filter('posts_orderby', array($this, 'posts_orderby'));
 		}
 	}
 
@@ -86,7 +86,7 @@ 
 	 *
 	 * @return string An join SQL which add the relationships table to the join.
 	 */
-	public function posts_join( $join_statement ) {
+	public function posts_join($join_statement) {
 
 		global $wpdb;
 
@@ -94,7 +94,7 @@ 
 						   . " ON (ri.object_id = {$wpdb->posts}.ID)";
 
 		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_join', array( $this, 'posts_join' ) );
+		remove_filter('posts_join', array($this, 'posts_join'));
 
 		return $join_statement;
 	}
@@ -109,12 +109,12 @@ 
 	 *
 	 * @return string A groupby SQL which add the relationships table to the join.
 	 */
-	public function posts_groupby( $groupby_statement ) {
+	public function posts_groupby($groupby_statement) {
 
-		$groupby_statement = 'ri.object_id, ' . $groupby_statement;
+		$groupby_statement = 'ri.object_id, '.$groupby_statement;
 
 		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
+		remove_filter('posts_groupby', array($this, 'posts_groupby'));
 
 		return $groupby_statement;
 	}
@@ -129,12 +129,12 @@ 
 	 *
 	 * @return string An orderby SQL which sorts by the number of relationships
 	 */
-	public function posts_orderby( $orderby_statement ) {
+	public function posts_orderby($orderby_statement) {
 
-		$orderby_statement = 'COUNT( ri.object_id ) DESC, ' . $orderby_statement;
+		$orderby_statement = 'COUNT( ri.object_id ) DESC, '.$orderby_statement;
 
 		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+		remove_filter('posts_orderby', array($this, 'posts_orderby'));
 
 		return $orderby_statement;
 	}