insideout10 / wordlift-plugin

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

Indentation +323 added lines, -323 removed lines

@@ -19,336 +19,336 @@
  */
 class Wordlift_User_Service {
 
-	/**
-	 * The meta key where the user's URI is stored.
-	 *
-	 * @since 3.1.7
-	 */
-	const URI_META_KEY = '_wl_uri';
-
-	/**
-	 * The user meta key where the deny entity edit flag is stored.
-	 *
-	 * @since 3.14.0
-	 */
-	const DENY_ENTITY_CREATE_META_KEY = '_wl_deny_entity_create';
-
-	/**
-	 * The meta key holding the entity id representing a {@link WP_User}.
-	 *
-	 * @since 3.14.0
-	 */
-	const ENTITY_META_KEY = '_wl_entity';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Create an instance of the User service.
-	 *
-	 * @since 3.1.7
-	 */
-	protected function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
-
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
-
-	}
-
-	/**
-	 * The singleton instance of the User service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
-	 */
-	private static $instance = null;
-
-	/**
-	 * Get the singleton instance of the User service.
-	 *
-	 * @return \Wordlift_User_Service The singleton instance of the User service.
-	 * @since 3.1.7
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the URI for a user.
-	 *
-	 * @param int $user_id The user id
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 * @since 3.1.7
-	 */
-	public function get_uri( $user_id ) {
-
-		// Try to get the URI stored in the user's meta and return it if available.
-		$dataset_uri = wl_configuration_get_redlink_dataset_uri();
-		$user_uri    = $this->_get_uri( $user_id );
-		if ( ! empty( $dataset_uri ) && ! empty( $user_uri ) && 0 === strpos( $user_uri, $dataset_uri ) ) {
-			return $user_uri;
-		}
-
-		// Try to build an URI, return false in case of failure.
-		$user_uri = $this->_build_uri( $user_id );
-		if ( false === $user_uri ) {
-			return false;
-		}
-
-		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
-
-		return $user_uri;
-	}
-
-	/**
-	 * Set the `id` of the entity representing a {@link WP_User}.
-	 *
-	 * If the `id` is set to 0 (or less) then the meta is deleted.
-	 *
-	 * @param int $user_id The {@link WP_User}.
-	 * @param int $value The entity {@link WP_Post} `id`.
-	 *
-	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
-	 * @since 3.14.0
-	 */
-	public function set_entity( $user_id, $value ) {
-
-		return 0 < $value
-			? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
-			: delete_user_meta( $user_id, self::ENTITY_META_KEY );
-	}
-
-	/**
-	 * Get the {@link WP_Post} `id` of the entity representing a {@link WP_User}.
-	 *
-	 * @param int $user_id The {@link WP_User}'s `id`.
-	 *
-	 * @return string|false The entity {@link WP_Post} `id` or an empty string if not set or false if the object id is invalid
-	 * @since 3.14.0
-	 */
-	public function get_entity( $user_id ) {
-
-		return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
-	}
-
-	/**
-	 * Get the user's URI stored in the user's meta.
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The user's URI or false if not found.
-	 * @since 3.1.7
-	 */
-	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	private function _get_uri( $user_id ) {
-
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
-
-		if ( empty( $user_uri ) ) {
-			return false;
-		}
-
-		return $user_uri;
-	}
-
-	/**
-	 * Build an URI for a user.
-	 *
-	 * @param int $user_id The user's id.
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 * @since 3.1.7
-	 */
-	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	private function _build_uri( $user_id ) {
-
-		// Get the user, return false in case of failure.
-		$user = get_userdata( $user_id );
-		if ( false === $user ) {
-			return false;
-		};
-
-		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
-			return false;
-		}
-
-		/**
-		 * @since 3.27.7 changed `user` to `author` to avoid potential clashes with CPTs ( `author` is reserved
-		 *  https://developer.wordpress.org/reference/functions/register_post_type/#reserved-post-types )
-		 */
-		return untrailingslashit( wl_configuration_get_redlink_dataset_uri() ) . "/author/$user->user_nicename";
-	}
-
-	/**
-	 * Store the URI in user's meta.
-	 *
-	 * @param int    $user_id The user's id.
-	 * @param string $user_uri The user's uri.
-	 *
-	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
-	 * @since 3.1.7
-	 */
-	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	private function _set_uri( $user_id, $user_uri ) {
-
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
-	}
-
-	/**
-	 * Mark an editor user as denied from editing entities.
-	 * Does nothing if the user is not an editor
-	 *
-	 * @param integer $user_id The ID of the user
-	 *
-	 * @since 3.14.0
-	 */
-	public function deny_editor_entity_create( $user_id ) {
-
-		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return;
-		}
-
-		// The user explicitly do not have the capability.
-		update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
-
-	}
-
-	/**
-	 * Remove the "deny entity editing" mark from an editor user.
-	 * Does nothing if the user is not an editor
-	 *
-	 * @param integer $user_id The ID of the user
-	 *
-	 * @since 3.14.0
-	 */
-	public function allow_editor_entity_create( $user_id ) {
-
-		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return;
-		}
-
-		// The user explicitly do not have the capability.
-		delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
-
-	}
-
-	/**
-	 * Get whether the 'deny editor entity editing' flag is set.
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return int bool True if editing is denied otherwise false.
-	 * @since 3.14.0
-	 */
-	public function is_deny_editor_entity_create( $user_id ) {
-
-		return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
-	}
-
-	/**
-	 * Check whether the {@link WP_User} with the specified `id` is an editor,
-	 * i.e. has the `editor` role.
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return bool True if the {@link WP_User} is an editor otherwise false.
-	 * @since 3.14.0
-	 */
-	public function is_editor( $user_id ) {
-
-		// Get the user.
-		$user = get_user_by( 'id', $user_id );
-
-		// Return true, if the user is found and has the `editor` role.
-		return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles, true );
-	}
-
-	/**
-	 * Check if an editor can create entities.
-	 *
-	 * @param int $user_id The user id of the user being checked.
-	 *
-	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
-	 * @since 3.14.0
-	 */
-	public function editor_can_create_entities( $user_id ) {
-
-		// Return true if not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return true;
-		}
-
-		// Check if the user explicitly denied.
-		return ! $this->is_deny_editor_entity_create( $user_id );
-	}
-
-	/**
-	 * Filter capabilities of user.
-	 *
-	 * Deny the capability of managing and editing entities for some users.
-	 *
-	 * @param array $allcaps All the capabilities of the user
-	 * @param array $cap [0] Required capability
-	 * @param array $args [0] Requested capability
-	 *                       [1] User ID
-	 *                       [2] Associated object ID
-	 *
-	 * @return array The capabilities array.
-	 * @since 3.14.0
-	 */
-	public function has_cap( $allcaps, $cap, $args ) {
-		/*
+    /**
+     * The meta key where the user's URI is stored.
+     *
+     * @since 3.1.7
+     */
+    const URI_META_KEY = '_wl_uri';
+
+    /**
+     * The user meta key where the deny entity edit flag is stored.
+     *
+     * @since 3.14.0
+     */
+    const DENY_ENTITY_CREATE_META_KEY = '_wl_deny_entity_create';
+
+    /**
+     * The meta key holding the entity id representing a {@link WP_User}.
+     *
+     * @since 3.14.0
+     */
+    const ENTITY_META_KEY = '_wl_entity';
+
+    /**
+     * The Log service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Create an instance of the User service.
+     *
+     * @since 3.1.7
+     */
+    protected function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+
+        add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+
+    }
+
+    /**
+     * The singleton instance of the User service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
+     */
+    private static $instance = null;
+
+    /**
+     * Get the singleton instance of the User service.
+     *
+     * @return \Wordlift_User_Service The singleton instance of the User service.
+     * @since 3.1.7
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the URI for a user.
+     *
+     * @param int $user_id The user id
+     *
+     * @return false|string The user's URI or false in case of failure.
+     * @since 3.1.7
+     */
+    public function get_uri( $user_id ) {
+
+        // Try to get the URI stored in the user's meta and return it if available.
+        $dataset_uri = wl_configuration_get_redlink_dataset_uri();
+        $user_uri    = $this->_get_uri( $user_id );
+        if ( ! empty( $dataset_uri ) && ! empty( $user_uri ) && 0 === strpos( $user_uri, $dataset_uri ) ) {
+            return $user_uri;
+        }
+
+        // Try to build an URI, return false in case of failure.
+        $user_uri = $this->_build_uri( $user_id );
+        if ( false === $user_uri ) {
+            return false;
+        }
+
+        // Store the URI for future requests (we need a "permanent" URI).
+        $this->_set_uri( $user_id, $user_uri );
+
+        return $user_uri;
+    }
+
+    /**
+     * Set the `id` of the entity representing a {@link WP_User}.
+     *
+     * If the `id` is set to 0 (or less) then the meta is deleted.
+     *
+     * @param int $user_id The {@link WP_User}.
+     * @param int $value The entity {@link WP_Post} `id`.
+     *
+     * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
+     * @since 3.14.0
+     */
+    public function set_entity( $user_id, $value ) {
+
+        return 0 < $value
+            ? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
+            : delete_user_meta( $user_id, self::ENTITY_META_KEY );
+    }
+
+    /**
+     * Get the {@link WP_Post} `id` of the entity representing a {@link WP_User}.
+     *
+     * @param int $user_id The {@link WP_User}'s `id`.
+     *
+     * @return string|false The entity {@link WP_Post} `id` or an empty string if not set or false if the object id is invalid
+     * @since 3.14.0
+     */
+    public function get_entity( $user_id ) {
+
+        return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
+    }
+
+    /**
+     * Get the user's URI stored in the user's meta.
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The user's URI or false if not found.
+     * @since 3.1.7
+     */
+    // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+    private function _get_uri( $user_id ) {
+
+        $user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+
+        if ( empty( $user_uri ) ) {
+            return false;
+        }
+
+        return $user_uri;
+    }
+
+    /**
+     * Build an URI for a user.
+     *
+     * @param int $user_id The user's id.
+     *
+     * @return false|string The user's URI or false in case of failure.
+     * @since 3.1.7
+     */
+    // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+    private function _build_uri( $user_id ) {
+
+        // Get the user, return false in case of failure.
+        $user = get_userdata( $user_id );
+        if ( false === $user ) {
+            return false;
+        };
+
+        // If the nicename is not set, return a failure.
+        if ( empty( $user->user_nicename ) ) {
+            return false;
+        }
+
+        /**
+         * @since 3.27.7 changed `user` to `author` to avoid potential clashes with CPTs ( `author` is reserved
+         *  https://developer.wordpress.org/reference/functions/register_post_type/#reserved-post-types )
+         */
+        return untrailingslashit( wl_configuration_get_redlink_dataset_uri() ) . "/author/$user->user_nicename";
+    }
+
+    /**
+     * Store the URI in user's meta.
+     *
+     * @param int    $user_id The user's id.
+     * @param string $user_uri The user's uri.
+     *
+     * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
+     * @since 3.1.7
+     */
+    // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+    private function _set_uri( $user_id, $user_uri ) {
+
+        return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+    }
+
+    /**
+     * Mark an editor user as denied from editing entities.
+     * Does nothing if the user is not an editor
+     *
+     * @param integer $user_id The ID of the user
+     *
+     * @since 3.14.0
+     */
+    public function deny_editor_entity_create( $user_id ) {
+
+        // Bail out if the user is not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return;
+        }
+
+        // The user explicitly do not have the capability.
+        update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
+
+    }
+
+    /**
+     * Remove the "deny entity editing" mark from an editor user.
+     * Does nothing if the user is not an editor
+     *
+     * @param integer $user_id The ID of the user
+     *
+     * @since 3.14.0
+     */
+    public function allow_editor_entity_create( $user_id ) {
+
+        // Bail out if the user is not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return;
+        }
+
+        // The user explicitly do not have the capability.
+        delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
+
+    }
+
+    /**
+     * Get whether the 'deny editor entity editing' flag is set.
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return int bool True if editing is denied otherwise false.
+     * @since 3.14.0
+     */
+    public function is_deny_editor_entity_create( $user_id ) {
+
+        return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
+    }
+
+    /**
+     * Check whether the {@link WP_User} with the specified `id` is an editor,
+     * i.e. has the `editor` role.
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return bool True if the {@link WP_User} is an editor otherwise false.
+     * @since 3.14.0
+     */
+    public function is_editor( $user_id ) {
+
+        // Get the user.
+        $user = get_user_by( 'id', $user_id );
+
+        // Return true, if the user is found and has the `editor` role.
+        return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles, true );
+    }
+
+    /**
+     * Check if an editor can create entities.
+     *
+     * @param int $user_id The user id of the user being checked.
+     *
+     * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
+     * @since 3.14.0
+     */
+    public function editor_can_create_entities( $user_id ) {
+
+        // Return true if not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return true;
+        }
+
+        // Check if the user explicitly denied.
+        return ! $this->is_deny_editor_entity_create( $user_id );
+    }
+
+    /**
+     * Filter capabilities of user.
+     *
+     * Deny the capability of managing and editing entities for some users.
+     *
+     * @param array $allcaps All the capabilities of the user
+     * @param array $cap [0] Required capability
+     * @param array $args [0] Requested capability
+     *                       [1] User ID
+     *                       [2] Associated object ID
+     *
+     * @return array The capabilities array.
+     * @since 3.14.0
+     */
+    public function has_cap( $allcaps, $cap, $args ) {
+        /*
 		 * For entity management/editing related capabilities
 		 * check that an editor was not explicitly denied (in user profile)
 		 * the capability.
 		 */
 
-		/*
+        /*
 		 * Need protection against the case of edit_user and likes which do not
 		 * require a capability, just request one.
 		 */
-		if ( empty( $cap ) || ! isset( $cap[0] ) ) {
-			return $allcaps;
-		}
-
-		if (
-			( 'edit_wordlift_entity' === $cap[0] ) ||
-			( 'edit_wordlift_entities' === $cap[0] ) ||
-			( 'edit_others_wordlift_entities' === $cap[0] ) ||
-			( 'publish_wordlift_entities' === $cap[0] ) ||
-			( 'read_private_wordlift_entities' === $cap[0] ) ||
-			( 'delete_wordlift_entity' === $cap[0] ) ||
-			( 'delete_wordlift_entities' === $cap[0] ) ||
-			( 'delete_others_wordlift_entities' === $cap[0] ) ||
-			( 'delete_published_wordlift_entities' === $cap[0] ) ||
-			( 'delete_private_wordlift_entities' === $cap[0] )
-		) {
-			$user_id = $args[1];
-
-			if ( ! $this->editor_can_create_entities( $user_id ) ) {
-				$allcaps[ $cap[0] ] = false;
-			}
-		}
-
-		return $allcaps;
-	}
+        if ( empty( $cap ) || ! isset( $cap[0] ) ) {
+            return $allcaps;
+        }
+
+        if (
+            ( 'edit_wordlift_entity' === $cap[0] ) ||
+            ( 'edit_wordlift_entities' === $cap[0] ) ||
+            ( 'edit_others_wordlift_entities' === $cap[0] ) ||
+            ( 'publish_wordlift_entities' === $cap[0] ) ||
+            ( 'read_private_wordlift_entities' === $cap[0] ) ||
+            ( 'delete_wordlift_entity' === $cap[0] ) ||
+            ( 'delete_wordlift_entities' === $cap[0] ) ||
+            ( 'delete_others_wordlift_entities' === $cap[0] ) ||
+            ( 'delete_published_wordlift_entities' === $cap[0] ) ||
+            ( 'delete_private_wordlift_entities' === $cap[0] )
+        ) {
+            $user_id = $args[1];
+
+            if ( ! $this->editor_can_create_entities( $user_id ) ) {
+                $allcaps[ $cap[0] ] = false;
+            }
+        }
+
+        return $allcaps;
+    }
 
 }

Spacing +52 added lines, -52 removed lines

@@ -56,9 +56,9 @@ 
 	 */
 	protected function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_User_Service');
 
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+		add_filter('user_has_cap', array($this, 'has_cap'), 10, 3);
 
 	}
 
@@ -79,7 +79,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -94,23 +94,23 @@ 
 	 * @return false|string The user's URI or false in case of failure.
 	 * @since 3.1.7
 	 */
-	public function get_uri( $user_id ) {
+	public function get_uri($user_id) {
 
 		// Try to get the URI stored in the user's meta and return it if available.
 		$dataset_uri = wl_configuration_get_redlink_dataset_uri();
-		$user_uri    = $this->_get_uri( $user_id );
-		if ( ! empty( $dataset_uri ) && ! empty( $user_uri ) && 0 === strpos( $user_uri, $dataset_uri ) ) {
+		$user_uri    = $this->_get_uri($user_id);
+		if ( ! empty($dataset_uri) && ! empty($user_uri) && 0 === strpos($user_uri, $dataset_uri)) {
 			return $user_uri;
 		}
 
 		// Try to build an URI, return false in case of failure.
-		$user_uri = $this->_build_uri( $user_id );
-		if ( false === $user_uri ) {
+		$user_uri = $this->_build_uri($user_id);
+		if (false === $user_uri) {
 			return false;
 		}
 
 		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
+		$this->_set_uri($user_id, $user_uri);
 
 		return $user_uri;
 	}
@@ -126,11 +126,11 @@ 
 	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
 	 * @since 3.14.0
 	 */
-	public function set_entity( $user_id, $value ) {
+	public function set_entity($user_id, $value) {
 
 		return 0 < $value
-			? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
-			: delete_user_meta( $user_id, self::ENTITY_META_KEY );
+			? update_user_meta($user_id, self::ENTITY_META_KEY, $value)
+			: delete_user_meta($user_id, self::ENTITY_META_KEY);
 	}
 
 	/**
@@ -141,9 +141,9 @@ 
 	 * @return string|false The entity {@link WP_Post} `id` or an empty string if not set or false if the object id is invalid
 	 * @since 3.14.0
 	 */
-	public function get_entity( $user_id ) {
+	public function get_entity($user_id) {
 
-		return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
+		return get_user_meta($user_id, self::ENTITY_META_KEY, true);
 	}
 
 	/**
@@ -155,11 +155,11 @@ 
 	 * @since 3.1.7
 	 */
 	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	private function _get_uri( $user_id ) {
+	private function _get_uri($user_id) {
 
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+		$user_uri = get_user_meta($user_id, self::URI_META_KEY, true);
 
-		if ( empty( $user_uri ) ) {
+		if (empty($user_uri)) {
 			return false;
 		}
 
@@ -175,16 +175,16 @@ 
 	 * @since 3.1.7
 	 */
 	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	private function _build_uri( $user_id ) {
+	private function _build_uri($user_id) {
 
 		// Get the user, return false in case of failure.
-		$user = get_userdata( $user_id );
-		if ( false === $user ) {
+		$user = get_userdata($user_id);
+		if (false === $user) {
 			return false;
 		};
 
 		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
+		if (empty($user->user_nicename)) {
 			return false;
 		}
 
@@ -192,7 +192,7 @@ 
 		 * @since 3.27.7 changed `user` to `author` to avoid potential clashes with CPTs ( `author` is reserved
 		 *  https://developer.wordpress.org/reference/functions/register_post_type/#reserved-post-types )
 		 */
-		return untrailingslashit( wl_configuration_get_redlink_dataset_uri() ) . "/author/$user->user_nicename";
+		return untrailingslashit(wl_configuration_get_redlink_dataset_uri())."/author/$user->user_nicename";
 	}
 
 	/**
@@ -205,9 +205,9 @@ 
 	 * @since 3.1.7
 	 */
 	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	private function _set_uri( $user_id, $user_uri ) {
+	private function _set_uri($user_id, $user_uri) {
 
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+		return update_user_meta($user_id, self::URI_META_KEY, $user_uri);
 	}
 
 	/**
@@ -218,15 +218,15 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function deny_editor_entity_create( $user_id ) {
+	public function deny_editor_entity_create($user_id) {
 
 		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return;
 		}
 
 		// The user explicitly do not have the capability.
-		update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
+		update_user_option($user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes');
 
 	}
 
@@ -238,15 +238,15 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function allow_editor_entity_create( $user_id ) {
+	public function allow_editor_entity_create($user_id) {
 
 		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return;
 		}
 
 		// The user explicitly do not have the capability.
-		delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
+		delete_user_option($user_id, self::DENY_ENTITY_CREATE_META_KEY);
 
 	}
 
@@ -258,9 +258,9 @@ 
 	 * @return int bool True if editing is denied otherwise false.
 	 * @since 3.14.0
 	 */
-	public function is_deny_editor_entity_create( $user_id ) {
+	public function is_deny_editor_entity_create($user_id) {
 
-		return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
+		return 'yes' === get_user_option(self::DENY_ENTITY_CREATE_META_KEY, $user_id);
 	}
 
 	/**
@@ -272,13 +272,13 @@ 
 	 * @return bool True if the {@link WP_User} is an editor otherwise false.
 	 * @since 3.14.0
 	 */
-	public function is_editor( $user_id ) {
+	public function is_editor($user_id) {
 
 		// Get the user.
-		$user = get_user_by( 'id', $user_id );
+		$user = get_user_by('id', $user_id);
 
 		// Return true, if the user is found and has the `editor` role.
-		return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles, true );
+		return is_a($user, 'WP_User') && in_array('editor', (array) $user->roles, true);
 	}
 
 	/**
@@ -289,15 +289,15 @@ 
 	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
 	 * @since 3.14.0
 	 */
-	public function editor_can_create_entities( $user_id ) {
+	public function editor_can_create_entities($user_id) {
 
 		// Return true if not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return true;
 		}
 
 		// Check if the user explicitly denied.
-		return ! $this->is_deny_editor_entity_create( $user_id );
+		return ! $this->is_deny_editor_entity_create($user_id);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 * @return array The capabilities array.
 	 * @since 3.14.0
 	 */
-	public function has_cap( $allcaps, $cap, $args ) {
+	public function has_cap($allcaps, $cap, $args) {
 		/*
 		 * For entity management/editing related capabilities
 		 * check that an editor was not explicitly denied (in user profile)
@@ -325,26 +325,26 @@ 
 		 * Need protection against the case of edit_user and likes which do not
 		 * require a capability, just request one.
 		 */
-		if ( empty( $cap ) || ! isset( $cap[0] ) ) {
+		if (empty($cap) || ! isset($cap[0])) {
 			return $allcaps;
 		}
 
 		if (
-			( 'edit_wordlift_entity' === $cap[0] ) ||
-			( 'edit_wordlift_entities' === $cap[0] ) ||
-			( 'edit_others_wordlift_entities' === $cap[0] ) ||
-			( 'publish_wordlift_entities' === $cap[0] ) ||
-			( 'read_private_wordlift_entities' === $cap[0] ) ||
-			( 'delete_wordlift_entity' === $cap[0] ) ||
-			( 'delete_wordlift_entities' === $cap[0] ) ||
-			( 'delete_others_wordlift_entities' === $cap[0] ) ||
-			( 'delete_published_wordlift_entities' === $cap[0] ) ||
-			( 'delete_private_wordlift_entities' === $cap[0] )
+			('edit_wordlift_entity' === $cap[0]) ||
+			('edit_wordlift_entities' === $cap[0]) ||
+			('edit_others_wordlift_entities' === $cap[0]) ||
+			('publish_wordlift_entities' === $cap[0]) ||
+			('read_private_wordlift_entities' === $cap[0]) ||
+			('delete_wordlift_entity' === $cap[0]) ||
+			('delete_wordlift_entities' === $cap[0]) ||
+			('delete_others_wordlift_entities' === $cap[0]) ||
+			('delete_published_wordlift_entities' === $cap[0]) ||
+			('delete_private_wordlift_entities' === $cap[0])
 		) {
 			$user_id = $args[1];
 
-			if ( ! $this->editor_can_create_entities( $user_id ) ) {
-				$allcaps[ $cap[0] ] = false;
+			if ( ! $this->editor_can_create_entities($user_id)) {
+				$allcaps[$cap[0]] = false;
 			}
 		}
 

src/includes/class-wordlift-sample-data-ajax-adapter.php

Indentation +41 added lines, -41 removed lines

@@ -17,59 +17,59 @@
  */
 class Wordlift_Sample_Data_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Sample_Data_Service} instance.
-	 *
-	 * @since  3.12.0
-	 * @access private
-	 * @var \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
-	 */
-	private $sample_data_service;
+    /**
+     * The {@link Wordlift_Sample_Data_Service} instance.
+     *
+     * @since  3.12.0
+     * @access private
+     * @var \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
+     */
+    private $sample_data_service;
 
-	/**
-	 * Create a {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
-	 */
-	public function __construct( $sample_data_service ) {
+    /**
+     * Create a {@link Wordlift_Sample_Data_Ajax_Adapter} instance.
+     *
+     * @since 3.12.0
+     *
+     * @param \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
+     */
+    public function __construct( $sample_data_service ) {
 
-		$this->sample_data_service = $sample_data_service;
+        $this->sample_data_service = $sample_data_service;
 
-	}
+    }
 
-	/**
-	 * Handle the `wl_sample_data_create` ajax action.
-	 *
-	 * @since 3.12.0
-	 */
-	public function create() {
+    /**
+     * Handle the `wl_sample_data_create` ajax action.
+     *
+     * @since 3.12.0
+     */
+    public function create() {
 
-		// Clean any potential garbage before us.
-		ob_clean();
+        // Clean any potential garbage before us.
+        ob_clean();
 
-		// Create the sample data.
-		$this->sample_data_service->create();
+        // Create the sample data.
+        $this->sample_data_service->create();
 
-		// Send success.
-		wp_send_json_success();
+        // Send success.
+        wp_send_json_success();
 
-	}
+    }
 
-	public function delete() {
+    public function delete() {
 
-		// Clean any potential garbage before us.
-		ob_clean();
+        // Clean any potential garbage before us.
+        ob_clean();
 
-		// Create the sample data.
-		$this->sample_data_service->delete();
+        // Create the sample data.
+        $this->sample_data_service->delete();
 
-		// Send success.
-		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@header( 'Content-Disposition: inline' );
-		wp_send_json_success();
+        // Send success.
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+        @header( 'Content-Disposition: inline' );
+        wp_send_json_success();
 
-	}
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 *
 	 * @param \Wordlift_Sample_Data_Service $sample_data_service The {@link Wordlift_Sample_Data_Service} instance.
 	 */
-	public function __construct( $sample_data_service ) {
+	public function __construct($sample_data_service) {
 
 		$this->sample_data_service = $sample_data_service;
 
@@ -67,7 +67,7 @@ 
 
 		// Send success.
 		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@header( 'Content-Disposition: inline' );
+		@header('Content-Disposition: inline');
 		wp_send_json_success();
 
 	}

src/includes/class-wordlift-i18n.php

Indentation +33 added lines, -33 removed lines

@@ -26,38 +26,38 @@
  */
 class Wordlift_I18n {
 
-	/**
-	 * The domain specified for this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string    $domain    The domain identifier for this plugin.
-	 */
-	private $domain;
-
-	/**
-	 * Load the plugin text domain for translation.
-	 *
-	 * @since    1.0.0
-	 */
-	public function load_plugin_textdomain() {
-
-		load_plugin_textdomain(
-			$this->domain,
-			false,
-			dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
-		);
-
-	}
-
-	/**
-	 * Set the domain equal to that of the specified domain.
-	 *
-	 * @since    1.0.0
-	 * @param    string $domain    The domain that represents the locale of this plugin.
-	 */
-	public function set_domain( $domain ) {
-		$this->domain = $domain;
-	}
+    /**
+     * The domain specified for this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string    $domain    The domain identifier for this plugin.
+     */
+    private $domain;
+
+    /**
+     * Load the plugin text domain for translation.
+     *
+     * @since    1.0.0
+     */
+    public function load_plugin_textdomain() {
+
+        load_plugin_textdomain(
+            $this->domain,
+            false,
+            dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
+        );
+
+    }
+
+    /**
+     * Set the domain equal to that of the specified domain.
+     *
+     * @since    1.0.0
+     * @param    string $domain    The domain that represents the locale of this plugin.
+     */
+    public function set_domain( $domain ) {
+        $this->domain = $domain;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		load_plugin_textdomain(
 			$this->domain,
 			false,
-			dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
+			dirname(dirname(plugin_basename(__FILE__))).'/languages/'
 		);
 
 	}
@@ -56,7 +56,7 @@ 
 	 * @since    1.0.0
 	 * @param    string $domain    The domain that represents the locale of this plugin.
 	 */
-	public function set_domain( $domain ) {
+	public function set_domain($domain) {
 		$this->domain = $domain;
 	}
 

src/includes/class-wordlift-schema-url-property-service.php

Indentation +173 added lines, -173 removed lines

@@ -13,178 +13,178 @@
  */
 class Wordlift_Schema_Url_Property_Service extends Wordlift_Property_Service {
 
-	/**
-	 * The meta key used to store data for this property. We don't use wl_url to
-	 * avoid potential confusion about other URLs.
-	 *
-	 * @since 3.6.0
-	 */
-	const META_KEY = 'wl_schema_url';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_rdf_predicate() {
-
-		return 'http://schema.org/url';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_rdf_data_type() {
-
-		return 'xsd:anyURI';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_data_type() {
-
-		return Wordlift_Schema_Service::DATA_TYPE_URI;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_cardinality() {
-
-		return INF;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_metabox_class() {
-
-		return 'Wl_Metabox_Field';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_metabox_label() {
-
-		return __( 'Web Site(s)', 'wordlift' );
-	}
-
-	/**
-	 * Create a Wordlift_Schema_Url_Property_Service instance.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Finally listen for metadata requests for this field.
-		$this->add_filter_get_post_metadata();
-	}
-
-	/**
-	 * Get the schema:url value for the specified post/entity.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|NULL The schema:url value or NULL if not set.
-	 * @since 3.6.0
-	 */
-	public function get( $post_id ) {
-
-		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, false );
-
-		// If the property has never been set, we set its default value the first
-		// time to <permalink>.
-		if ( empty( $values ) ) {
-			return array( '<permalink>' );
-		}
-
-		// If there's only one value and that value is empty, we return NULL, i.e.
-		// variable not set.
-		if ( 1 === count( $values ) && empty( $values[0] ) ) {
-			return null;
-		}
-
-		// Finally return whatever values the editor set.
-		return $values;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function sanitize( $value ) {
-
-		// TODO: check that it's an URL or that is <permalink>
-
-		return $value;
-	}
-
-	/**
-	 * Get direct calls to read this meta and alter the response according to our
-	 * own strategy, i.e. if a value has never been set for this meta, then return
-	 * <permalink>.
-	 *
-	 * @param mixed  $value The original value.
-	 * @param int    $object_id The post id.
-	 * @param string $meta_key The meta key. We expect wl_schema_url or we return straight the value.
-	 * @param bool   $single Whether to return a single value.
-	 *
-	 * @return array|mixed|NULL|string
-	 * @since 3.6.0
-	 */
-	public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
-
-		// It's not us, return the value.
-		if ( self::META_KEY !== $meta_key ) {
-			return $value;
-		}
-
-		$this->remove_filter_get_post_metadata();
-
-		$new_value = $this->get( $object_id );
-
-		$this->add_filter_get_post_metadata();
-
-		// If we must return a single value, but we don't have a value, then return an empty string.
-		if ( $single && ( $new_value === null || empty( $new_value ) ) ) {
-			return '';
-		}
-
-		// If we have a value and we need to return it as single, return the first value.
-		if ( $single ) {
-			return $new_value[0];
-		}
-
-		// Otherwise return the array.
-		return $new_value;
-	}
-
-	private function add_filter_get_post_metadata() {
-
-		add_filter(
-			'get_post_metadata',
-			array(
-				$this,
-				'get_post_metadata',
-			),
-			10,
-			4
-		);
-
-	}
-
-	private function remove_filter_get_post_metadata() {
-
-		remove_filter(
-			'get_post_metadata',
-			array(
-				$this,
-				'get_post_metadata',
-			),
-			10
-		);
-
-	}
+    /**
+     * The meta key used to store data for this property. We don't use wl_url to
+     * avoid potential confusion about other URLs.
+     *
+     * @since 3.6.0
+     */
+    const META_KEY = 'wl_schema_url';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_rdf_predicate() {
+
+        return 'http://schema.org/url';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_rdf_data_type() {
+
+        return 'xsd:anyURI';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_data_type() {
+
+        return Wordlift_Schema_Service::DATA_TYPE_URI;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_cardinality() {
+
+        return INF;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_metabox_class() {
+
+        return 'Wl_Metabox_Field';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_metabox_label() {
+
+        return __( 'Web Site(s)', 'wordlift' );
+    }
+
+    /**
+     * Create a Wordlift_Schema_Url_Property_Service instance.
+     *
+     * @since 3.6.0
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Finally listen for metadata requests for this field.
+        $this->add_filter_get_post_metadata();
+    }
+
+    /**
+     * Get the schema:url value for the specified post/entity.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|NULL The schema:url value or NULL if not set.
+     * @since 3.6.0
+     */
+    public function get( $post_id ) {
+
+        // Get the schema:url values set in WP.
+        $values = get_post_meta( $post_id, self::META_KEY, false );
+
+        // If the property has never been set, we set its default value the first
+        // time to <permalink>.
+        if ( empty( $values ) ) {
+            return array( '<permalink>' );
+        }
+
+        // If there's only one value and that value is empty, we return NULL, i.e.
+        // variable not set.
+        if ( 1 === count( $values ) && empty( $values[0] ) ) {
+            return null;
+        }
+
+        // Finally return whatever values the editor set.
+        return $values;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sanitize( $value ) {
+
+        // TODO: check that it's an URL or that is <permalink>
+
+        return $value;
+    }
+
+    /**
+     * Get direct calls to read this meta and alter the response according to our
+     * own strategy, i.e. if a value has never been set for this meta, then return
+     * <permalink>.
+     *
+     * @param mixed  $value The original value.
+     * @param int    $object_id The post id.
+     * @param string $meta_key The meta key. We expect wl_schema_url or we return straight the value.
+     * @param bool   $single Whether to return a single value.
+     *
+     * @return array|mixed|NULL|string
+     * @since 3.6.0
+     */
+    public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
+
+        // It's not us, return the value.
+        if ( self::META_KEY !== $meta_key ) {
+            return $value;
+        }
+
+        $this->remove_filter_get_post_metadata();
+
+        $new_value = $this->get( $object_id );
+
+        $this->add_filter_get_post_metadata();
+
+        // If we must return a single value, but we don't have a value, then return an empty string.
+        if ( $single && ( $new_value === null || empty( $new_value ) ) ) {
+            return '';
+        }
+
+        // If we have a value and we need to return it as single, return the first value.
+        if ( $single ) {
+            return $new_value[0];
+        }
+
+        // Otherwise return the array.
+        return $new_value;
+    }
+
+    private function add_filter_get_post_metadata() {
+
+        add_filter(
+            'get_post_metadata',
+            array(
+                $this,
+                'get_post_metadata',
+            ),
+            10,
+            4
+        );
+
+    }
+
+    private function remove_filter_get_post_metadata() {
+
+        remove_filter(
+            'get_post_metadata',
+            array(
+                $this,
+                'get_post_metadata',
+            ),
+            10
+        );
+
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function get_metabox_label() {
 
-		return __( 'Web Site(s)', 'wordlift' );
+		return __('Web Site(s)', 'wordlift');
 	}
 
 	/**
@@ -89,20 +89,20 @@ 
 	 * @return array|NULL The schema:url value or NULL if not set.
 	 * @since 3.6.0
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Get the schema:url values set in WP.
-		$values = get_post_meta( $post_id, self::META_KEY, false );
+		$values = get_post_meta($post_id, self::META_KEY, false);
 
 		// If the property has never been set, we set its default value the first
 		// time to <permalink>.
-		if ( empty( $values ) ) {
-			return array( '<permalink>' );
+		if (empty($values)) {
+			return array('<permalink>');
 		}
 
 		// If there's only one value and that value is empty, we return NULL, i.e.
 		// variable not set.
-		if ( 1 === count( $values ) && empty( $values[0] ) ) {
+		if (1 === count($values) && empty($values[0])) {
 			return null;
 		}
 
@@ -113,7 +113,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		// TODO: check that it's an URL or that is <permalink>
 
@@ -133,26 +133,26 @@ 
 	 * @return array|mixed|NULL|string
 	 * @since 3.6.0
 	 */
-	public function get_post_metadata( $value, $object_id, $meta_key, $single ) {
+	public function get_post_metadata($value, $object_id, $meta_key, $single) {
 
 		// It's not us, return the value.
-		if ( self::META_KEY !== $meta_key ) {
+		if (self::META_KEY !== $meta_key) {
 			return $value;
 		}
 
 		$this->remove_filter_get_post_metadata();
 
-		$new_value = $this->get( $object_id );
+		$new_value = $this->get($object_id);
 
 		$this->add_filter_get_post_metadata();
 
 		// If we must return a single value, but we don't have a value, then return an empty string.
-		if ( $single && ( $new_value === null || empty( $new_value ) ) ) {
+		if ($single && ($new_value === null || empty($new_value))) {
 			return '';
 		}
 
 		// If we have a value and we need to return it as single, return the first value.
-		if ( $single ) {
+		if ($single) {
 			return $new_value[0];
 		}
 

src/includes/class-wordlift-postid-to-jsonld-converter.php

Indentation +42 added lines, -42 removed lines

@@ -16,56 +16,56 @@
  */
 class Wordlift_Postid_To_Jsonld_Converter implements Wordlift_Post_Converter {
 
-	private $entity_post_to_jsonld_converter;
-	private $post_to_jsonld_converter;
+    private $entity_post_to_jsonld_converter;
+    private $post_to_jsonld_converter;
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * Wordlift_Entity_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
-	 * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
+    /**
+     * Wordlift_Entity_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
+     * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
 
-		$this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
-		$this->post_to_jsonld_converter        = $post_to_jsonld_converter;
+        $this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
+        $this->post_to_jsonld_converter        = $post_to_jsonld_converter;
 
-	}
+    }
 
-	/**
-	 * Convert a post to JSON-LD.
-	 *
-	 * @param string $id A post id (post or entity).
-	 * @param array  $references
-	 * @param array  $references_infos
-	 *
-	 * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
-	 * @since 3.8.0
-	 */
-	public function convert( $id, &$references = array(), &$references_infos = array() ) {
+    /**
+     * Convert a post to JSON-LD.
+     *
+     * @param string $id A post id (post or entity).
+     * @param array  $references
+     * @param array  $references_infos
+     *
+     * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
+     * @since 3.8.0
+     */
+    public function convert( $id, &$references = array(), &$references_infos = array() ) {
 
-		$this->log->trace( "Converting post $id..." );
+        $this->log->trace( "Converting post $id..." );
 
-		$entity_service = Wordlift_Entity_Service::get_instance();
+        $entity_service = Wordlift_Entity_Service::get_instance();
 
-		return $entity_service->is_entity( $id )
-			// Entity.
-			? $this->entity_post_to_jsonld_converter->convert( $id, $references, $references_infos )
-			// Post/Page.
-			: $this->post_to_jsonld_converter->convert( $id, $references );
-	}
+        return $entity_service->is_entity( $id )
+            // Entity.
+            ? $this->entity_post_to_jsonld_converter->convert( $id, $references, $references_infos )
+            // Post/Page.
+            : $this->post_to_jsonld_converter->convert( $id, $references );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -36,9 +36,9 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
+	public function __construct($entity_post_to_jsonld_converter, $post_to_jsonld_converter) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
 		$this->post_to_jsonld_converter        = $post_to_jsonld_converter;
@@ -55,17 +55,17 @@ 
 	 * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
 	 * @since 3.8.0
 	 */
-	public function convert( $id, &$references = array(), &$references_infos = array() ) {
+	public function convert($id, &$references = array(), &$references_infos = array()) {
 
-		$this->log->trace( "Converting post $id..." );
+		$this->log->trace("Converting post $id...");
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
-		return $entity_service->is_entity( $id )
+		return $entity_service->is_entity($id)
 			// Entity.
-			? $this->entity_post_to_jsonld_converter->convert( $id, $references, $references_infos )
+			? $this->entity_post_to_jsonld_converter->convert($id, $references, $references_infos)
 			// Post/Page.
-			: $this->post_to_jsonld_converter->convert( $id, $references );
+			: $this->post_to_jsonld_converter->convert($id, $references);
 	}
 
 }

src/includes/class-wordlift-entity-post-type-service.php

Indentation +171 added lines, -171 removed lines

@@ -16,176 +16,176 @@
  */
 class Wordlift_Entity_Post_Type_Service {
 
-	/**
-	 * The entity post type.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $post_type The entity post type.
-	 */
-	private $post_type;
-
-	/**
-	 * The entity type slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $slug The entity type slug.
-	 */
-	private $slug;
-
-	/**
-	 * 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;
-
-	/**
-	 * A singleton instance of the entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Post_Type_Service
-	 */
-	private static $instance;
-
-	/**
-	 * Create an entity type service instance.
-	 *
-	 * @param string $post_type The post type, e.g. entity.
-	 * @param string $slug The entity type slug, if the slug is empty, the default slug will be used.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct( $post_type, $slug ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->post_type = $post_type;
-
-		// We cannot assign an empty slug to the register_post_type function, therefore if the slug is empty we default
-		// to the type name.
-		$this->slug = $slug ? $slug : $post_type;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the entity type service singleton instance.
-	 *
-	 * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
-	 * @since 3.6.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the entity type slug.
-	 *
-	 * @return string The entity type slug.
-	 * @since 3.6.0
-	 */
-	public function get_slug() {
-
-		return $this->slug;
-	}
-
-	/**
-	 * Get the entity post type name.
-	 *
-	 * @return string The entity post type.
-	 * @since 3.6.0
-	 */
-	public function get_post_type() {
-
-		return $this->post_type;
-	}
-
-	/**
-	 * Register the WordLift entity post type. This method is hooked to WordPress' init action.
-	 *
-	 * @since 3.6.0
-	 */
-	public function register() {
-
-		$this->log->debug( "Registering post type $this->post_type..." );
-
-		$labels = array(
-			'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-			'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-			'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-			'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-			'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-			'new_item'           => __( 'New Entity', 'wordlift' ),
-			'all_items'          => __( 'All Entities', 'wordlift' ),
-			'view_item'          => __( 'View Entity', 'wordlift' ),
-			'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-			'not_found'          => __( 'No entities found', 'wordlift' ),
-			'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
-			'parent_item_colon'  => '',
-			'menu_name'          => __( 'Vocabulary', 'wordlift' ),
-		);
-
-		$args = array(
-			'labels'          => $labels,
-			'description'     => 'Holds our vocabulary (set of entities) and entity specific data',
-			'public'          => true,
-			'menu_position'   => 20,
-			// after the pages menu.
-			// Add support for 'authors' and 'revisions':
-			// * see https://github.com/insideout10/wordlift-plugin/issues/395
-			// * see https://github.com/insideout10/wordlift-plugin/issues/376
-			'supports'        => array(
-				'title',
-				'editor',
-				'thumbnail',
-				'excerpt',
-				'comments',
-				'author',
-				'revisions',
-				'custom-fields',
-			),
-			'has_archive'     => true,
-			'menu_icon'       => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
-			// Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
-			'rewrite'         => array( 'slug' => $this->slug ),
-			'capability_type' => array(
-				'wordlift_entity',
-				'wordlift_entities',
-			),
-			'capabilities'    => array(
-				'delete_posts' => 'delete_wordlift_entities',
-			),
-			'rest_base'       => 'entities',
-			'show_in_rest'    => true,
-			/**
-			 * Filter: wl_feature__enable__vocabulary.
-			 *
-			 * @param bool whether the vocabulary needs to be shown in menu.
-			 *
-			 * @return bool
-			 * @since 3.27.6
-			 */
-			'show_in_menu'    => apply_filters( 'wl_feature__enable__vocabulary', true ),
-		);
-
-		register_post_type( $this->post_type, $args );
-
-		// Enable WP's standard `category` taxonomy for entities.
-		//
-		// While this enables editors to bind entities to the WP posts' category
-		// taxonomy, in Wordlift_Category_Taxonomy_Service we also need to alter
-		// WP's main category query to include the `entity` post type.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/442
-		register_taxonomy_for_object_type( 'category', $this->post_type );
-
-	}
+    /**
+     * The entity post type.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $post_type The entity post type.
+     */
+    private $post_type;
+
+    /**
+     * The entity type slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $slug The entity type slug.
+     */
+    private $slug;
+
+    /**
+     * 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;
+
+    /**
+     * A singleton instance of the entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Entity_Post_Type_Service
+     */
+    private static $instance;
+
+    /**
+     * Create an entity type service instance.
+     *
+     * @param string $post_type The post type, e.g. entity.
+     * @param string $slug The entity type slug, if the slug is empty, the default slug will be used.
+     *
+     * @since 3.6.0
+     */
+    public function __construct( $post_type, $slug ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->post_type = $post_type;
+
+        // We cannot assign an empty slug to the register_post_type function, therefore if the slug is empty we default
+        // to the type name.
+        $this->slug = $slug ? $slug : $post_type;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the entity type service singleton instance.
+     *
+     * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
+     * @since 3.6.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the entity type slug.
+     *
+     * @return string The entity type slug.
+     * @since 3.6.0
+     */
+    public function get_slug() {
+
+        return $this->slug;
+    }
+
+    /**
+     * Get the entity post type name.
+     *
+     * @return string The entity post type.
+     * @since 3.6.0
+     */
+    public function get_post_type() {
+
+        return $this->post_type;
+    }
+
+    /**
+     * Register the WordLift entity post type. This method is hooked to WordPress' init action.
+     *
+     * @since 3.6.0
+     */
+    public function register() {
+
+        $this->log->debug( "Registering post type $this->post_type..." );
+
+        $labels = array(
+            'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
+            'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
+            'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
+            'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
+            'edit_item'          => __( 'Edit Entity', 'wordlift' ),
+            'new_item'           => __( 'New Entity', 'wordlift' ),
+            'all_items'          => __( 'All Entities', 'wordlift' ),
+            'view_item'          => __( 'View Entity', 'wordlift' ),
+            'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
+            'not_found'          => __( 'No entities found', 'wordlift' ),
+            'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+            'parent_item_colon'  => '',
+            'menu_name'          => __( 'Vocabulary', 'wordlift' ),
+        );
+
+        $args = array(
+            'labels'          => $labels,
+            'description'     => 'Holds our vocabulary (set of entities) and entity specific data',
+            'public'          => true,
+            'menu_position'   => 20,
+            // after the pages menu.
+            // Add support for 'authors' and 'revisions':
+            // * see https://github.com/insideout10/wordlift-plugin/issues/395
+            // * see https://github.com/insideout10/wordlift-plugin/issues/376
+            'supports'        => array(
+                'title',
+                'editor',
+                'thumbnail',
+                'excerpt',
+                'comments',
+                'author',
+                'revisions',
+                'custom-fields',
+            ),
+            'has_archive'     => true,
+            'menu_icon'       => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
+            // Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
+            'rewrite'         => array( 'slug' => $this->slug ),
+            'capability_type' => array(
+                'wordlift_entity',
+                'wordlift_entities',
+            ),
+            'capabilities'    => array(
+                'delete_posts' => 'delete_wordlift_entities',
+            ),
+            'rest_base'       => 'entities',
+            'show_in_rest'    => true,
+            /**
+             * Filter: wl_feature__enable__vocabulary.
+             *
+             * @param bool whether the vocabulary needs to be shown in menu.
+             *
+             * @return bool
+             * @since 3.27.6
+             */
+            'show_in_menu'    => apply_filters( 'wl_feature__enable__vocabulary', true ),
+        );
+
+        register_post_type( $this->post_type, $args );
+
+        // Enable WP's standard `category` taxonomy for entities.
+        //
+        // While this enables editors to bind entities to the WP posts' category
+        // taxonomy, in Wordlift_Category_Taxonomy_Service we also need to alter
+        // WP's main category query to include the `entity` post type.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/442
+        register_taxonomy_for_object_type( 'category', $this->post_type );
+
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -60,9 +60,9 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	public function __construct( $post_type, $slug ) {
+	public function __construct($post_type, $slug) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->post_type = $post_type;
 
@@ -114,22 +114,22 @@ 
 	 */
 	public function register() {
 
-		$this->log->debug( "Registering post type $this->post_type..." );
+		$this->log->debug("Registering post type $this->post_type...");
 
 		$labels = array(
-			'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-			'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-			'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-			'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-			'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-			'new_item'           => __( 'New Entity', 'wordlift' ),
-			'all_items'          => __( 'All Entities', 'wordlift' ),
-			'view_item'          => __( 'View Entity', 'wordlift' ),
-			'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-			'not_found'          => __( 'No entities found', 'wordlift' ),
-			'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+			'name'               => _x('Vocabulary', 'post type general name', 'wordlift'),
+			'singular_name'      => _x('Entity', 'post type singular name', 'wordlift'),
+			'add_new'            => _x('Add New Entity', 'entity', 'wordlift'),
+			'add_new_item'       => __('Add New Entity', 'wordlift'),
+			'edit_item'          => __('Edit Entity', 'wordlift'),
+			'new_item'           => __('New Entity', 'wordlift'),
+			'all_items'          => __('All Entities', 'wordlift'),
+			'view_item'          => __('View Entity', 'wordlift'),
+			'search_items'       => __('Search in Vocabulary', 'wordlift'),
+			'not_found'          => __('No entities found', 'wordlift'),
+			'not_found_in_trash' => __('No entities found in the Trash', 'wordlift'),
 			'parent_item_colon'  => '',
-			'menu_name'          => __( 'Vocabulary', 'wordlift' ),
+			'menu_name'          => __('Vocabulary', 'wordlift'),
 		);
 
 		$args = array(
@@ -152,9 +152,9 @@ 
 				'custom-fields',
 			),
 			'has_archive'     => true,
-			'menu_icon'       => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
+			'menu_icon'       => WP_CONTENT_URL.'/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
 			// Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
-			'rewrite'         => array( 'slug' => $this->slug ),
+			'rewrite'         => array('slug' => $this->slug),
 			'capability_type' => array(
 				'wordlift_entity',
 				'wordlift_entities',
@@ -172,10 +172,10 @@ 
 			 * @return bool
 			 * @since 3.27.6
 			 */
-			'show_in_menu'    => apply_filters( 'wl_feature__enable__vocabulary', true ),
+			'show_in_menu'    => apply_filters('wl_feature__enable__vocabulary', true),
 		);
 
-		register_post_type( $this->post_type, $args );
+		register_post_type($this->post_type, $args);
 
 		// Enable WP's standard `category` taxonomy for entities.
 		//
@@ -184,7 +184,7 @@ 
 		// WP's main category query to include the `entity` post type.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/442
-		register_taxonomy_for_object_type( 'category', $this->post_type );
+		register_taxonomy_for_object_type('category', $this->post_type);
 
 	}
 

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

Indentation +227 added lines, -227 removed lines

@@ -18,235 +18,235 @@
  */
 class Wordlift_Publisher_Service {
 
-	protected function __construct() {
-
-	}
-
-	private static $instance = null;
-
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Counts the number of potential publishers.
-	 *
-	 * @return int The number of potential publishers.
-	 * @since 3.11.0
-	 */
-	public function count() {
-
-		// Search for entities which are either a Person
-		// or Organization.
-
-		// Get only the ids as all we need is the count.
-		$entities = get_posts(
-			array(
-				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
-				'tax_query'      => array(
-					array(
-						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
-					),
-				),
-				'fields'         => 'ids',
-			)
-		);
-
-		// Finally return the count.
-		return count( $entities );
-	}
-
-	/**
-	 * Search SQL filter for matching against post title only.
-	 *
-	 * @link    http://wordpress.stackexchange.com/a/11826/1685
-	 *
-	 * @since   3.15.0
-	 *
-	 * @param string   $search The search string.
-	 * @param WP_Query $wp_query The {@link WP_Query} instance.
-	 *
-	 * @return array|string An array of results.
-	 */
-	public function limit_search_to_title( $search, $wp_query ) {
-
-		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
-			return $search;
-		}
-
-		global $wpdb;
-
-		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
-		$search     = array();
-
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
-		}
-
-		if ( ! is_user_logged_in() ) {
-			$search[] = "$wpdb->posts.post_password = ''";
-		}
-
-		$search = ' AND ' . implode( ' AND ', $search );
-
-		return $search;
-	}
-
-	/**
-	 * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
-	 * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
-	 *
-	 * @param string $filter The title filter.
-	 *
-	 * @return array An array of results in a select2 friendly format.
-	 * @since 3.11.0
-	 */
-	public function query( $filter = '' ) {
-
-		// Search for the filter in the titles only.
-		add_filter(
-			'posts_search',
-			array(
-				$this,
-				'limit_search_to_title',
-			),
-			10,
-			2
-		);
-
-		/*
+    protected function __construct() {
+
+    }
+
+    private static $instance = null;
+
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Counts the number of potential publishers.
+     *
+     * @return int The number of potential publishers.
+     * @since 3.11.0
+     */
+    public function count() {
+
+        // Search for entities which are either a Person
+        // or Organization.
+
+        // Get only the ids as all we need is the count.
+        $entities = get_posts(
+            array(
+                'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+                'post_status'    => 'publish',
+                'posts_per_page' => - 1,
+                'tax_query'      => array(
+                    array(
+                        'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                        'field'    => 'slug',
+                        'terms'    => array( 'organization', 'person' ),
+                    ),
+                ),
+                'fields'         => 'ids',
+            )
+        );
+
+        // Finally return the count.
+        return count( $entities );
+    }
+
+    /**
+     * Search SQL filter for matching against post title only.
+     *
+     * @link    http://wordpress.stackexchange.com/a/11826/1685
+     *
+     * @since   3.15.0
+     *
+     * @param string   $search The search string.
+     * @param WP_Query $wp_query The {@link WP_Query} instance.
+     *
+     * @return array|string An array of results.
+     */
+    public function limit_search_to_title( $search, $wp_query ) {
+
+        // Bail out if the search or the `search_terms` haven't been set.
+        if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+            return $search;
+        }
+
+        global $wpdb;
+
+        $query_vars = $wp_query->query_vars;
+        $percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+        $search     = array();
+
+        foreach ( (array) $query_vars['search_terms'] as $term ) {
+            $search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+        }
+
+        if ( ! is_user_logged_in() ) {
+            $search[] = "$wpdb->posts.post_password = ''";
+        }
+
+        $search = ' AND ' . implode( ' AND ', $search );
+
+        return $search;
+    }
+
+    /**
+     * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
+     * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
+     *
+     * @param string $filter The title filter.
+     *
+     * @return array An array of results in a select2 friendly format.
+     * @since 3.11.0
+     */
+    public function query( $filter = '' ) {
+
+        // Search for the filter in the titles only.
+        add_filter(
+            'posts_search',
+            array(
+                $this,
+                'limit_search_to_title',
+            ),
+            10,
+            2
+        );
+
+        /*
 		 * Search for entities which are either a Person
 		 * or Organization. Sort the results by title in ascending order.
 		 */
-		$entities = get_posts(
-			array(
-				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
-				'tax_query'      => array(
-					array(
-						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
-					),
-				),
-				's'              => $filter,
-				'orderby'        => 'title',
-				'order'          => 'ASC',
-			)
-		);
-
-		// Remove the search filter added before the query.
-		remove_filter(
-			'posts_search',
-			array(
-				$this,
-				'limit_search_to_title',
-			),
-			10,
-			2
-		);
-
-		// Set a reference to ourselves to pass to the closure.
-		$publisher_service = $this;
-
-		// Map the results in a `Select2` compatible array.
-		return array_map(
-			function ( $entity ) use ( $publisher_service ) {
-				$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-				$thumb_id = get_post_thumbnail_id( $entity->ID );
-
-				return array(
-					'id'            => $entity->ID,
-					'text'          => $entity->post_title,
-					'type'          => $type[0]->name,
-					'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
-				);
-			},
-			$entities
-		);
-	}
-
-	/**
-	 * Get the thumbnail's URL.
-	 *
-	 * @param int    $attachment_id The attachment id.
-	 * @param string $size The attachment size (default = 'thumbnail').
-	 *
-	 * @return string|bool The image URL or false if not found.
-	 * @since 3.11.0
-	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
-
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
-
-		return isset( $image['0'] ) ? $image['0'] : false;
-	}
-
-	/**
-	 * Add additional instructions to featured image metabox
-	 * when the entity type is the publisher.
-	 *
-	 * @param string $content Current metabox content.
-	 *
-	 * @return string $content metabox content with additional instructions.
-	 * @since  3.19.0
-	 */
-	public function add_featured_image_instruction( $content ) {
-		// Get the current post ID.
-		$post_id = get_the_ID();
-
-		// Get the publisher id.
-		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-
-		// Bail if for some reason the post id is not set.
-		if (
-			empty( $post_id ) ||
-			$post_id !== (int) $publisher_id
-		) {
-			return $content;
-		}
-
-		$terms = wp_get_post_terms(
-			$post_id, // The post id.
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // The taxonomy slug.
-			array(
-				'fields' => 'slugs',
-				// We don't need all fields, but only slugs.
-			)
-		);
-
-		// Check that the entity type is "Organization".
-		if ( in_array( 'organization', $terms, true ) ) {
-			// Add the featured image description when the type is "Organization".
-
-			$link     = sprintf(
-				'<a target="_blank" href="%s">%s</a>',
-				esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
-				esc_html__( 'AMP logo guidelines', 'wordlift' )
-			);
-			$content .= sprintf(
-				'<p>'
-								/* translators: %s: AMP logo guidelines. */
-								 . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
-								 . '</p>',
-				$link
-			);
-		}
-
-		// Finally return the content.
-		return $content;
-	}
+        $entities = get_posts(
+            array(
+                'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+                'post_status'    => 'publish',
+                'posts_per_page' => - 1,
+                'tax_query'      => array(
+                    array(
+                        'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                        'field'    => 'slug',
+                        'terms'    => array( 'organization', 'person' ),
+                    ),
+                ),
+                's'              => $filter,
+                'orderby'        => 'title',
+                'order'          => 'ASC',
+            )
+        );
+
+        // Remove the search filter added before the query.
+        remove_filter(
+            'posts_search',
+            array(
+                $this,
+                'limit_search_to_title',
+            ),
+            10,
+            2
+        );
+
+        // Set a reference to ourselves to pass to the closure.
+        $publisher_service = $this;
+
+        // Map the results in a `Select2` compatible array.
+        return array_map(
+            function ( $entity ) use ( $publisher_service ) {
+                $type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+                $thumb_id = get_post_thumbnail_id( $entity->ID );
+
+                return array(
+                    'id'            => $entity->ID,
+                    'text'          => $entity->post_title,
+                    'type'          => $type[0]->name,
+                    'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+                );
+            },
+            $entities
+        );
+    }
+
+    /**
+     * Get the thumbnail's URL.
+     *
+     * @param int    $attachment_id The attachment id.
+     * @param string $size The attachment size (default = 'thumbnail').
+     *
+     * @return string|bool The image URL or false if not found.
+     * @since 3.11.0
+     */
+    public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+
+        $image = wp_get_attachment_image_src( $attachment_id, $size );
+
+        return isset( $image['0'] ) ? $image['0'] : false;
+    }
+
+    /**
+     * Add additional instructions to featured image metabox
+     * when the entity type is the publisher.
+     *
+     * @param string $content Current metabox content.
+     *
+     * @return string $content metabox content with additional instructions.
+     * @since  3.19.0
+     */
+    public function add_featured_image_instruction( $content ) {
+        // Get the current post ID.
+        $post_id = get_the_ID();
+
+        // Get the publisher id.
+        $publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
+
+        // Bail if for some reason the post id is not set.
+        if (
+            empty( $post_id ) ||
+            $post_id !== (int) $publisher_id
+        ) {
+            return $content;
+        }
+
+        $terms = wp_get_post_terms(
+            $post_id, // The post id.
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // The taxonomy slug.
+            array(
+                'fields' => 'slugs',
+                // We don't need all fields, but only slugs.
+            )
+        );
+
+        // Check that the entity type is "Organization".
+        if ( in_array( 'organization', $terms, true ) ) {
+            // Add the featured image description when the type is "Organization".
+
+            $link     = sprintf(
+                '<a target="_blank" href="%s">%s</a>',
+                esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
+                esc_html__( 'AMP logo guidelines', 'wordlift' )
+            );
+            $content .= sprintf(
+                '<p>'
+                                /* translators: %s: AMP logo guidelines. */
+                                    . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
+                                    . '</p>',
+                $link
+            );
+        }
+
+        // Finally return the content.
+        return $content;
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -26,7 +26,7 @@ 
 
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -49,12 +49,12 @@ 
 			array(
 				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				'tax_query'      => array(
 					array(
 						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
+						'terms'    => array('organization', 'person'),
 					),
 				),
 				'fields'         => 'ids',
@@ -62,7 +62,7 @@ 
 		);
 
 		// Finally return the count.
-		return count( $entities );
+		return count($entities);
 	}
 
 	/**
@@ -77,28 +77,28 @@ 
 	 *
 	 * @return array|string An array of results.
 	 */
-	public function limit_search_to_title( $search, $wp_query ) {
+	public function limit_search_to_title($search, $wp_query) {
 
 		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+		if (empty($search) || empty($wp_query->query_vars['search_terms'])) {
 			return $search;
 		}
 
 		global $wpdb;
 
 		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+		$percent    = ! empty($query_vars['exact']) ? '' : '%';
 		$search     = array();
 
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+		foreach ((array) $query_vars['search_terms'] as $term) {
+			$search[] = $wpdb->prepare("$wpdb->posts.post_title LIKE %s", $percent.$wpdb->esc_like($term).$percent);
 		}
 
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			$search[] = "$wpdb->posts.post_password = ''";
 		}
 
-		$search = ' AND ' . implode( ' AND ', $search );
+		$search = ' AND '.implode(' AND ', $search);
 
 		return $search;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return array An array of results in a select2 friendly format.
 	 * @since 3.11.0
 	 */
-	public function query( $filter = '' ) {
+	public function query($filter = '') {
 
 		// Search for the filter in the titles only.
 		add_filter(
@@ -133,12 +133,12 @@ 
 			array(
 				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				'tax_query'      => array(
 					array(
 						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
+						'terms'    => array('organization', 'person'),
 					),
 				),
 				's'              => $filter,
@@ -163,15 +163,15 @@ 
 
 		// Map the results in a `Select2` compatible array.
 		return array_map(
-			function ( $entity ) use ( $publisher_service ) {
-				$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-				$thumb_id = get_post_thumbnail_id( $entity->ID );
+			function($entity) use ($publisher_service) {
+				$type     = wp_get_post_terms($entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+				$thumb_id = get_post_thumbnail_id($entity->ID);
 
 				return array(
 					'id'            => $entity->ID,
 					'text'          => $entity->post_title,
 					'type'          => $type[0]->name,
-					'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+					'thumbnail_url' => $publisher_service->get_attachment_image_url($thumb_id),
 				);
 			},
 			$entities
@@ -187,11 +187,11 @@ 
 	 * @return string|bool The image URL or false if not found.
 	 * @since 3.11.0
 	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+	public function get_attachment_image_url($attachment_id, $size = 'thumbnail') {
 
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
+		$image = wp_get_attachment_image_src($attachment_id, $size);
 
-		return isset( $image['0'] ) ? $image['0'] : false;
+		return isset($image['0']) ? $image['0'] : false;
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 * @return string $content metabox content with additional instructions.
 	 * @since  3.19.0
 	 */
-	public function add_featured_image_instruction( $content ) {
+	public function add_featured_image_instruction($content) {
 		// Get the current post ID.
 		$post_id = get_the_ID();
 
@@ -212,7 +212,7 @@ 
 
 		// Bail if for some reason the post id is not set.
 		if (
-			empty( $post_id ) ||
+			empty($post_id) ||
 			$post_id !== (int) $publisher_id
 		) {
 			return $content;
@@ -228,18 +228,18 @@ 
 		);
 
 		// Check that the entity type is "Organization".
-		if ( in_array( 'organization', $terms, true ) ) {
+		if (in_array('organization', $terms, true)) {
 			// Add the featured image description when the type is "Organization".
 
-			$link     = sprintf(
+			$link = sprintf(
 				'<a target="_blank" href="%s">%s</a>',
-				esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
-				esc_html__( 'AMP logo guidelines', 'wordlift' )
+				esc_attr__('https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift'),
+				esc_html__('AMP logo guidelines', 'wordlift')
 			);
 			$content .= sprintf(
 				'<p>'
 								/* translators: %s: AMP logo guidelines. */
-								 . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
+								 . esc_html_x('According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift')
 								 . '</p>',
 				$link
 			);

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

Indentation +188 added lines, -188 removed lines

@@ -20,199 +20,199 @@
  */
 class Wordlift_Uri_Service {
 
-	/**
-	 * The title regex to sanitize titles in paths.
-	 *
-	 * According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
-	 * ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-	 * "$" | ","
-	 *
-	 * We also remove the space and the UTF-8 BOM sequence.
-	 *
-	 * @since 3.7.1
-	 */
-	const INVALID_CHARACTERS = "/[ ;\\/?:@&=\\+\\\$,]|(?:\\xEF\\xBB\\xBF)/";
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The global WordPress database connection.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \wpdb $wpdb The global WordPress database connection.
-	 */
-	private $wpdb;
-
-	/**
-	 * The {@link Wordlift_Uri_Service} singleton instance.
-	 *
-	 * @since  3.7.2
-	 * @access private
-	 * @var \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of Wordlift_Uri_Service.
-	 *
-	 * @param \wpdb $wpdb The global WordPress database connection.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct( $wpdb ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
-
-		$this->wpdb = $wpdb;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the {@link Wordlift_Uri_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
-	 * @since 3.7.2
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Sanitizes an URI path by replacing the not allowed characters with an underscore.
-	 *
-	 * @param string $path The path to sanitize.
-	 * @param string $char The replacement character (by default an underscore).
-	 *
-	 * @return string The sanitized path.
-	 * @since 3.7.2
-	 * @uses  sanitize_title() to manage not ASCII chars
-	 *
-	 * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
-	 */
-	public function sanitize_path( $path, $char = '_' ) {
-
-		// Ensure the path is ASCII.
-		// see https://github.com/insideout10/wordlift-plugin/issues/386
-		// $path_ascii = mb_convert_encoding( $path, 'ASCII' );
-
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
-	}
-
-	/**
-	 * Build an entity uri for a given title. The uri is composed using a given
-	 * post_type and a title. If already exists an entity e2 with a given uri a
-	 * numeric suffix is added. If a schema type is given entities with same label
-	 * and same type are overridden.
-	 *
-	 * @param string  $title A post title.
-	 * @param string  $post_type A post type. Default value is 'entity'
-	 * @param string  $schema_type A schema org type.
-	 * @param integer $increment_digit A digit used to call recursively the same function.
-	 *
-	 * @return string Returns an uri.
-	 * @deprecated don't use anywhere else, since we're refactoring the way URIs are built in the global function wl_build_entity_uri.
-	 * @since 3.5.0
-	 */
-	public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
-
-		// Get the entity slug suffix digit
-		$suffix_digit = $increment_digit + 1;
-
-		// Get a sanitized uri for a given title.
-		/*
+    /**
+     * The title regex to sanitize titles in paths.
+     *
+     * According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
+     * ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+     * "$" | ","
+     *
+     * We also remove the space and the UTF-8 BOM sequence.
+     *
+     * @since 3.7.1
+     */
+    const INVALID_CHARACTERS = "/[ ;\\/?:@&=\\+\\\$,]|(?:\\xEF\\xBB\\xBF)/";
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The global WordPress database connection.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \wpdb $wpdb The global WordPress database connection.
+     */
+    private $wpdb;
+
+    /**
+     * The {@link Wordlift_Uri_Service} singleton instance.
+     *
+     * @since  3.7.2
+     * @access private
+     * @var \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of Wordlift_Uri_Service.
+     *
+     * @param \wpdb $wpdb The global WordPress database connection.
+     *
+     * @since 3.6.0
+     */
+    public function __construct( $wpdb ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+
+        $this->wpdb = $wpdb;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the {@link Wordlift_Uri_Service} singleton instance.
+     *
+     * @return \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
+     * @since 3.7.2
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Sanitizes an URI path by replacing the not allowed characters with an underscore.
+     *
+     * @param string $path The path to sanitize.
+     * @param string $char The replacement character (by default an underscore).
+     *
+     * @return string The sanitized path.
+     * @since 3.7.2
+     * @uses  sanitize_title() to manage not ASCII chars
+     *
+     * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
+     */
+    public function sanitize_path( $path, $char = '_' ) {
+
+        // Ensure the path is ASCII.
+        // see https://github.com/insideout10/wordlift-plugin/issues/386
+        // $path_ascii = mb_convert_encoding( $path, 'ASCII' );
+
+        return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+    }
+
+    /**
+     * Build an entity uri for a given title. The uri is composed using a given
+     * post_type and a title. If already exists an entity e2 with a given uri a
+     * numeric suffix is added. If a schema type is given entities with same label
+     * and same type are overridden.
+     *
+     * @param string  $title A post title.
+     * @param string  $post_type A post type. Default value is 'entity'
+     * @param string  $schema_type A schema org type.
+     * @param integer $increment_digit A digit used to call recursively the same function.
+     *
+     * @return string Returns an uri.
+     * @deprecated don't use anywhere else, since we're refactoring the way URIs are built in the global function wl_build_entity_uri.
+     * @since 3.5.0
+     */
+    public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
+
+        // Get the entity slug suffix digit
+        $suffix_digit = $increment_digit + 1;
+
+        // Get a sanitized uri for a given title.
+        /*
 		 * The call takes into consideration URL encoding.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/885
 		 *
 		 * @since 3.20.0
 		 */
-		$entity_slug = urldecode( wl_sanitize_uri_path( $title ) )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
-
-		// Compose a candidate uri.
-		$new_entity_uri = sprintf(
-			'%s/%s/%s',
-			untrailingslashit( wl_configuration_get_redlink_dataset_uri() ),
-			$post_type,
-			$entity_slug
-		);
-
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
-
-		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
-		$post_id = $content && is_a( $content->get_bag(), '\WP_Post' ) ? $content->get_bag()->ID : null;
-
-		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-
-		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
-	}
-
-	/**
-	 *
-	 * @param string  $title A post title.
-	 * @param string  $taxonomy A post type. Default value is 'entity'
-	 * @param integer $increment_digit A digit used to call recursively the same function.
-	 *
-	 * @return string Returns an uri.
-	 * @since 3.32.0
-	 */
-	public function build_term_uri( $title, $taxonomy, $increment_digit = 0 ) {
-
-		// Get the entity slug suffix digit
-		$suffix_digit = $increment_digit + 1;
-
-		$entity_slug = urldecode( $title )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
-
-		// Compose a candidate uri.
-		$new_entity_uri = sprintf(
-			'%s/term/%s/%s',
-			Wordlift_Configuration_Service::get_instance()->get_dataset_uri(),
-			$taxonomy,
-			$entity_slug
-		);
-
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
-
-		$content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
-		$term_id = $content ? $content->get_bag()->term_id : null;
-
-		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $term_id ) ) {
-			$this->log->trace( "Going to return uri [ new_term_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// Otherwise the same function is called recursively
-		return $this->build_term_uri( $title, $taxonomy, ++ $increment_digit );
-	}
+        $entity_slug = urldecode( wl_sanitize_uri_path( $title ) )
+                        . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+
+        // Compose a candidate uri.
+        $new_entity_uri = sprintf(
+            '%s/%s/%s',
+            untrailingslashit( wl_configuration_get_redlink_dataset_uri() ),
+            $post_type,
+            $entity_slug
+        );
+
+        $this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+
+        $content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
+        $post_id = $content && is_a( $content->get_bag(), '\WP_Post' ) ? $content->get_bag()->ID : null;
+
+        // If the post does not exist, then the new uri is returned
+        if ( ! is_numeric( $post_id ) ) {
+            $this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // If schema_type is equal to schema org type of post x, then the new uri is returned
+        $schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+
+        // @todo: we shouldn't rely on css classes to take such decisions.
+        if ( $schema_type === $schema_post_type['css_class'] ) {
+            $this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // Otherwise the same function is called recursively
+        return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+    }
+
+    /**
+     *
+     * @param string  $title A post title.
+     * @param string  $taxonomy A post type. Default value is 'entity'
+     * @param integer $increment_digit A digit used to call recursively the same function.
+     *
+     * @return string Returns an uri.
+     * @since 3.32.0
+     */
+    public function build_term_uri( $title, $taxonomy, $increment_digit = 0 ) {
+
+        // Get the entity slug suffix digit
+        $suffix_digit = $increment_digit + 1;
+
+        $entity_slug = urldecode( $title )
+                        . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+
+        // Compose a candidate uri.
+        $new_entity_uri = sprintf(
+            '%s/term/%s/%s',
+            Wordlift_Configuration_Service::get_instance()->get_dataset_uri(),
+            $taxonomy,
+            $entity_slug
+        );
+
+        $this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+
+        $content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
+        $term_id = $content ? $content->get_bag()->term_id : null;
+
+        // If the post does not exist, then the new uri is returned
+        if ( ! is_numeric( $term_id ) ) {
+            $this->log->trace( "Going to return uri [ new_term_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // Otherwise the same function is called recursively
+        return $this->build_term_uri( $title, $taxonomy, ++ $increment_digit );
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -67,9 +67,9 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	public function __construct( $wpdb ) {
+	public function __construct($wpdb) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Uri_Service');
 
 		$this->wpdb = $wpdb;
 
@@ -100,13 +100,13 @@ 
 	 *
 	 * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
 	 */
-	public function sanitize_path( $path, $char = '_' ) {
+	public function sanitize_path($path, $char = '_') {
 
 		// Ensure the path is ASCII.
 		// see https://github.com/insideout10/wordlift-plugin/issues/386
 		// $path_ascii = mb_convert_encoding( $path, 'ASCII' );
 
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+		return sanitize_title(preg_replace(self::INVALID_CHARACTERS, $char, stripslashes($path)));
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 * @deprecated don't use anywhere else, since we're refactoring the way URIs are built in the global function wl_build_entity_uri.
 	 * @since 3.5.0
 	 */
-	public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
+	public function build_uri($title, $post_type, $schema_type = null, $increment_digit = 0) {
 
 		// Get the entity slug suffix digit
 		$suffix_digit = $increment_digit + 1;
@@ -137,41 +137,41 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$entity_slug = urldecode( wl_sanitize_uri_path( $title ) )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+		$entity_slug = urldecode(wl_sanitize_uri_path($title))
+					   . (0 === $increment_digit ? '' : '_'.$suffix_digit);
 
 		// Compose a candidate uri.
 		$new_entity_uri = sprintf(
 			'%s/%s/%s',
-			untrailingslashit( wl_configuration_get_redlink_dataset_uri() ),
+			untrailingslashit(wl_configuration_get_redlink_dataset_uri()),
 			$post_type,
 			$entity_slug
 		);
 
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 
-		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
-		$post_id = $content && is_a( $content->get_bag(), '\WP_Post' ) ? $content->get_bag()->ID : null;
+		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id($new_entity_uri);
+		$post_id = $content && is_a($content->get_bag(), '\WP_Post') ? $content->get_bag()->ID : null;
 
 		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($post_id)) {
+			$this->log->trace("Going to return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get($post_id);
 
 		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ($schema_type === $schema_post_type['css_class']) {
+			$this->log->trace("An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+		return $this->build_uri($title, $post_type, $schema_type, ++ $increment_digit);
 	}
 
 	/**
@@ -183,13 +183,13 @@ 
 	 * @return string Returns an uri.
 	 * @since 3.32.0
 	 */
-	public function build_term_uri( $title, $taxonomy, $increment_digit = 0 ) {
+	public function build_term_uri($title, $taxonomy, $increment_digit = 0) {
 
 		// Get the entity slug suffix digit
 		$suffix_digit = $increment_digit + 1;
 
-		$entity_slug = urldecode( $title )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+		$entity_slug = urldecode($title)
+					   . (0 === $increment_digit ? '' : '_'.$suffix_digit);
 
 		// Compose a candidate uri.
 		$new_entity_uri = sprintf(
@@ -199,20 +199,20 @@ 
 			$entity_slug
 		);
 
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 
-		$content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
+		$content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id($new_entity_uri);
 		$term_id = $content ? $content->get_bag()->term_id : null;
 
 		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $term_id ) ) {
-			$this->log->trace( "Going to return uri [ new_term_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($term_id)) {
+			$this->log->trace("Going to return uri [ new_term_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recursively
-		return $this->build_term_uri( $title, $taxonomy, ++ $increment_digit );
+		return $this->build_term_uri($title, $taxonomy, ++ $increment_digit);
 	}
 
 }

src/includes/class-wordlift-batch-action.php

Indentation +47 added lines, -47 removed lines

@@ -8,61 +8,61 @@
 
 class Wordlift_Batch_Action {
 
-	public static function process( $post_type, $offset, $query, $callback ) {
+    public static function process( $post_type, $offset, $query, $callback ) {
 
-		$posts_per_page = 10;
+        $posts_per_page = 10;
 
-		$args = array_merge(
-			self::get_args( $post_type, $query ),
-			array(
-				'offset'         => $offset,
-				'posts_per_page' => $posts_per_page,
-			)
-		);
+        $args = array_merge(
+            self::get_args( $post_type, $query ),
+            array(
+                'offset'         => $offset,
+                'posts_per_page' => $posts_per_page,
+            )
+        );
 
-		$post_ids = get_posts( $args );
+        $post_ids = get_posts( $args );
 
-		foreach ( $post_ids as $post_id ) {
-			call_user_func( $callback, $post_id );
-		}
+        foreach ( $post_ids as $post_id ) {
+            call_user_func( $callback, $post_id );
+        }
 
-		return array(
-			'current' => $offset,
-			'next'    => $offset + $posts_per_page,
-			'count'   => self::count( $post_type, $query ),
-		);
-	}
+        return array(
+            'current' => $offset,
+            'next'    => $offset + $posts_per_page,
+            'count'   => self::count( $post_type, $query ),
+        );
+    }
 
-	public static function count( $post_type, $query ) {
-		$args = array_merge(
-			self::get_args( $post_type, $query ),
-			array(
-				'posts_per_page' => - 1,
-			)
-		);
+    public static function count( $post_type, $query ) {
+        $args = array_merge(
+            self::get_args( $post_type, $query ),
+            array(
+                'posts_per_page' => - 1,
+            )
+        );
 
-		return count( get_posts( $args ) );
-	}
+        return count( get_posts( $args ) );
+    }
 
-	private static function get_args( $post_type, $query ) {
+    private static function get_args( $post_type, $query ) {
 
-		return array_merge(
-			array(
-				'fields'        => 'ids',
-				'post_type'     => $post_type,
-				'post_status'   => array(
-					'publish',
-					'future',
-					'draft',
-					'pending',
-					'private',
-					'auto-draft',
-					'inherit',
-				),
-				'cache_results' => false,
-			),
-			$query
-		);
-	}
+        return array_merge(
+            array(
+                'fields'        => 'ids',
+                'post_type'     => $post_type,
+                'post_status'   => array(
+                    'publish',
+                    'future',
+                    'draft',
+                    'pending',
+                    'private',
+                    'auto-draft',
+                    'inherit',
+                ),
+                'cache_results' => false,
+            ),
+            $query
+        );
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -8,43 +8,43 @@
 
 class Wordlift_Batch_Action {
 
-	public static function process( $post_type, $offset, $query, $callback ) {
+	public static function process($post_type, $offset, $query, $callback) {
 
 		$posts_per_page = 10;
 
 		$args = array_merge(
-			self::get_args( $post_type, $query ),
+			self::get_args($post_type, $query),
 			array(
 				'offset'         => $offset,
 				'posts_per_page' => $posts_per_page,
 			)
 		);
 
-		$post_ids = get_posts( $args );
+		$post_ids = get_posts($args);
 
-		foreach ( $post_ids as $post_id ) {
-			call_user_func( $callback, $post_id );
+		foreach ($post_ids as $post_id) {
+			call_user_func($callback, $post_id);
 		}
 
 		return array(
 			'current' => $offset,
 			'next'    => $offset + $posts_per_page,
-			'count'   => self::count( $post_type, $query ),
+			'count'   => self::count($post_type, $query),
 		);
 	}
 
-	public static function count( $post_type, $query ) {
+	public static function count($post_type, $query) {
 		$args = array_merge(
-			self::get_args( $post_type, $query ),
+			self::get_args($post_type, $query),
 			array(
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 			)
 		);
 
-		return count( get_posts( $args ) );
+		return count(get_posts($args));
 	}
 
-	private static function get_args( $post_type, $query ) {
+	private static function get_args($post_type, $query) {
 
 		return array_merge(
 			array(